Skip to content

Commit 6b071ec

Browse files
author
Lee Richmond
committed
Accomodate new extends pattern
jsonapi-serializable switched from prepend to extend. To make this still work, extend after inheriting.
1 parent b57c798 commit 6b071ec

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

gemfiles/rails_4.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 4.1"
6-
gem "jsonapi-rails", "~> 0.1.0", :require => "jsonapi/rails"
6+
gem "jsonapi-rails", "~> 0.2.0", :require => "jsonapi/rails"
77
gem "rspec-rails"
88

99
group :test do

gemfiles/rails_5.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 5.0"
6-
gem "jsonapi-rails", "~> 0.1.0", :require => "jsonapi/rails"
6+
gem "jsonapi-rails", "~> 0.2.0", :require => "jsonapi/rails"
77
gem "rspec-rails"
88

99
group :test do

lib/jsonapi_compliable/extensions/extra_attribute.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ def extra_attribute(name, options = {}, &blk)
5757
end
5858

5959
JSONAPI::Serializable::Resource.class_eval do
60-
prepend JSONAPI::Serializable::Resource::ConditionalFields
60+
def self.inherited(klass)
61+
super
62+
klass.class_eval do
63+
extend JSONAPI::Serializable::Resource::ConditionalFields
64+
end
65+
end
66+
6167
include JsonapiCompliable::Extensions::ExtraAttribute
6268
end

0 commit comments

Comments
 (0)