forest_liana 1.3.31 → 1.3.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7642e951526bdd1819bf1ec68fb85ab243ad8a
-  data.tar.gz: 3cbbd8fb7265745957e7d02fa1e4e5cc752c31c3
+  metadata.gz: 114ffafc36fa1a865ab38df0933f712dc145f592
+  data.tar.gz: 8682f89e467aa0674c74405f1cedad9645c7b961
 SHA512:
-  metadata.gz: 4793446cd4d3a799c90371d86d3a0795ca01b5b6906410435c7000ad0129e17942396d54d6e48aee8f1db4accc83cb2b98cf05012d1a24d954891fcd3d6ed274
-  data.tar.gz: 0e8a2ed2464b7726e4c65e2a0b45ab0f606080be95243b196a5fcba63ea240d8f6ddeaf2ee1ff9310e63698bc5ed1b55850b4a84b7ffaa3b772fb453f0266037
+  metadata.gz: 988750eb9cb5855a687ce295bcf44fbbdaac7a0dfd15715ea99ab85c7eba152c93273f7946f51a22353c1513a40e70fc84cf3dcea829f7a5ef364b68335df2da
+  data.tar.gz: d49507c2646150d78f0b5b0a5290df90f42062a4891807b9a432ed0a2073e3d7f568994b303eafbd9127433e6337b912fd29d54eb5afce885df46666a05c583d

data/app/deserializers/forest_liana/resource_deserializer.rb

@@ -35,7 +35,16 @@ module ForestLiana
           association = @resource.reflect_on_association(name.try(:to_sym))
 
           if [:has_one, :belongs_to].include?(association.try(:macro))
-            if data.is_a?(Hash) && data[:id]
+            # 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

data/app/services/forest_liana/resources_getter.rb

@@ -7,7 +7,6 @@ module ForestLiana
 
     def perform
       @records = @resource.unscoped.eager_load(includes)
-      @records = @resource
       @records = search_query
       @records = sort_query
     end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.31"
+  VERSION = "1.3.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.3.31
+  version: 1.3.32
 platform: ruby
 authors:
 - Sandro Munda