jsonapi-serializers 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d89dc4f009841a5431c7e79060da4208c2d7dde2
-  data.tar.gz: 1eb85ed60e4d91ba8f33ed28a8151ac3ff21cf71
+  metadata.gz: 22bd1a0e4edb6afa842b9aea4e12083b376b2c3a
+  data.tar.gz: fb1c32bdf48825ffbc32db8078c6daf1c7c31f5d
 SHA512:
-  metadata.gz: fa10630f9a9181a194e831cf538d65c7fcafa910ee7054e3838efbe30ef1775eb447b4f4eb84c4900d9fa4a99a539caf9df6d47f0e8db3299a0b4116ec0d9c08
-  data.tar.gz: c8d6f28e77762831850999491d2f05237ed0a4c2fd4215a09d88b7d8ccdefa2732955da77ebe1009bbc43cf6270e659ffb830f1544880c234783db0495c20767
+  metadata.gz: 3fb9216808ac7835e95dde7a428bc1af161d4940d72ed67737a864294777894249cbbb405e3e544a6104b798db3d6728dbc1cd163bb29bddf283bf6c438536d2
+  data.tar.gz: fee4e082f317e1cb3486829dbdfad8016834299b39e290e664e27fdd91d0914e7a246ae43ffa0bd875d773013a91bb3f2105d7563dda3e50bb24dcd906c6320c

data/lib/jsonapi-serializers/serializer.rb

@@ -85,7 +85,8 @@ module JSONAPI
 
       def links
         data = {}
-        data.merge!({'self' => self_link}) if self_link
+        data['self'] = self_link if self_link
+        data
       end
 
       def relationships
@@ -107,15 +108,13 @@ module JSONAPI
               # Spec: Resource linkage MUST be represented as one of the following:
               # - null for empty to-one relationships.
               # http://jsonapi.org/format/#document-structure-resource-relationships
-              data[formatted_attribute_name].merge!({'data' => nil})
+              data[formatted_attribute_name]['data'] = nil
             else
               related_object_serializer = JSONAPI::Serializer.find_serializer(object)
-              data[formatted_attribute_name].merge!({
-                'data' => {
-                  'type' => related_object_serializer.type.to_s,
-                  'id' => related_object_serializer.id.to_s,
-                },
-              })
+              data[formatted_attribute_name]['data'] = {
+                'type' => related_object_serializer.type.to_s,
+                'id' => related_object_serializer.id.to_s,
+              }
             end
           end
         end
@@ -136,7 +135,7 @@ module JSONAPI
           # - an array of linkage objects for non-empty to-many relationships.
           # http://jsonapi.org/format/#document-structure-resource-relationships
           if @_include_linkages.include?(formatted_attribute_name)
-            data[formatted_attribute_name].merge!({'data' => []})
+            data[formatted_attribute_name]['data'] = []
             objects = has_many_relationship(attribute_name, attr_data) || []
             objects.each do |obj|
               related_object_serializer = JSONAPI::Serializer.find_serializer(obj)
@@ -323,15 +322,19 @@ module JSONAPI
       data = {
         'id' => serializer.id.to_s,
         'type' => serializer.type.to_s,
-        'attributes' => serializer.attributes,
       }
 
       # Merge in optional top-level members if they are non-nil.
       # http://jsonapi.org/format/#document-structure-resource-objects
-      data.merge!({'attributes' => serializer.attributes}) if !serializer.attributes.nil?
-      data.merge!({'links' => serializer.links}) if !serializer.links.nil?
-      data.merge!({'relationships' => serializer.relationships}) unless serializer.relationships.empty?
-      data.merge!({'meta' => serializer.meta}) if !serializer.meta.nil?
+      # Call the methods once now to avoid calling them twice when evaluating the if's below.
+      attributes = serializer.attributes
+      links = serializer.links
+      relationships = serializer.relationships
+      meta = serializer.meta
+      data['attributes'] = attributes if !attributes.nil?
+      data['links'] = links if !links.nil?
+      data['relationships'] = relationships if !relationships.empty?
+      data['meta'] = meta if !meta.nil?
       data
     end
     class << self; protected :serialize_primary; end

data/lib/jsonapi-serializers/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Serializer
-    VERSION = '0.6.1'
+    VERSION = '0.6.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-serializers
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Mike Fotinakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Pure Ruby readonly serializers for the JSON:API spec.
@@ -132,4 +132,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/factory.rb
 - spec/support/serializers.rb
-has_rdoc: