restful-jsonapi 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d6d2a1c2d7dc8e74603ec864e2d8286b24bdbb
-  data.tar.gz: 61319a7798e649dae4cf91fa6803ccfa786113fb
+  metadata.gz: f35fb3c43cd68b559563b31892b4a3929b5b7326
+  data.tar.gz: 1db27c7d5d17955a03c3eece8f779a2788d63e73
 SHA512:
-  metadata.gz: 19f5f3e953ce50450ae691e9742ad7caf26a3eec2dffcf4388dc3986e88c466359f94e1516fea70ffebc83c8db504f83d69ecd689977aec53f9ead6d385d594b
-  data.tar.gz: fd69d2b95cd4c6d2fcb30eace925d6ce97dd8415e202d2eae2701d1a5b035235494acc32ef943d2e4d4dbc373dcc5cb9f2218e90970efae261252dcba04ef410
+  metadata.gz: 8cc05db93720be70a6e664cf6318de16dd62feb71812cfee5366206ac7ad24a529860be1f3a63c8d181b7f606cd42ad1cb51a8ade0d1c792bdc0e86043685a11
+  data.tar.gz: 1a3f64688c9b18cfb3ef8a109b36a8eb14a45ced91c9666fc4cbb1c1cfd8c5e39b6c8cb1486503f0adf5836c8ad1196166b00575cff47306181922499e0bd618

data/README.md

@@ -2,6 +2,9 @@
 
 A temporary monkeypatch for JSONAPI support, both in request payload, and serializing the type without a namespace.
 
+[![Gem Version](https://badge.fury.io/rb/restful-jsonapi.svg)](http://badge.fury.io/rb/restful-jsonapi)
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/restful/jsonapi/restify_param.rb

@@ -4,51 +4,64 @@ module Restful
       extend ActiveSupport::Concern
 
       def restify_param(param_key)
-        ActionController::Parameters.new(param_key => restify_value(param_key))
+        ActionController::Parameters.new(param_key => restify_data(param_key))
       end
 
       private
 
-      def restify_value(param_key, value = params)
+      def restify_data(param_key, value = params)
         if value == params
-          value = params.clone[:data]
+          value = params.clone[:data] # leave params alone
         end
-        if value.delete(:type).underscore == param_key.to_s.pluralize
-          new_params = ActionController::Parameters.new
-          attributes = value.has_key?(:attributes) ? value[:attributes] : value
-          attributes.merge!(id: value[:id]) if value[:id]
-          attributes.transform_keys!(&:underscore)
-          new_params.merge!(attributes)
-          if value.has_key? :relationships
-            value[:relationships].each do |k,v|
-              if k.pluralize != k
-
-              # belongs to relationship
-                unless v[:data].nil?
-                  new_params["#{k}_id"] = v[:data][:id]
-                else
-                  new_params["#{k}_id"] = nil
-                end
+        value.delete(:type)
+        new_params = ActionController::Parameters.new
+        # relationships
+        if value.has_key? :relationships
+          value.delete(:relationships).each do |relationship_name, relationship_data|
+            new_data = restify_relationship(relationship_name, relationship_data)
+            new_params.merge! new_data if new_data.present?
+          end
+        end
+        # attributes
+        attributes = value.has_key?(:attributes) ? value[:attributes] : value
+        attributes.merge!(id: value[:id]) if value[:id]
+        attributes.transform_keys!(&:underscore)
+        new_params.merge!(attributes)
+        new_params
+      end
 
-              # has many relationship
-              elsif v[:data].present?
-                if v[:data].reject{|data|data.has_key? :attributes}.blank?
-                  relationship_key = k.to_s.underscore+"_attributes"
-                  new_params[relationship_key] ||= []
-                  v[:data].each do |vv|
-                    new_params[relationship_key].push restify_value(k,vv)
-                  end unless v[:data].nil?
-                else
-                  relationship_key = k.to_s.singularize.underscore+"_ids"
-                  new_params[relationship_key] ||= []
-                  v[:data].each do |vv|
-                    new_params[relationship_key].push vv[:id]
-                  end unless v[:data].nil?
-                end
-              end
-            end
+      def restify_relationship(relationship_name, relationship_data)
+        if relationship_data[:data].present?
+          if relationship_data[:data].is_a? Hash
+            restify_belongs_to(relationship_name, relationship_data)
+          else
+            restify_has_many(relationship_name, relationship_data)
           end
-          new_params
+        end
+      end
+
+      def restify_belongs_to(relationship_name, relationship_data)
+        if relationship_data[:data].has_key? :attributes
+          relationship_key = relationship_name.to_s.underscore+"_attributes"
+          {relationship_key => restify_data(relationship_name,relationship_data[:data])}
+        else
+          {"#{relationship_name}_id" => relationship_data[:data][:id]}
+        end
+      end
+
+      def restify_has_many(relationship_name, relationship_data)
+        if relationship_data[:data].select(&:attributes).blank?
+          relationship_key = relationship_name.to_s.singularize.underscore+"_ids"
+          new_params[relationship_key] ||= []
+          relationship_data[:data].each do |vv|
+            new_params[relationship_key].push vv[:id]
+          end unless relationship_data[:data].nil?
+        else
+          relationship_key = relationship_name.to_s.underscore+"_attributes"
+          new_params[relationship_key] ||= []
+          relationship_data[:data].each do |vv|
+            new_params[relationship_key].push restify_data(relationship_name,vv[:data])
+          end unless relationship_data[:data].nil?
         end
       end
 

data/lib/restful/jsonapi/version.rb

@@ -1,5 +1,5 @@
 module Restful
   module Jsonapi
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful-jsonapi
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Zach Wentz
@@ -56,7 +56,6 @@ files:
 - lib/restful/jsonapi/restify_param.rb
 - lib/restful/jsonapi/serializable_errors.rb
 - lib/restful/jsonapi/version.rb
-- restful-jsonapi-0.0.8.gem
 - restful-jsonapi.gemspec
 homepage: https://github.com/Netflix/restful-jsonapi
 licenses: