json_api_ruby 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91293b5565faf0ff2b9cbd1260c8e2da3a7b774b
-  data.tar.gz: e21ee8f390cd1fc36f0abea84201c240685b7f3a
+  metadata.gz: 6cf3164f2abf635e618957c75eea9210e2964c3e
+  data.tar.gz: f1927eafda56413ca744cc43ac5608344db1af55
 SHA512:
-  metadata.gz: 84c0dcd1ff3fec00ff7708a2db101448dad9b10abdba31dc0fbdecfc112a5ca2a9484ecaacb4636c384ec39b4acdad956330a1027d255cc11bb389d3c80c9e71
-  data.tar.gz: 05fe188da17d76795ce11e90074b21aa0e0046d9d359b82b1cfadf12f5907ee5669680aac1056f261a1c4ccae15ca72d18da1b5d9052c436cb4db16b286433f4
+  metadata.gz: 6af9abffd2f8321a35ef837a92bcfc8da35bec3685cfda916b0559db0c152bc3e00d80a39f34a5a381736a48af28f9fa15a409e0f85052c6dd30e1dd65c44aaf
+  data.tar.gz: 9e1a89a1741949c212c6833df0e65aa266bfc17630eca272b56f2690a4477e655d68f36442f8d370fc2a1bd7be12cc614f1bdfe3035f1547e0b9e0ad2fd6bd7b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.1.1
+Fix issues related to empty or nil objects
+
+0.1.0
+Added the ability to set a `resource_class` on relationships
+Made resource discovery able to handle a string or a class object
+
 0.0.3
 Performance tuning and documentation
 

data/README.md

@@ -6,4 +6,3 @@ See the <a href="https://github.com/teubanks/jsonapi_ruby/wiki">Wiki</a> page or
 
 ### Status
 Definitely a work in progress.
-This is currently an Alpha release, use at your own peril

data/lib/json_api_ruby/serializer.rb

@@ -11,7 +11,7 @@ module JsonApi
   def serialize(object, options = {})
     options.stringify_keys!
     # assume it's a collection
-    if object.present? && object.respond_to?(:to_a)
+    if !object.nil? && object.respond_to?(:to_a)
       serializer = CollectionSerializer.new(object, options)
     else
       serializer = Serializer.new(object, options)
@@ -29,17 +29,21 @@ module JsonApi
     end
 
     def to_hash
-      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
-      included_data  = assemble_included_data(relationships)
-
-      if included_data.present?
-        included_data.uniq! do |inc_data|
-          inc_data['id'] + inc_data['type']
+      if @object.nil?
+        serialized = { 'data' => nil }
+      else
+        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
+        included_data  = assemble_included_data(relationships)
+
+        if included_data.present?
+          included_data.uniq! do |inc_data|
+            inc_data['id'] + inc_data['type']
+          end
+          serialized['included'] = included_data
         end
-        serialized['included'] = included_data
       end
 
       serialized['meta'] = @meta if @meta.present?
@@ -82,8 +86,8 @@ module JsonApi
 
       serialized['data'] = data_array
 
-      serialized['meta'] = @meta if @meta
-      serialized['included'] = assemble_included_data(included_resources)
+      serialized['meta'] = @meta if @meta.present?
+      serialized['included'] = assemble_included_data(included_resources) if included_resources.present?
 
       serialized
     end

data/lib/json_api_ruby/version.rb

@@ -1,3 +1,3 @@
 module JsonApi
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/json_api_ruby/serializer_spec.rb

@@ -14,6 +14,10 @@ RSpec.describe JsonApi::Serializer do
       JsonApi.serialize(person, resource_class: 'Namespace::OneResource')
     end
 
+    it 'returns a nil data object for no objects' do
+      expect(JsonApi.serialize(nil)).to eq({'data' => nil})
+    end
+
     it 'has a top level data object' do
       expect(serialized_data).to have_data
     end
@@ -58,6 +62,10 @@ RSpec.describe JsonApi::Serializer do
       JsonApi.serialize(people, resource_class: 'Namespace::OneResource')
     end
 
+    it 'returns an empty data array for no objects' do
+      expect(JsonApi.serialize([])).to eq({'data' => []})
+    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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_api_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tracey Eubanks