custom_fields 2.5.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2d0f1cab5f7e3c7153f38202b4a77b8f466e04d
-  data.tar.gz: eb6e1f46553f3a565939c16ecd15ae5ab6613d87
+  metadata.gz: 88e261b104e415fe6b64700e80b1f69e8e2448b7
+  data.tar.gz: 5dd052af6575958e56d77eac8ea79186833503fb
 SHA512:
-  metadata.gz: bef098cd02a0e26ef093432d3dd3233d361b8e4cec1d32c88f94928c7644e9653974e8789bbed6609f5e550c54225997de3130da7f16605fdb607cce56efd3a6
-  data.tar.gz: dd15ddff7b81739385881fbd93e3897ca511db4a6fce1b8aa1eb1df3770848280077eb176e041e0e2c54006d04d724075d685db00c58ea1b7c7fb92752028896
+  metadata.gz: 3f4d7290c9222c0ed84170942c6143a27a469aca8068bc556caeb5fb9c8f9967acb9b7cfcb04796c5785e9078ccad8ba92d7aab7cd9715319ae33912cca20fb1
+  data.tar.gz: 3576971a4a8f027036499520b95002ca27c7520db9418a7862aba0013b69d8bd8e61d86b21151a7dad820d37252cde870e075ef18babaa70c0d076390371f716

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2015, Didier Lafforgue
+Copyright (c) 2017, NoCoffee
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -15,4 +15,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -93,7 +93,7 @@ Feel free to contact me at did at locomotivecms dot com.
 License
 -------
 
-Copyright (c) 2013-2016 NoCoffee, released under the [MIT License (MIT)], see [LICENSE].
+Copyright (c) 2017 NoCoffee, released under the [MIT License (MIT)], see [LICENSE].
 
 [CustomFields]: https://github.com/locomotivecms/custom_fields "Custom fields extension for Mongoid."
 [Gemnasium]: https://gemnasium.com/locomotivecms/custom_fields "CustomFields at Gemnasium"

data/lib/custom_fields/extensions/mongoid/fields/i18n.rb

@@ -35,7 +35,7 @@ module Mongoid #:nodoc
       end
 
       def self.fallbacks?
-        !self.instance.fallbacks.blank? || ::I18n.respond_to?(:fallbacks)
+        !self.instance.fallbacks.blank? || (::I18n.respond_to?(:fallbacks) && !::I18n.fallbacks.blank?)
       end
 
       def self.clear_fallbacks

data/lib/custom_fields/field.rb

@@ -6,7 +6,7 @@ module CustomFields
     include ::Mongoid::Timestamps
 
     AVAILABLE_TYPES = %w(default string text email date date_time boolean file select float integer
-       money tags color relationship_default belongs_to has_many many_to_many)
+       money tags color relationship_default belongs_to has_many many_to_many password json)
 
     ## types ##
     AVAILABLE_TYPES.each do |type|
@@ -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/target.rb

@@ -8,7 +8,8 @@ module CustomFields
 
       ## types ##
       %w(default string text email date date_time boolean file select
-        float integer money color belongs_to has_many many_to_many tags).each do |type|
+        float integer money color belongs_to has_many many_to_many
+        tags password json).each do |type|
         include "CustomFields::Types::#{type.camelize}::Target".constantize
       end
 

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/file.rb

@@ -21,6 +21,7 @@ module CustomFields
             name = rule['name']
 
             klass.mount_uploader name, FileUploader
+            klass.field :"#{name}_size", type: ::Hash, default: {}
 
             if rule['localized'] == true
               klass.replace_field name, ::String, true
@@ -83,6 +84,21 @@ module CustomFields
       end
 
       class FileUploader < ::CarrierWave::Uploader::Base
+
+        process :set_size_in_model
+
+        def set_size_in_model
+          size_field_name = :"#{mounted_as}_size"
+
+          if model.respond_to?(size_field_name)
+            is_localized  = model.fields[mounted_as.to_s].options[:localize]
+            key           = is_localized ? ::Mongoid::Fields::I18n.locale.to_s : 'default'
+            values        = model.send(size_field_name)
+
+            values[key] = file.size
+          end
+        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/json.rb

@@ -0,0 +1,93 @@
+module CustomFields
+
+  module Types
+
+    module Json
+
+      module Field; end
+
+      module Target
+
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          # Adds a json field
+          #
+          # @param [ Class ] klass The class to modify
+          # @param [ Hash ] rule It contains the name of the field and if it is required or not
+          #
+          def apply_json_custom_field(klass, rule)
+            name = rule['name']
+
+            klass.field name, type: Hash, localize: rule['localized'] || false
+            klass.validates_presence_of name if rule['required']
+
+            klass.before_validation { |record| record.send(:add_json_parsing_error, name) }
+
+            klass.send(:define_method, :"#{name}=") do |json|
+              super(decode_json(name, json))
+            end
+          end
+
+          # Build a hash storing the formatted value for
+          # a JSON custom field of an instance.
+          #
+          # @param [ Object ] instance An instance of the class enhanced by the custom_fields
+          # @param [ String ] name The name of the json custom field
+          #
+          # @return [ Hash ] field name => JSON
+          #
+          def json_attribute_get(instance, name)
+            self.default_attribute_get(instance, name)
+          end
+
+          # Set the value for the instance and the date field specified by
+          # the 2 params.
+          #
+          # @param [ Object ] instance An instance of the class enhanced by the custom_fields
+          # @param [ String ] name The name of the date custom field
+          # @param [ Hash ] attributes The attributes used to fetch the values
+          #
+          def json_attribute_set(instance, name, attributes)
+            self.default_attribute_set(instance, name, attributes)
+          end
+
+        end
+
+        protected
+
+        def decode_json(name, json)
+          begin
+            value = json.respond_to?(:to_str) && !json.blank? ? ActiveSupport::JSON.decode(URI.unescape(json)) : json
+            value = nil if json.blank?
+
+            # Only hashes are accepted
+            if value && !value.is_a?(Hash)
+              raise ActiveSupport::JSON.parse_error.new('Only a Hash object is accepted')
+            end
+
+            instance_variable_set(:"@#{name}_json_parsing_error", nil)
+            value
+          rescue ActiveSupport::JSON.parse_error
+            instance_variable_set(:"@#{name}_json_parsing_error", $!.message)
+            nil
+          end
+        end
+
+        def add_json_parsing_error(name)
+          error = instance_variable_get(:"@#{name}_json_parsing_error")
+
+          if error
+            msg = "Invalid #{name}: \"#{error}\". Check it out on http://jsonlint.com"
+            self.errors.add(name, msg)
+          end
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/custom_fields/types/money.rb

@@ -81,7 +81,7 @@ module CustomFields
             klass.send(:define_method, names[:default_currency]) { rule['default_currency'] }
 
             # validations
-            klass.validate { _check_money(names) }  if rule['required']
+            klass.validate { _check_money(names) } if rule['required']
             klass.validates_presence_of(names[:cents_field], names[:currency_field]) if rule['required']
             klass.validates_numericality_of names[:cents_field], only_integer: true, if: names[:cents_field]
 

data/lib/custom_fields/types/password.rb

@@ -0,0 +1,79 @@
+module CustomFields
+  module Types
+    module Password
+
+      module Field
+
+        MIN_PASSWORD_LENGTH = 6
+
+      end
+
+      module Target
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          # Add a password field
+          #
+          # @param [ Class ] klass The class to modify
+          # @param [ Hash ] rule It contains the name of the field and if it is required or not
+          #
+          def apply_password_custom_field(klass, rule)
+            name = rule['name']
+
+            klass.field :"#{name}_hash"
+
+            klass.send(:define_method, name.to_sym) { '' }
+            klass.send(:define_method, :"#{name}=") { |value| _encrypt_password(name, value) }
+
+            klass.validate { _check_password(name) }
+          end
+
+          # Build a hash storing the raw value for
+          # a string custom field of an instance.
+          #
+          # @param [ Object ] instance An instance of the class enhanced by the custom_fields
+          # @param [ String ] name The name of the string custom field
+          #
+          # @return [ Hash ] field name => raw value
+          #
+          def password_attribute_get(instance, name)
+            {}
+          end
+
+          # Set the value for the instance and the string field specified by
+          # the 2 params.
+          #
+          # @param [ Object ] instance An instance of the class enhanced by the custom_fields
+          # @param [ String ] name The name of the string custom field
+          # @param [ Hash ] attributes The attributes used to fetch the values
+          #
+          def password_attribute_set(instance, name, attributes)
+            instance._encrypt_password(name, attributes[name])
+          end
+
+        end # ClassMethods
+
+        def _encrypt_password(name, new_password)
+          return if new_password.blank?
+
+          self.instance_variable_set(:"@#{name}", new_password)
+
+          self.send(:"#{name}_hash=", BCrypt::Password.create(new_password))
+        end
+
+        def _check_password(name)
+          new_password = self.instance_variable_get(:"@#{name}")
+
+          return if new_password.blank?
+
+          if new_password.size < CustomFields::Types::Password::Field::MIN_PASSWORD_LENGTH
+            self.errors.add(name, :too_short, count: 6)
+          end
+        end
+
+      end # Target
+
+    end # Password
+  end # Types
+end # CustomFields

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'] }
@@ -164,10 +164,12 @@ module CustomFields
 
               name = if !option['name'].respond_to?(:merge)
                 option['name']
+              elsif option['name'].has_key?(locale)
+                option['name'][locale.to_s]
               elsif Mongoid::Fields::I18n.fallbacks?
                 option['name'][Mongoid::Fields::I18n.fallbacks[locale.to_sym].map(&:to_s).find { |loc| !option['name'][loc].nil? }]
               else
-                option['name'][locale.to_s]
+                nil
               end
 
               { '_id' => option['_id'], 'name' => name }

data/lib/custom_fields/version.rb

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

data/lib/custom_fields.rb

@@ -3,6 +3,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 require 'active_support'
 require 'carrierwave/mongoid'
 require 'monetize'
+require 'bcrypt'
 
 Money.use_i18n = false
 
@@ -55,6 +56,8 @@ end
      types/has_many
      types/many_to_many
      types/tags
+     types/password
+     types/json
      field
      source
      target_helpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 4.2.7
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.11
 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
@@ -111,8 +125,10 @@ files:
 - lib/custom_fields/types/float.rb
 - lib/custom_fields/types/has_many.rb
 - lib/custom_fields/types/integer.rb
+- lib/custom_fields/types/json.rb
 - lib/custom_fields/types/many_to_many.rb
 - lib/custom_fields/types/money.rb
+- lib/custom_fields/types/password.rb
 - lib/custom_fields/types/relationship_default.rb
 - lib/custom_fields/types/select.rb
 - lib/custom_fields/types/string.rb
@@ -139,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '2.4'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Custom fields extension for Mongoid.