json_api_ruby 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ba5f435a463e08420afbfe01b6e6c00d872c1d6
-  data.tar.gz: 82bd54e3e35ce66ac027407ddd5edcc71d06a9bf
+  metadata.gz: db1df895288feca5b137412ef221f3412c505d22
+  data.tar.gz: b03003fbd272458938040658c346f46ffe46cef8
 SHA512:
-  metadata.gz: 07593a0a1372734b4adcd11bd263e129cece029dc3f3bf3de9dd8998a7a28f32ebf0d02de4e9ff1c77cbdda4a7f6e976a15d666a803a0d983d57a4da935bea80
-  data.tar.gz: 3625634704e631f29bcce7f64bbd53c847febf50806b063dffced0b3babe90f88360b2349622dce08a47a2bd4ec77529db629e3540fcd0aa9d95534216b451ad
+  metadata.gz: 2fbb35ae835ca899ccdf4e5da426b9678d359b8fae67b1f33ae80636c232adb2496f4abe41001e79aeb3a26cf3d587cba4a6ffd457ce3a90df4b2e0d1262fb33
+  data.tar.gz: 43d0066a894fa951042e3eb0af367ac38b19c1ab7e24f10d889fe12fe1bb3bb09ef43c208712f68943e1514db7919c0e4281109e0ae5d71703136745b4945079

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+0.2.1
+Fix issues with `_id_field` on subclasses of class whose superclass is Resource
+
 0.2.0
 Added the ability to subclass from a class whose superclass is Resource
 

data/lib/json_api_ruby/resources/base.rb

@@ -25,7 +25,7 @@ module JsonApi
       end
 
       def identifier_hash
-        { 'id' =>  self.id, 'type' =>  self.type }
+        { 'id' => _model.send(id_field), 'type' =>  self.type }
       end
 
       def links_hash
@@ -78,6 +78,17 @@ module JsonApi
 
       private
 
+      # Traverses superclasses for the first `_id_field` not set to `:id` and
+      # return its value. Stops when the superclass is Resource.
+      def id_field(klass = self.class)
+        return klass._id_field unless klass._id_field == :id
+        if klass.superclass == Resource
+          klass._id_field
+        else
+          id_field(klass.superclass)
+        end
+      end
+
       # Adds elements of the `concat_list` to the `target_list` if they are
       # not already present.
       def concat_list(target_list, concat_list)

data/lib/json_api_ruby/version.rb

@@ -1,3 +1,3 @@
 module JsonApi
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/json_api_ruby/resource_spec.rb

@@ -99,6 +99,10 @@ RSpec.describe JsonApi::Resource do
         SubclassedPersonResource.new(person).to_hash
       end
 
+      it 'can override the id field of its super-class' do
+        expect(subclass_serialization['id']).to eq('Philip J. Fry')
+      end
+
       it "does not affect its super-class's list of attributes" do
         expect(PersonResource.fields).to_not eq(SubclassedPersonResource.fields)
       end
@@ -109,7 +113,9 @@ RSpec.describe JsonApi::Resource do
       end
 
       it 'returns the same relationships as its super-class' do
-        expect(subclass_serialization['relationships']).to eq(super_class_serialization['relationships'])
+        actual_relationship_names = subclass_serialization['relationships'].keys
+        expected_relationship_names = super_class_serialization['relationships'].keys
+        expect(actual_relationship_names).to eq(expected_relationship_names)
       end
 
       context 'with overridden attributes' do
@@ -128,6 +134,10 @@ RSpec.describe JsonApi::Resource do
         DeeplySubclassedPersonResource.new(person).to_hash
       end
 
+      it 'can fall back to the id of its super-class' do
+        expect(deep_subclass_serialization['id']).to eq('Philip J. Fry')
+      end
+
       it 'concatinates its attributes with the list of attributes from its super-classes' do
         expected_attributes = super_class_serialization['attributes'].merge('website' => 'www.thefuture.com', 'twitter' => '@philipjfry')
         expect(deep_subclass_serialization['attributes']).to eq(expected_attributes)

data/spec/support/resource_objects.rb

@@ -79,6 +79,7 @@ class PersonResource < JsonApi::Resource
 end
 
 class SubclassedPersonResource < PersonResource
+  id_field :name
   attribute :website
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tracey Eubanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport