forest_liana 1.3.42 → 1.3.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb3568d5560fd7e5f2bed09463aeabd25cdcf507
-  data.tar.gz: d08fed354b6e2ec24643975b1611df742f416307
+  metadata.gz: 2b0816d726c0204d712745f22efe4e1ab17a698c
+  data.tar.gz: bc3bd8651348a3ebdcb9305c1b6cd669fde86449
 SHA512:
-  metadata.gz: 27ab72a652bc72f34efaff24b2853c0440879f86cf506f6cbd811fceba3b6f6d076d2b2a839501a0d5feef2b6eaebab478be8b0f2c5af3c26bad7dc28f96ebea
-  data.tar.gz: 630815abbb6a8ef6b6f2dc0510345fac00b65730afde352ae65507034ce5ceff98cb880ae9541a8ea768985cc0a73943b38730ec8fe8d7309552e3bba9be77be
+  metadata.gz: be3ff96e743e23b126b10a715214ec5eaa5902b329c90e8078ef72e36ed4e819f7341652ad2ef17830d1dfe49e51c19b928ebf39a0063def1586640f19987fbc
+  data.tar.gz: 25ebe3f5446e5495a6bfc678835f6a27235fd42abfb6a3805516ff84ad4760536b5c17db43dbf7469cd7dca7dc8acdfada47f87eaa59091b53a289b3392754a6

data/app/controllers/forest_liana/resources_controller.rb

@@ -26,19 +26,19 @@ module ForestLiana
     end
 
     def create
-      getter = ResourceCreator.new(@resource, params)
-      getter.perform
+      creator = ResourceCreator.new(@resource, params)
+      creator.perform
 
       render serializer: nil,
-        json: serialize_model(getter.record, include: includes)
+        json: serialize_model(creator.record, include: includes)
     end
 
     def update
-      getter = ResourceUpdater.new(@resource, params)
-      getter.perform
+      updater = ResourceUpdater.new(@resource, params)
+      updater.perform
 
       render serializer: nil,
-        json: serialize_model(getter.record, include: includes)
+        json: serialize_model(updater.record, include: includes)
     end
 
     def destroy

data/app/serializers/forest_liana/serializer_factory.rb

@@ -177,7 +177,11 @@ module ForestLiana
       SchemaUtils.associations(active_record_class).each do |a|
         serializer.send(serializer_association(a), a.name) {
           if [:has_one, :belongs_to].include?(a.macro)
-            object.send(a.name).try(:reload)
+            begin
+              object.send(a.name).try(:reload)
+            rescue ActiveRecord::RecordNotFound
+              nil
+            end
           else
             []
           end

data/app/services/forest_liana/belongs_to_updater.rb

@@ -9,13 +9,8 @@ module ForestLiana
 
     def perform
       @record = @resource.find(@params[:id])
-
-      if @data && @data[:id]
-        new_value = @association.klass.find(@data[:id]) if @data && @data[:id]
-        @record.send("#{@association.name}=", new_value)
-      else
-        @record.send("#{@association.foreign_key}=", nil)
-      end
+      new_value = @association.klass.find(@data[:id]) if @data && @data[:id]
+      @record.send("#{@association.name}=", new_value)
 
       @record.save()
     end

data/app/services/forest_liana/schema_adapter.rb

@@ -212,26 +212,29 @@ module ForestLiana
 
       case column.type
       when :integer
-        'Number'
+        type = 'Number'
       when :float
-        'Number'
+        type = 'Number'
       when :decimal
-        'Number'
+        type = 'Number'
       when :datetime
-        'Date'
+        type = 'Date'
       when :date
-        'Date'
+        type = 'Date'
       when :string
-        'String'
+        type = 'String'
       when :text
-        'String'
+        type = 'String'
       when :citext
-        'String'
+        type = 'String'
       when :uuid
-        'String'
+        type = 'String'
       when :boolean
-        'Boolean'
+        type = 'Boolean'
       end
+
+      is_array = (column.respond_to?(:array) && column.array == true)
+      is_array ? [type] : type
     end
 
     def add_enum_values_if_is_enum(column_schema, column)

data/app/services/forest_liana/schema_utils.rb

@@ -16,7 +16,7 @@ module ForestLiana
     def self.find_model_from_table_name(table_name)
       model = nil
 
-      ActiveRecord::Base.subclasses.each do |subclass|
+      ForestLiana.models.each do |subclass|
         if subclass.abstract_class?
           model = self.find_model_from_abstract_class(subclass, table_name)
         elsif subclass.table_name == table_name

data/lib/forest_liana.rb

@@ -12,10 +12,12 @@ module ForestLiana
   mattr_accessor :integrations
   mattr_accessor :apimap
   mattr_accessor :allowed_users
+  mattr_accessor :models
 
   # Legacy.
   mattr_accessor :jwt_signing_key
 
   self.apimap = []
   self.allowed_users = []
+  self.models = []
 end

data/lib/forest_liana/bootstraper.rb

@@ -32,6 +32,7 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
     end
 
     def perform
+      fetch_models
       check_integrations_setup
       create_serializers
 
@@ -44,6 +45,12 @@ More info at: https://github.com/ForestAdmin/forest-rails/releases/tag/1.2.0"
 
     private
 
+    def fetch_models
+      ActiveRecord::Base.subclasses.each do |subclass|
+        ForestLiana.models << subclass
+      end
+    end
+
     def cast_to_array value
       value.is_a?(String) ? [value] : value
     end

data/lib/forest_liana/collection.rb

@@ -21,7 +21,8 @@ module ForestLiana::Collection
     def field(name, opts, &block)
       model.fields << opts.merge({ field: name, :'is-searchable' => false })
 
-      if serializer_name
+      if serializer_name && ForestLiana::UserSpace.const_defined?(
+          serializer_name)
         ForestLiana::UserSpace.const_get(serializer_name).class_eval do
           attribute(name, &block)
         end
@@ -35,7 +36,8 @@ module ForestLiana::Collection
         type: ['String']
       })
 
-      if serializer_name
+      if serializer_name && ForestLiana::UserSpace.const_defined?(
+          serializer_name)
         ForestLiana::UserSpace.const_get(serializer_name).class_eval do
           has_many(name, name: name)
         end

data/lib/forest_liana/version.rb

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

data/test/dummy/db/schema.rb

@@ -12,6 +12,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20160628173505) do
+
   create_table "belongs_to_class_name_fields", force: :cascade do |t|
     t.integer "foo_id"
   end

metadata

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