custom_fields 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2d0f1cab5f7e3c7153f38202b4a77b8f466e04d
-  data.tar.gz: eb6e1f46553f3a565939c16ecd15ae5ab6613d87
+  metadata.gz: 1e33b47ab6170cca8bcce7196f00f81d1b7fbf6d
+  data.tar.gz: e604ee4eea1a252ebf53ea0155f6b146e5bc8427
 SHA512:
-  metadata.gz: bef098cd02a0e26ef093432d3dd3233d361b8e4cec1d32c88f94928c7644e9653974e8789bbed6609f5e550c54225997de3130da7f16605fdb607cce56efd3a6
-  data.tar.gz: dd15ddff7b81739385881fbd93e3897ca511db4a6fce1b8aa1eb1df3770848280077eb176e041e0e2c54006d04d724075d685db00c58ea1b7c7fb92752028896
+  metadata.gz: 61d40ce45b216bf05e9187571bbeec95d29cad9af0fb776d73358b8fd912b85ea23a5ededc74b2ecd9a6584d27771d6549252cc79745a4e0392146fed8d80974
+  data.tar.gz: ffa68d31f8e3167147e9a5a7ca8fb7acbe3d7943bdcd49254f0878199ef4fd0199f417370082761a2735218a639c75cd490ff476d69a802a57bbdbb0134f9f29

data/lib/custom_fields/field.rb

@@ -22,6 +22,7 @@ module CustomFields
     field :required,  type: ::Boolean, default: false
     field :unique,    type: ::Boolean, default: false
     field :localized, type: ::Boolean, default: false
+    field :default
 
     ## validations ##
     validates_presence_of   :label, :type
@@ -67,7 +68,8 @@ module CustomFields
         'type'      => self.type,
         'required'  => self.required?,
         'unique'    => self.unique?,
-        'localized' => self.localized? }.merge(custom_to_recipe)
+        'localized' => self.localized?,
+        'default'   => self.default }.merge(custom_to_recipe)
     end
 
     def as_json(options = {})

data/lib/custom_fields/types/boolean.rb

@@ -18,7 +18,7 @@ module CustomFields
           # @param [ Hash ] rule It contains the name of the field.
           #
           def apply_boolean_custom_field(klass, rule)
-            klass.field rule['name'], type: ::Boolean, localize: rule['localized'] || false, default: false
+            klass.field rule['name'], type: ::Boolean, localize: rule['localized'] || false, default: rule['default'].nil? ? false : rule['default']
           end
 
           # Build a hash storing the boolean value (true / false) for
@@ -52,4 +52,4 @@ module CustomFields
 
   end
 
-end
+end

data/lib/custom_fields/types/default.rb

@@ -47,7 +47,7 @@ module CustomFields
           # @param [ Hash ] rule It contains the name of the field and if it is required or not
           #
           def apply_custom_field(klass, rule)
-            klass.field rule['name'], localize: rule['localized'] || false
+            klass.field rule['name'], localize: rule['localized'] || false, default: rule['default']
 
             klass.validates_presence_of rule['name'] if rule['required']
             klass.validates_uniqueness_of rule['name'], scope: :_type if rule['unique']
@@ -100,4 +100,4 @@ module CustomFields
 
   end
 
-end
+end

data/lib/custom_fields/types/email.rb

@@ -20,7 +20,7 @@ module CustomFields
           def apply_email_custom_field(klass, rule)
             name = rule['name']
 
-            klass.field name, type: ::String, localize: rule['localized'] || false
+            klass.field name, type: ::String, localize: rule['localized'] || false, default: rule['default']
             klass.validates_presence_of name if rule['required']
             klass.validates_format_of name, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/, allow_blank: !rule['required']
             klass.validates_uniqueness_of rule['name'], scope: :_type if rule['unique']
@@ -57,4 +57,4 @@ module CustomFields
 
   end
 
-end
+end

data/lib/custom_fields/types/float.rb

@@ -15,7 +15,7 @@ module CustomFields
           # @param [ Hash ] rule It contains the name of the field and if it is required or not
           #
           def apply_float_custom_field(klass, rule)
-            klass.field rule['name'], type: ::Float, localize: rule['localized'] || false
+            klass.field rule['name'], type: ::Float, localize: rule['localized'] || false, default: rule['default']
             klass.validates_presence_of rule['name'] if rule['required']
             klass.validates rule['name'], numericality: true, if: ->(x){ rule['required'] }
           end

data/lib/custom_fields/types/integer.rb

@@ -17,7 +17,7 @@ module CustomFields
           def apply_integer_custom_field(klass, rule)
             name = rule['name']
 
-            klass.field name, type: ::Integer, localize: rule['localized'] || false
+            klass.field name, type: ::Integer, localize: rule['localized'] || false, default: rule['default']
             klass.validates_presence_of name if rule['required']
             klass.validates name, numericality: { only_integer: true }, if: ->(x){ rule['required'] }
           end

data/lib/custom_fields/types/select.rb

@@ -67,7 +67,7 @@ module CustomFields
           def apply_select_custom_field(klass, rule)
             name, base_collection_name = rule['name'], "#{rule['name']}_options".to_sym
 
-            klass.field :"#{name}_id", type: BSON::ObjectId, localize: rule['localized'] || false
+            klass.field :"#{name}_id", type: BSON::ObjectId, localize: rule['localized'] || false, default: ->{ _set_select_option(name, rule['default']) }
 
             klass.cattr_accessor "_raw_#{base_collection_name}"
             klass.send :"_raw_#{base_collection_name}=", rule['select_options'].sort { |a, b| a['position'] <=> b['position'] }

data/lib/custom_fields/version.rb

@@ -1,5 +1,5 @@
 module CustomFields #:nodoc
 
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
 description: Manage custom fields to a Mongoid document or a collection. This module
   is one of the core features we implemented in our custom CMS, named LocomotiveCMS.
 email: didier@nocoffee.fr