forest_liana 1.1.29 → 1.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b687506a6797279131b36df0bfc64abd86fade4
-  data.tar.gz: 4d4a03bcd5f529c234cdfc160f4e8c061c97dea1
+  metadata.gz: a8c61cca79d81e2d1d325eed17335c37ccd04347
+  data.tar.gz: 53171e4c8959338e211dfa666c79cc6e7a16aaaa
 SHA512:
-  metadata.gz: 4d17df6bfb4519de6e7425fb7a5315b3233ea58d0a7dc696d16f868f51c3c6829b4eecfaf14a2117f5e5ca1419c98cf47f8b8a8393a43df5b949ce21ff93ec67
-  data.tar.gz: 8159e958705d5042b3d8622bb5f8994f5c45710fe50eeae16316f0d29eccedc8b84357fbd2a0c2ebc77b2fd78679198cca4d3f4859ddb4d571129432d927caad
+  metadata.gz: 91828deca444c0822687ddce5f77b717647c08b4835d1c7678c1f9b1928cfd42916926142e43b6bff605585336693f9154a672a6283520bf3ed535d9a469ec68
+  data.tar.gz: 994e9efdc1f89a99004d89e226ae84d8616db81cab8ef7e7d0041a33308f1b7568d05300d981637ce249cadbaa50b74189cd279ff21afc88bc929dda694ea103

data/app/controllers/forest_liana/associations_controller.rb

@@ -25,8 +25,9 @@ module ForestLiana
     end
 
     def find_association
+      # Rails 3 wants a :sym argument.
       @association = @resource.reflect_on_association(
-        params[:association_name])
+        params[:association_name].try(:to_sym))
 
       # Only accept "many" associations
       if @association.nil? ||

data/app/deserializers/forest_liana/resource_deserializer.rb

@@ -1,10 +1,9 @@
 module ForestLiana
   class ResourceDeserializer
 
-    def initialize(resource, record, params)
+    def initialize(resource, params)
       @params = params
       @resource = resource
-      @record = record
     end
 
     def perform
@@ -27,25 +26,16 @@ module ForestLiana
       if @params['data']['relationships']
         @params['data']['relationships'].each do |name, relationship|
           data = relationship['data']
-          association = @resource.reflect_on_association(name)
+          # Rails 3 requires a :sym argument for the reflect_on_association
+          # call.
+          association = @resource.reflect_on_association(name.try(:to_sym))
 
-          case association.try(:macro)
-          when :has_one, :belongs_to
+          if [:has_one, :belongs_to].include?(association.try(:macro))
             if data.is_a?(Hash)
               @attributes[name] = association.klass.find(data[:id])
             elsif data.blank?
               @attributes[name] = nil
             end
-          when :has_many, :has_and_belongs_to_many
-            if data.is_a?(Array)
-              data.each do |x|
-                existing_records = @record.send(name)
-                new_record = association.klass.find(x[:id])
-                if !existing_records.include?(new_record)
-                  existing_records << new_record
-                end
-              end
-            end
           end
         end
       end

data/app/serializers/forest_liana/serializer_factory.rb

@@ -50,7 +50,7 @@ module ForestLiana
         end
 
         def type
-          object.class.table_name.demodulize.tableize.dasherize
+          object.class.table_name.demodulize.dasherize
         end
 
         def format_name(attribute_name)
@@ -89,18 +89,22 @@ module ForestLiana
           end
 
           if ret[:href].blank?
-            relationship_records = object.send(attribute_name)
-
-            if relationship_records.respond_to?(:each)
-              if Rails::VERSION::MAJOR == 4
-                ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
-                ret[:meta] = { count: relationship_records.distinct.count }
-              else
-                ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
-                ret[:meta] = {
-                  count: relationship_records.count(:id, distinct: true)
-                }
+            begin
+              relationship_records = object.send(attribute_name)
+
+              if relationship_records.respond_to?(:each)
+                if Rails::VERSION::MAJOR == 4
+                  ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
+                  ret[:meta] = { count: relationship_records.distinct.count }
+                else
+                  ret[:href] = "/forest/#{object.class.table_name}/#{object.id}/#{attribute_name}"
+                  ret[:meta] = {
+                    count: relationship_records.count(:id, distinct: true)
+                  }
+                end
               end
+            rescue TypeError
+              puts "Cannot load the association #{attribute_name} on #{object.class.name} #{object.id}."
             end
           end
 

data/app/services/forest_liana/resource_creator.rb

@@ -13,11 +13,33 @@ module ForestLiana
       else
         @record = @resource.create!(resource_params, without_protection: true)
       end
+
+      set_has_many_relationships
     end
 
     def resource_params
       ResourceDeserializer.new(@resource, @params[:resource]).perform
     end
 
+    def set_has_many_relationships
+      if @params['data']['relationships']
+        @params['data']['relationships'].each do |name, relationship|
+          data = relationship['data']
+          association = @resource.reflect_on_association(name)
+          if [:has_many, :has_and_belongs_to_many].include?(
+            association.try(:macro))
+            if data.is_a?(Array)
+              data.each do |x|
+                existing_records = @record.send(name)
+                new_record = association.klass.find(x[:id])
+                if !existing_records.include?(new_record)
+                  existing_records << new_record
+                end
+              end
+            end
+          end
+        end
+      end
+    end
   end
 end

data/app/services/forest_liana/resource_updater.rb

@@ -15,11 +15,33 @@ module ForestLiana
       else
         @record.update_attributes!(resource_params, without_protection: true)
       end
+
+      set_has_many_relationships
     end
 
     def resource_params
-      ResourceDeserializer.new(@resource, @record, @params[:resource]).perform
+      ResourceDeserializer.new(@resource, @params[:resource]).perform
     end
 
+    def set_has_many_relationships
+      if @params['data']['relationships']
+        @params['data']['relationships'].each do |name, relationship|
+          data = relationship['data']
+          association = @resource.reflect_on_association(name)
+          if [:has_many, :has_and_belongs_to_many].include?(
+            association.try(:macro))
+            if data.is_a?(Array)
+              data.each do |x|
+                existing_records = @record.send(name)
+                new_record = association.klass.find(x[:id])
+                if !existing_records.include?(new_record)
+                  existing_records << new_record
+                end
+              end
+            end
+          end
+        end
+      end
+    end
   end
 end

data/app/services/forest_liana/schema_adapter.rb

@@ -6,7 +6,7 @@ module ForestLiana
 
     def perform
       @collection = ForestLiana::Model::Collection.new({
-        name: @model.name.tableize,
+        name: @model.table_name,
         fields: []
       })
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.1.29"
+  VERSION = "1.1.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.1.29
+  version: 1.1.30
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails