forest_liana 1.3.41 → 1.3.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4dfed3e0970a565659ba855ce38ee4320217f6f
-  data.tar.gz: a0986651eb37f09917c80304edf3e9b5fb0823c2
+  metadata.gz: cb3568d5560fd7e5f2bed09463aeabd25cdcf507
+  data.tar.gz: d08fed354b6e2ec24643975b1611df742f416307
 SHA512:
-  metadata.gz: b71616c7680f9f2ff19657dde52fac62fb83b00b272a7a3c1308bd834a3335ae6c6c64cbc7e987aaea81f160e58aa818d1938852081cbf11f6a78594e925c241
-  data.tar.gz: 6bac3c174f89e4be400cadc4399413309ba071f87208aa5599aab4c3bc6538b478716d6364bbfbd3e4632f1e67b84689f64d16eb85ee48b137ef5df7cc59bc3f
+  metadata.gz: 27ab72a652bc72f34efaff24b2853c0440879f86cf506f6cbd811fceba3b6f6d076d2b2a839501a0d5feef2b6eaebab478be8b0f2c5af3c26bad7dc28f96ebea
+  data.tar.gz: 630815abbb6a8ef6b6f2dc0510345fac00b65730afde352ae65507034ce5ceff98cb880ae9541a8ea768985cc0a73943b38730ec8fe8d7309552e3bba9be77be

data/app/controllers/forest_liana/associations_controller.rb

@@ -59,7 +59,7 @@ module ForestLiana
     end
 
     def resource_params
-      ResourceDeserializer.new(@resource, params[:resource]).perform
+      ResourceDeserializer.new(@resource, params[:resource], true).perform
     end
 
     def includes

data/app/controllers/forest_liana/resources_controller.rb

@@ -58,7 +58,7 @@ module ForestLiana
     end
 
     def resource_params
-      ResourceDeserializer.new(@resource, params[:resource]).perform
+      ResourceDeserializer.new(@resource, params[:resource], true).perform
     end
 
     def includes

data/app/deserializers/forest_liana/resource_deserializer.rb

@@ -3,13 +3,15 @@ require_relative '../../../lib/forest_liana/base64_string_io'
 module ForestLiana
   class ResourceDeserializer
 
-    def initialize(resource, params)
+    def initialize(resource, params, with_relationships)
       @params = params.permit! if params.respond_to?(:permit!)
       @resource = resource
+      @with_relationships = with_relationships
     end
 
     def perform
       @attributes = extract_attributes
+      extract_relationships if @with_relationships
       extract_paperclip
       extract_carrierwave
       extract_acts_as_taggable
@@ -25,6 +27,37 @@ module ForestLiana
       end
     end
 
+    def extract_relationships
+      if @params['data']['relationships']
+        @params['data']['relationships'].each do |name, relationship|
+          data = relationship['data']
+          # Rails 3 requires a :sym argument for the reflect_on_association
+          # call.
+          association = @resource.reflect_on_association(name.try(:to_sym))
+
+          if [:has_one, :belongs_to].include?(association.try(:macro))
+            # TODO: refactor like this?
+            #if data.blank?
+              #@attributes[name] = nil
+            #else
+              #@attributes[name] = association.klass.find(data[:id])
+            #end
+
+            # ActionController::Parameters do not inherit from Hash anymore
+            # since Rails 5.
+            if (data.is_a?(Hash) || data.is_a?(ActionController::Parameters)) && data[:id]
+              @attributes[name] = association.klass.find(data[:id])
+            elsif data.blank?
+              @attributes[name] = nil
+            end
+          end
+        end
+
+        # Strong parameter permit all new relationships attributes.
+        @attributes = @attributes.permit! if @attributes.respond_to?(:permit!)
+      end
+    end
+
     def extract_paperclip
       return unless @resource.respond_to?(:attachment_definitions)
 

data/app/services/forest_liana/resource_creator.rb

@@ -17,7 +17,7 @@ module ForestLiana
     end
 
     def resource_params
-      ResourceDeserializer.new(@resource, @params[:resource]).perform
+      ResourceDeserializer.new(@resource, @params[:resource], true).perform
     end
 
     def set_has_many_relationships

data/app/services/forest_liana/resource_updater.rb

@@ -18,7 +18,7 @@ module ForestLiana
     end
 
     def resource_params
-      ResourceDeserializer.new(@resource, @params[:resource]).perform
+      ResourceDeserializer.new(@resource, @params[:resource], false).perform
     end
 
     def has_strong_parameter

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.41"
+  VERSION = "1.3.42"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.3.41
+  version: 1.3.42
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails