forest_liana 1.6.16 → 1.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fa072bd2ef133d12ba85d9b9d68f9d2cb75da2b
-  data.tar.gz: c6f879a067862eac61eec71eb8c820d86c1a472a
+  metadata.gz: 3af7548b5ab0b459b0ee602c39b2816a86bbfc7a
+  data.tar.gz: 99a284d5170879dbba02bdead5eadfae178ee127
 SHA512:
-  metadata.gz: 4fb78e59b00b7d1fe55ec6db9efe6343850f0231856eaf978bf6291007d7f1d19be56eb10513b9e1c4467c4dfe08cfce60b37a268fac492a2199a465809fc272
-  data.tar.gz: 8f81463256f920048e817c6f88a54f0275719e980342eabf4631cd1efc0160b1d12450b0084eec34b43d02a8dd191cf856d5683dc0038f1bd278bd93423a7fc6
+  metadata.gz: 4f82f6c9bfce7ef74c3d693b04b5864deae6d0e147d9a7cec37978f3cc141ce21e66b413da5208d408c53a2dcaec4e04cd1f0baf95bca84c7d4dd4f7be545a14
+  data.tar.gz: 590fd61a4eee69af5d80410932469db157769d888df45af0b3c741b91b3c3e06c029461ae7d913c1ba774afa4441c7d67de845ee1a7c0b1beb4064d472541465

data/app/deserializers/forest_liana/resource_deserializer.rb

@@ -128,7 +128,8 @@ module ForestLiana
     def extract_smart_fields_values
       # NOTICE: Look for some Smart Field setters and apply them if any.
       ForestLiana.schema_for_resource(@resource).fields.each do |field|
-        if field.try(:[], :set)
+        if field.try(:[], :set) &&
+          @params['data']['attributes'].has_key?(field[:field])
           # WARNING: The Smart Fields setters may override other changes.
           @attributes = field[:set].call(@attributes,
             @params['data']['attributes'][field[:field]])

data/app/services/forest_liana/schema_adapter.rb

@@ -229,6 +229,8 @@ module ForestLiana
       schema = { field: column.name, type: get_type_for(column) }
       add_enum_values_if_is_enum(schema, column)
       add_enum_values_if_is_sti_model(schema, column)
+      add_default_value(schema, column)
+      add_validations(schema, column)
     end
 
     def get_schema_for_association(association)
@@ -294,6 +296,98 @@ module ForestLiana
        column.name == @model.inheritance_column) || column.name == 'type'
     end
 
+    def add_default_value(column_schema, column)
+      # TODO: detect/introspect the attribute default value with Rails 5
+      #       ex: attribute :email, :string, default: 'arnaud@forestadmin.com'
+      column_schema['default-value'] = column.default if column.default
+    end
+
+    def add_validations(column_schema, column)
+      if @model._validators? && @model._validators[column.name.to_sym].size > 0
+        column_schema[:validations] = []
+
+        @model._validators[column.name.to_sym].each do |validator|
+          case validator
+          when ActiveRecord::Validations::PresenceValidator
+            column_schema[:validations] << {
+              type: 'is present',
+              message: validator.options[:message]
+            }
+            column_schema['is-required'] = true
+          when ActiveModel::Validations::NumericalityValidator
+            validator.options.each do |option, value|
+              case option
+              when :greater_than, :greater_than_or_equal_to
+                column_schema[:validations] << {
+                  type: 'is greater than',
+                  value: value,
+                  message: validator.options[:message]
+                }
+              when :less_than, :less_than_or_equal_to
+                column_schema[:validations] << {
+                  type: 'is less than',
+                  value: value,
+                  message: validator.options[:message]
+                }
+              end
+            end
+          when ActiveModel::Validations::LengthValidator
+            validator.options.each do |option, value|
+              case option
+              when :minimum
+                column_schema[:validations] << {
+                  type: 'is longer than',
+                  value: value,
+                  message: validator.options[:message]
+                }
+              when :maximum
+                column_schema[:validations] << {
+                  type: 'is shorter than',
+                  value: value,
+                  message: validator.options[:message]
+                }
+              when :is
+                column_schema[:validations] << {
+                  type: 'is longer than',
+                  value: value,
+                  message: validator.options[:message]
+                }
+                column_schema[:validations] << {
+                  type: 'is shorter than',
+                  value: value,
+                  message: validator.options[:message]
+                }
+              end
+            end
+          when ActiveModel::Validations::FormatValidator
+            validator.options.each do |option, value|
+              case option
+              when :with
+                options = /\?([imx]){0,3}/.match(validator.options[:with].to_s)
+                options = options && options[1] ? options[1] : ''
+                regex = value.source
+
+                # NOTICE: Transform a Ruby regex into a JS one
+                regex = regex.sub('\\A' , '^').sub('\\Z' , '$').sub('\\z' , '$')
+
+                column_schema[:validations] << {
+                  type: 'is like',
+                  value: "/#{regex}/#{options}",
+                  message: validator.options[:message]
+                }
+              end
+            end
+          end
+        end
+
+        if column_schema[:validations].size == 0
+          column_schema.delete(:validations)
+        end
+      end
+
+      column_schema
+    end
+
     def get_ref_for(association)
       if association.options[:polymorphic] == true
         '*.id'

data/lib/forest_liana/bootstraper.rb

@@ -33,7 +33,7 @@ module ForestLiana
     private
 
     def analyze_model?(model)
-      return model && model.table_exists? && !SchemaUtils.habtm?(model) &&
+      model && model.table_exists? && !SchemaUtils.habtm?(model) &&
         SchemaUtils.model_included?(model) && !SchemaUtils.sti_child?(model)
     end
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.6.16"
+  VERSION = "1.6.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.6.16
+  version: 1.6.17
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializers
   requirement: !ruby/object:Gem::Requirement
@@ -122,8 +122,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Instant and Customizable Admin Interface. This Gem is the official Forest
-  admin Liana for Rails.
+description: Forest is a modern admin interface that works on all major web frameworks.
+  forest_liana is the gem that makes Forest admin work on any Rails application (Rails
+  >= 4.0).
 email:
 - sandro@munda.me
 executables: []
@@ -318,7 +319,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Instant and Customizable Admin Interface.
+summary: Official Rails Liana for Forest
 test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css