restful-jsonapi 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c972daf4852a92faf8f7065e643ad06a0f667e5c
-  data.tar.gz: bc4b308e1593f246371cd17b611395a97edc7ea7
+  metadata.gz: e8c629eaa79b98d7fb7a0e267f6b3b8a1d250794
+  data.tar.gz: 7133eca2fcf09c8dab46ab30a892b206b5524b74
 SHA512:
-  metadata.gz: c3528828b80677b3c42499ce08f273c4bc102b3f2549d275d87864e0001abeccdbaaa04310e54ab95b0182b56e850ba2291ebddfe56da5315895c59daa6b7678
-  data.tar.gz: b22d3bee7537de9c427c639c348aa1acef628096bc7acb53242f011bb04e3fa20b36e1b38f5797265f64b391041a47a62bc4bfceb093456533352d859fd9e735
+  metadata.gz: 82e7171dbf181d4ef43eb32ab8949c82bf67586a985e40ce6139f04b8059002ad7320c96b27b838d60de34202d1be2f203257570acff5547bdc0842d422d79cc
+  data.tar.gz: 44d98ca953818240d2caa480d984f0ae5c86497afe6536cf351b668b99b4c916f26c7eb25a3ed7748a23b3447dc071a5fb6d3cf69dfd05e134be188b53c8aa69

data/lib/restful/jsonapi/railtie.rb

@@ -16,7 +16,7 @@ module Restful
           puts "Extending #{self} with Restful::Jsonapi::ActiveModelSerializer"
           include Restful::Jsonapi::ActiveModelSerializer
         end
-      end
+      end if defined? ActiveModel::Serializer
     end
   end
 end

data/lib/restful/jsonapi/restify_param.rb

@@ -31,21 +31,23 @@ module Restful
       end
 
       def restify_relationship(relationship_name, relationship_data)
-        if data_is_present?(relationship_data[:data])
-          if relationship_data[:data].is_a? Array
-            restify_has_many(relationship_name, relationship_data)
-          else
-            restify_belongs_to(relationship_name, relationship_data)
-          end
+        if data_is_present?(relationship_data[:data]) && relationship_data[:data].is_a?(Array)
+          restify_has_many(relationship_name, relationship_data)
+        elsif relationship_data.present? && relationship_data.has_key?(:data)
+          restify_belongs_to(relationship_name, relationship_data)
         end
       end
 
       def restify_belongs_to(relationship_name, relationship_data)
-        if relationship_data[:data].values_at(:attributes,:relationships).compact.length > 0
+        if relationship_data[:data].present? and relationship_data[:data].values_at(:attributes,:relationships).compact.length > 0
           relationship_key = relationship_name.to_s.underscore+"_attributes"
           {relationship_key => restify_data(relationship_name,relationship_data[:data])}
         else
-          {"#{relationship_name.underscore}_id" => relationship_data[:data][:id]}
+          if relationship_data[:data].nil? || relationship_data[:data].empty?
+            {"#{relationship_name.underscore}_id" => nil}
+          else
+            {"#{relationship_name.underscore}_id" => relationship_data[:data][:id]}
+          end
         end
       end
 

data/lib/restful/jsonapi/version.rb

@@ -1,5 +1,5 @@
 module Restful
   module Jsonapi
-    VERSION = "1.0.1"
+    VERSION = "1.0.6"
   end
 end

data/restful-jsonapi.gemspec

@@ -6,8 +6,8 @@ require 'restful/jsonapi/version'
 Gem::Specification.new do |spec|
   spec.name          = "restful-jsonapi"
   spec.version       = Restful::Jsonapi::VERSION
-  spec.authors       = ["Zach Wentz", "Ryan Johnston", "David Lee"]
-  spec.email         = ["zwentz@netflix.com", "ryanj@netflix.com", "dalee@netflix.com"]
+  spec.authors       = ["Zach Wentz", "Ryan Johnston", "David Lee", "Adam Gross"]
+  spec.email         = ["zwentz@netflix.com", "ryanj@netflix.com", "dalee@netflix.com", "agross@netflix.com"]
   spec.summary       = %q{Nice type and params for temporary JSONAPI support.}
   spec.description   = %q{Nice type and params for temporary JSONAPI support.}
   spec.homepage      = "https://github.com/Netflix/restful-jsonapi"
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", "~>5.0.0"
+  spec.add_dependency "rails", [">=4", "< 6"]
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,31 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: restful-jsonapi
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Zach Wentz
 - Ryan Johnston
 - David Lee
+- Adam Gross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +66,7 @@ email:
 - zwentz@netflix.com
 - ryanj@netflix.com
 - dalee@netflix.com
+- agross@netflix.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Nice type and params for temporary JSONAPI support.