json_api_ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aecf0984e8890283e322162acfacab44fa72647c
-  data.tar.gz: 08fc7edccd62b61df8a9f0883dcfb790a4a9af2e
+  metadata.gz: 3b11dfa347ef77e800e676368dd1d05cf9178baf
+  data.tar.gz: 4eb50ca1efdbccdab32a6055a02c64c52ff3891c
 SHA512:
-  metadata.gz: 97f8d15d1a25fe1cfd6bdf8694e35266d5f968c4c82697d2214369e987a38d1008fd9b5eb54bce68874572f97b2d52527d2e747ce5be0c9b3ecfdce0cc5e762a
-  data.tar.gz: c2dbc5d3b6dc759724b1f7d332cb49d9ecfde7583d9e046399671ba838f41c38d8f08164557186af36de0b53edd21d340b7e66fe4f616383acf2cb4f8f1c499e
+  metadata.gz: 17ee19b48621c454bce815d03529c541242d90349b81dc95b57c3637d3275bf235386fd0fffc82ce6ba7b15ea7e1c6f3c896a241fb7905af5796584f941969ef
+  data.tar.gz: 44f16c8e5e6001217043148803964799fb829933dffb1d84580a6a658b0ef8ef57d061a60f288125576f45738858624b3e4f4ee5cc9dab431a85715d8e7b538e

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+0.0.2
+Changed 'class_name' to 'resource_class' for consistency

data/lib/json_api_ruby/resources/base.rb

@@ -8,7 +8,7 @@ module JsonApi
         options.symbolize_keys
 
         resource_hash = identifier_hash
-        resource_hash['attributes'] = attributes_hash
+        resource_hash['attributes'] = attributes_hash if attributes_hash.any?
 
         relationships.each do |relationship|
           resource_hash['relationships'] ||= {}
@@ -40,7 +40,7 @@ module JsonApi
 
       def attributes_hash
         attrs = {}
-        self.class.fields.each do |attr|
+        Array(self.class.fields).each do |attr|
           attrs[attr.to_s] = send(attr)
         end
         attrs

data/lib/json_api_ruby/serializer.rb

@@ -21,15 +21,15 @@ module JsonApi
 
   class Serializer
     def initialize(object, options)
-      @meta         = options.fetch('meta', Hash.new).stringify_keys
-      @object       = object
-      @includes     = options.fetch('include', [])
-      resource_name = "#{@object.class.to_s.underscore}_resource".classify
-      @klass_name   = options.fetch('class_name', resource_name)
+      @meta           = options.fetch('meta', Hash.new).stringify_keys
+      @object         = object
+      @includes       = options.fetch('include', [])
+      resource_name   = "#{@object.class.to_s.underscore}_resource".classify
+      @resource_class = options.fetch('resource_class', resource_name)
     end
 
     def to_hash
-      resource_klass = Resources::Discovery.resource_for_name(@object, resource_class: @klass_name)
+      resource_klass = Resources::Discovery.resource_for_name(@object, resource_class: @resource_class)
       resource       = resource_klass.new(@object, include: @includes)
       serialized     = { 'data' => resource.to_hash }
       relationships  = resource.relationships
@@ -56,10 +56,10 @@ module JsonApi
 
   class CollectionSerializer
     def initialize(objects, options = {})
-      @meta     = options.fetch('meta', Hash.new).stringify_keys
-      @objects  = objects
-      @includes = options.fetch('include', [])
-      @klass_name   = options.fetch('class_name', nil)
+      @meta           = options.fetch('meta', Hash.new).stringify_keys
+      @objects        = objects
+      @includes       = options.fetch('include', [])
+      @resource_class = options.fetch('resource_class', nil)
     end
 
     def to_hash
@@ -67,10 +67,10 @@ module JsonApi
       included_data = []
 
       data_array = @objects.map do |object|
-        resource_name = "#{object.class.to_s.underscore}_resource".classify
-        klass_name   = @klass_name || resource_name
+        resource_name  = "#{object.class.to_s.underscore}_resource".classify
+        klass_name     = @resource_class || resource_name
         resource_klass = Resources::Discovery.resource_for_name(object, resource_class: klass_name)
-        resource = resource_klass.new(object, include: @includes)
+        resource       = resource_klass.new(object, include: @includes)
         included_data += assemble_included_data(resource.relationships)
         resource.to_hash
       end
@@ -97,4 +97,3 @@ module JsonApi
     end
   end
 end
-

data/lib/json_api_ruby/version.rb

@@ -1,3 +1,3 @@
 module JsonApi
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/json_api_ruby/serializer_spec.rb

@@ -10,6 +10,10 @@ RSpec.describe JsonApi::Serializer do
       JsonApi.serialize(person, meta: { meta_key: 'meta value' })
     end
 
+    subject(:serialized_data_other_resource_class) do
+      JsonApi.serialize(person, resource_class: 'Namespace::OneResource')
+    end
+
     it 'has a top level data object' do
       expect(serialized_data).to have_data
     end
@@ -18,6 +22,12 @@ RSpec.describe JsonApi::Serializer do
       expect(serialized_data).to have_meta
     end
 
+    it 'serializes the data using the passed-in resource class' do
+      expected_keys = %w(id type links)
+      expect(serialized_data_other_resource_class['data']).to be_valid_json_api
+      expect(serialized_data_other_resource_class['data'].keys).to eql(expected_keys)
+    end
+
     context 'with included resources' do
       subject(:serialized) do
         JsonApi.serialize(person, meta: { meta_key: 'meta value' }, include: [:articles])
@@ -44,6 +54,18 @@ RSpec.describe JsonApi::Serializer do
       ]
     end
 
+    subject(:serialized_collection_other_resource_class) do
+      JsonApi.serialize(people, resource_class: 'Namespace::OneResource')
+    end
+
+    it 'serializes the data using the passed-in resource class' do
+      serialized_collection_other_resource_class['data'].each do |serialized|
+        expected_keys = %w(id type links)
+        expect(serialized).to be_valid_json_api
+        expect(serialized.keys).to eql(expected_keys)
+      end
+    end
+
     context 'without included resources' do
       subject(:serialized_resources) do
         JsonApi.serialize(people, meta: {'I' => 'have meta'})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tracey Eubanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile