custom_fields 2.3.3 → 2.4.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c97a9164b3261a278b1f3301269d033c3745924
-  data.tar.gz: ab3202cae5b8b60bfcb29d417d405c9eeadefb9d
+  metadata.gz: c59df522a773c83afb22a2378a12e14dce6cd8b3
+  data.tar.gz: d74bbf77539f97cc86e993ff8ae0cecdd21f8bc2
 SHA512:
-  metadata.gz: ffab683cf013c7a8370f77d3f09804217e5710c89f2d560f2a1e2fb56df8cab72887667e37a5ba75fa8ae2c8979ac9b1456ab5d5ec839e06cbe9849ca10f98d3
-  data.tar.gz: 24302382c64724b139af6d0fd6d1d9eac2e411f43ca255df746cefff608b24ec3f8abc5f96289eba5f7d264c886d3c3cec2b414f6142af5753e96b779e7699f3
+  metadata.gz: 3b1b96bc1e316bb42c4760444a358e38ae77ea07adcb9448b2defb12695505e9b6afa205f28ec8f6a7e292924fc39c10e6cff255ea8717d464b88acfdac32354
+  data.tar.gz: e6a53bca57082c639dccca3b06aed49a952ae59482918b583de4db343fd13b06ca97d18f537c8a89244ae82ea373d4e9e7e729decc9d83b2963d0b196f5790ea

data/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2013-2015, Didier Lafforgue
+
+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
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+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.

data/README.md

@@ -0,0 +1,104 @@
+[CustomFields]
+==============
+
+[![Travis CI Status][Travis CI Status]][Travis CI]
+[![Gemnasium Status][Gemnasium Status]][Gemnasium]
+
+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. Basically, its aim is to provide to editors a way to manage extra fields to a
+Mongoid document through, for instance, a web UI.
+
+The main goals:
+
+* Offering a very secure way to add, edit and delete extra fields to a Mongoid document.
+* Scoping the modifications added to a Mongoid document, so that other documents of the same class won't be updated.
+
+Requirements
+------------
+
+* MongoDB 2.x
+* Mongoid 4.x
+* ActiveSupport 4.2.x
+
+Examples
+--------
+
+### On a `has_many` relationship
+
+```ruby
+class Company
+  include CustomFields::Source
+
+  has_many :employees
+
+  custom_fields_for :employees
+end
+
+class Employee
+  include CustomFields::Target
+
+  field :name, String
+
+  belongs_to :company, inverse_of: :employees
+end
+
+company = Company.new
+company.employees_custom_fields.build label: 'His/her position', name: 'position', type: 'string', required: true
+
+company.save
+
+company.employees.build name: 'Michael Scott', position: 'Regional manager'
+
+another_company = Company.new
+employee = another_company.employees.build
+employee.position # Returns a `not defined method` error
+```
+
+### On the class itself
+
+**IN PROGRESS**
+
+```ruby
+class Company
+  custom_fields_for_itself
+end
+
+company = Company.new
+company.self_metadata_custom_fields.build label: 'Shipping Address', name: 'address', type: 'text'
+
+company.save
+
+company.self_metadata.address = '700 S Laflin, 60607 Chicago'
+
+another_company = Company.new
+other_company.self_metadata.address # Returns a `not defined method` error
+```
+
+Development
+-----------
+
+### Run specs
+
+Run `rspec` or `rake`.
+
+### Test Coverage
+
+Run `COVERAGE=true rspec` or `COVERAGE=true rake`.
+
+Contact
+-------
+
+Feel free to contact me at didier at nocoffee dot fr.
+
+License
+-------
+
+Copyright (c) 2013-2015 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"
+[Gemnasium Status]: https://img.shields.io/gemnasium/locomotivecms/custom_fields.svg?style=flat "Gemnasium Status"
+[LICENSE]: https://raw.githubusercontent.com/locomotivecms/custom_fields/master/LICENSE "License"
+[MIT License (MIT)]: http://opensource.org/licenses/MIT "The MIT License (MIT)"
+[Travis CI]: https://travis-ci.org/locomotivecms/custom_fields "CustomFields at Travis CI"
+[Travis CI Status]: https://img.shields.io/travis/locomotivecms/custom_fields.svg?style=flat "Travis CI Status"

data/lib/custom_fields/extensions/mongoid/document.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Mongoid #:nodoc:
 
   module Document #:nodoc:

data/lib/custom_fields/extensions/mongoid/factory.rb

@@ -1,20 +1,18 @@
-# encoding: utf-8
 module Mongoid #:nodoc:
 
   # Instantiates documents that came from the database.
   module Factory
 
-    def from_db_with_custom_fields(klass, attributes = {}, criteria_instance_id = nil)
+    def from_db_with_custom_fields(klass, attributes = nil, selected_fields = nil)
       if klass.with_custom_fields?
         klass.klass_with_custom_fields(attributes['custom_fields_recipe'])
       end
-      from_db_without_custom_fields(klass, attributes, criteria_instance_id)
+
+      from_db_without_custom_fields(klass, attributes, selected_fields)
     end
 
     # equivalent for "alias_method_chain :from_db, :custom_fields"
     alias_method :from_db_without_custom_fields, :from_db unless method_defined?(:from_db_without_custom_fields)
     alias_method :from_db, :from_db_with_custom_fields
-
   end
-
 end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Mongoid #:nodoc:
   module Fields #:nodoc:
 
@@ -23,7 +22,18 @@ module Mongoid #:nodoc:
         elsif object.has_key?(locale.to_s)
           object[locale.to_s]
         elsif I18n.fallbacks?
-          object[I18n.fallbacks[locale].map(&:to_s).find { |loc| !object[loc].nil? }]
+          lookup_with_fallback(object)
+        else
+          nil
+        end
+      end
+
+      def lookup_with_fallback(object)
+        fallback_locales = I18n.fallbacks[locale].try(:map, &:to_s)
+
+        if fallback_locales
+          _locale = fallback_locales.find { |loc| !object[loc].nil? }
+          object[_locale]
         else
           nil
         end

data/lib/custom_fields/extensions/mongoid/relations/referenced/in.rb

@@ -1,22 +1,15 @@
-# encoding: utf-8
 module Mongoid # :nodoc:
   module Relations #:nodoc:
     module Referenced #:nodoc:
 
       class In < Relations::One
-
         class << self
-
           def valid_options_with_parent_class
             valid_options_without_parent_class.push :custom_fields_parent_klass
           end
-
           alias_method_chain :valid_options, :parent_class
-
         end
-
       end
-
     end
   end
 end

data/lib/custom_fields/extensions/mongoid/relations/referenced/many.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Mongoid #:nodoc:
   module Relations #:nodoc:
     module Referenced #:nodoc:
@@ -7,22 +6,17 @@ module Mongoid #:nodoc:
       # one-to-many between documents in different collections.
       class Many < Relations::Many
 
-        def build_with_custom_fields(attributes = {}, options = {}, type = nil)
-          if base.respond_to?(:custom_fields_for?) && base.custom_fields_for?(metadata.name)
+        def build_with_custom_fields(attributes = {}, type = nil)
+          if base.respond_to?(:custom_fields_for?) && base.custom_fields_for?(relation_metadata.name)
             # all the information about how to build the custom class are stored here
-            recipe = base.custom_fields_recipe_for(metadata.name)
-
+            recipe = base.custom_fields_recipe_for(relation_metadata.name)
             attributes ||= {}
-
             attributes.merge!(custom_fields_recipe: recipe)
-
             # build the class with custom_fields for the first time
-            type = metadata.klass.klass_with_custom_fields(recipe)
+            type = relation_metadata.klass.klass_with_custom_fields(recipe)
           end
-          build_without_custom_fields(attributes, options, type)
-
+          build_without_custom_fields(attributes, type)
         end
-
         alias_method_chain :build, :custom_fields
 
         # new should point to the new build method

data/lib/custom_fields/extensions/mongoid/validations/collection_size.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Mongoid
   module Validations
 
@@ -13,7 +12,7 @@ module Mongoid
     #
     #     validates_collection_size_of :addresses, in: 1..10
     #   end
-    class CollectionSizeValidator < LengthValidator
+    class CollectionSizeValidator < Mongoid::Validatable::LengthValidator
 
       def validate_each_with_collection(record, attribute, value)
         value = collection_to_size(record, attribute)

data/lib/custom_fields/extensions/mongoid/validations/macros.rb

@@ -1,5 +1,5 @@
 module Mongoid
-  module Validations
+  module Validatable
     module Macros
       extend ActiveSupport::Concern
 
@@ -22,4 +22,4 @@ module Mongoid
 
     end
   end
-end
+end

data/lib/custom_fields/extensions/origin/smash.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module Origin
 
   # This is a smart hash for use with options and selectors.

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 relationship_default belongs_to has_many many_to_many)
+       money tags color relationship_default belongs_to has_many many_to_many)
 
     ## types ##
     AVAILABLE_TYPES.each do |type|
@@ -27,7 +27,7 @@ module CustomFields
     validates_presence_of   :label, :type
     validates_exclusion_of  :name, in: lambda { |f| CustomFields.options[:reserved_names].map(&:to_s) }
     validates_inclusion_of  :type, in: AVAILABLE_TYPES, allow_blank: true
-    validates_format_of     :name, with: /^[a-z]([A-Za-z0-9_]+)?$/
+    validates_format_of     :name, with: /^[a-z]([A-Za-z0-9_]+)?$/, multiline: true
     validate                :uniqueness_of_label_and_name
 
     ## callbacks ##
@@ -98,7 +98,8 @@ module CustomFields
     end
 
     def siblings
-      self._parent.send(self.metadata.name)
+      # binding.pry
+      self._parent.send(self.relation_metadata.name)
     end
 
   end

data/lib/custom_fields/source.rb

@@ -36,7 +36,7 @@ module CustomFields
     def klass_with_custom_fields(name)
       # Rails.logger.debug "[CustomFields] klass_with_custom_fields #{self.send(name).metadata.klass} / #{self.send(name).metadata[:old_klass]}" if defined?(Rails) # DEBUG
       recipe    = self.custom_fields_recipe_for(name)
-      _metadata = self.send(name).metadata
+      _metadata = self.send(name).relation_metadata
       target    = _metadata[:original_klass] || _metadata.klass # avoid to use an already enhanced klass
       target.klass_with_custom_fields(recipe)
     end
@@ -66,7 +66,7 @@ module CustomFields
         'name'     => "#{self.relations[name.to_s].class_name.demodulize}#{self._id}",
         'rules'    => self.ordered_custom_fields(name).map(&:to_recipe),
         'version'  => self.custom_fields_version(name),
-        'model_name' => self.relations[name.to_s].class_name.constantize.model_name
+        'model_name' => self.relations[name.to_s].class_name.constantize.model_name.to_s
       }
     end
 
@@ -98,13 +98,13 @@ module CustomFields
     def refresh_metadata_with_custom_fields(name)
       return if !self.persisted? || self.send(:"#{name}_custom_fields").blank? # do not generate a klass without all the information
 
-      old_metadata = self.send(name).metadata
+      old_metadata = self.send(name).relation_metadata
 
       # puts "old_metadata = #{old_metadata.klass.inspect} / #{old_metadata.object_id.inspect}" # DEBUG
 
       # puts "[CustomFields] refresh_metadata_with_custom_fields, #{name.inspect}, self = #{self.inspect}"
 
-      self.send(name).metadata = old_metadata.clone.tap do |metadata|
+      self.send(name).__metadata = old_metadata.clone.tap do |metadata|
         # Rails.logger.debug "[CustomFields] refresh_metadata_with_custom_fields #{metadata.klass}" if defined?(Rails) # DEBUG
 
         # backup the current klass
@@ -175,8 +175,12 @@ module CustomFields
       # http://docs.mongodb.org/manual/reference/method/db.collection.update/#update-parameter
       # The <update> document must contain only update operator expressions.
       %w(set unset rename).each do |operation_name|
-        _operations = { "$#{operation_name}" => operations.delete("$#{operation_name}") }
-        collection.find(selector).update _operations, multi: true
+        _fields = operations.delete("$#{operation_name}")
+
+        next if _fields.empty?
+
+        _operation = { "$#{operation_name}" => _fields }
+        collection.find(selector).update _operation, multi: true
       end
     end
 

data/lib/custom_fields/target.rb

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

data/lib/custom_fields/target_helpers.rb

@@ -37,7 +37,7 @@ module CustomFields
       self.custom_fields_recipe['rules'].map do |rule|
         case rule['type'].to_sym
         when :date, :date_time, :money  then "formatted_#{rule['name']}"
-        when :file                      then [rule['name'], "remove_#{rule['name']}"]
+        when :file                      then [rule['name'], "remove_#{rule['name']}", "remote_#{rule['name']}_url"]
         when :select, :belongs_to       then ["#{rule['name']}_id", "position_in_#{rule['name']}"]
         when :has_many, :many_to_many   then nil
         else

data/lib/custom_fields/types/color.rb

@@ -0,0 +1,55 @@
+module CustomFields
+
+  module Types
+
+    module Color
+
+      module Field; end
+
+      module Target
+
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          # Add a color 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_color_custom_field(klass, rule)
+            apply_custom_field(klass, rule)
+          end
+
+          # Build a hash storing the raw value for
+          # a color 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 color custom field
+          #
+          # @return [ Hash ] field name => raw value
+          #
+          def color_attribute_get(instance, name)
+            self.default_attribute_get(instance, name)
+          end
+
+          # Set the value for the instance and the color 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 color custom field
+          # @param [ Hash ] attributes The attributes used to fetch the values
+          #
+          def color_attribute_set(instance, name, attributes)
+            self.default_attribute_set(instance, name, attributes)
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/custom_fields/types/has_many.rb

@@ -1,11 +1,7 @@
 module CustomFields
-
   module Types
-
     module HasMany
-
       module Field
-
         extend ActiveSupport::Concern
 
         included do
@@ -17,15 +13,11 @@ module CustomFields
           def has_many_is_relationship?
             self.type == 'has_many'
           end
-
         end
-
       end
 
       module Target
-
         extend ActiveSupport::Concern
-
         module ClassMethods
 
           # Adds a has_many relationship between 2 mongoid models
@@ -40,7 +32,7 @@ module CustomFields
             _order_by   = rule['order_by'] || position_name.to_sym.asc
             _inverse_of = rule['inverse_of'].blank? ? nil : rule['inverse_of'] # an empty String can cause weird behaviours
 
-            klass.has_many rule['name'], class_name: rule['class_name'], inverse_of: _inverse_of, order: _order_by do
+            klass.has_many rule['name'], class_name: rule['class_name'], inverse_of: _inverse_of, order: _order_by, validate: false do
 
               def filtered(conditions = {}, order_by = nil)
                 list = conditions.empty? ? self.unscoped : self.where(conditions)
@@ -48,12 +40,10 @@ module CustomFields
                 if order_by
                   list.order_by(order_by)
                 else
-                  list.order_by(metadata.order)
+                  list.order_by(relation_metadata.order)
                 end
               end
-
               alias :ordered :filtered # backward compatibility + semantic purpose
-
             end
 
             klass.accepts_nested_attributes_for rule['name'], allow_destroy: true
@@ -62,13 +52,8 @@ module CustomFields
               klass.validates_collection_size_of rule['name'], minimum: 1, message: :at_least_one_element, on: :update
             end
           end
-
         end
-
       end
-
     end
-
   end
-
 end

data/lib/custom_fields/types/many_to_many.rb

@@ -1,15 +1,10 @@
 module CustomFields
-
   module Types
-
     module ManyToMany
-
       module Field
-
         extend ActiveSupport::Concern
 
         included do
-
           def many_to_many_to_recipe
             { 'class_name' => self.class_name, 'inverse_of' => self.inverse_of, 'order_by' => self.order_by }
           end
@@ -17,13 +12,10 @@ module CustomFields
           def many_to_many_is_relationship?
             self.type == 'many_to_many'
           end
-
         end
-
       end
 
       module Target
-
         extend ActiveSupport::Concern
 
         module ClassMethods
@@ -36,11 +28,7 @@ module CustomFields
           def apply_many_to_many_custom_field(klass, rule)
             # puts "#{klass.inspect}.many_to_many #{rule['name'].inspect}, class_name: #{rule['class_name'].inspect} / #{rule['order_by']}" # DEBUG
 
-            klass.has_and_belongs_to_many rule['name'], class_name: rule['class_name'], inverse_of: rule['inverse_of'], order: rule['order_by'] do
-
-              # def at_least_one_element?
-              #   (base.send(metadata.key.to_sym).try(:size) || 0) > 0
-              # end
+            klass.has_and_belongs_to_many rule['name'], class_name: rule['class_name'], inverse_of: rule['inverse_of'], validate: false, order: rule['order_by'] do
 
               def filtered(conditions = {}, order_by = nil)
                 list = conditions.empty? ? self : self.where(conditions)
@@ -48,15 +36,30 @@ module CustomFields
                 if order_by
                   list.order_by(order_by)
                 else
-                  # use the natural order given by the initial array (ex: project_ids).
-                  # Warning: it returns an array and not a criteria object meaning it breaks the chain
-                  ids = base.send(metadata.key.to_sym)
-                  list.entries.sort { |a, b| ids.index(a.id) <=> ids.index(b.id) }
+                  _naturally_ordered(list, order_by)
                 end
               end
 
               alias :ordered :filtered # backward compatibility + semantic purpose
 
+              def _naturally_ordered(criteria, order_by = nil)
+                # use the natural order given by the initial array (ex: project_ids).
+                # Warning: it returns an array and not a criteria object meaning it breaks the chain
+                ids = base.send(relation_metadata.key.to_sym)
+                criteria.entries.sort { |a, b| ids.index(a.id) <=> ids.index(b.id) }
+              end
+
+              def pluck_with_natural_order(*attributes)
+                criteria = self.only([:_id] + [*attributes])
+                _naturally_ordered(criteria).map do |entry|
+                  if attributes.size == 1
+                    entry.public_send(attributes.first.to_sym)
+                  else
+                    attributes.map { |name| entry.public_send(name.to_sym) }
+                  end
+                end
+              end
+
             end
 
             if rule['required']
@@ -72,4 +75,4 @@ module CustomFields
 
   end
 
-end
+end

data/lib/custom_fields/types/money.rb

@@ -21,7 +21,7 @@ module CustomFields
           end
 
           def check_currency
-            ::Money::Currency.find( self.default_currency )
+            ::Money::Currency.find(self.default_currency)
           end
 
         end # included
@@ -71,18 +71,18 @@ module CustomFields
             klass.field names[:currency_field], type: ::String,  localize: false
 
             # getters and setters
-            klass.send( :define_method, name ) { _get_money(names) }
-            klass.send( :define_method, :"#{name}=" ) { |value| _set_money(value, names) }
+            klass.send(:define_method, name) { _get_money(names) }
+            klass.send(:define_method, :"#{name}=") { |value| _set_money(value, names) }
 
-            klass.send( :define_method, names[:formatted_name_field] ) { _get_formatted_money(names) }
-            klass.send( :define_method, :"#{names[:formatted_name_field]}=" ) { |value| _set_money(value, names) }
+            klass.send(:define_method, names[:formatted_name_field]) { _get_formatted_money(names) }
+            klass.send(:define_method, :"#{names[:formatted_name_field]}=") { |value| _set_money(value, names) }
 
-            klass.send( :define_method, names[:allow_currency_from_symbol] ) { rule['allow_currency_from_symbol'] }
-            klass.send( :define_method, names[:default_currency] ) { rule['default_currency'] }
+            klass.send(:define_method, names[:allow_currency_from_symbol]) { rule['allow_currency_from_symbol'] }
+            klass.send(:define_method, names[:default_currency]) { rule['default_currency'] }
 
             # validations
-            klass.validate { _check_money( names ) }  if rule['required']
-            klass.validates_presence_of( names[:cents_field], names[:currency_field] ) 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]
 
           end
@@ -106,38 +106,38 @@ module CustomFields
 
         protected
 
-        def _set_money_defaults( names )
-          ::Money.assume_from_symbol = self.send( names[:allow_currency_from_symbol] )
-          ::Money.default_currency = self.send( names[:default_currency] )
+        def _set_money_defaults(names)
+          ::Monetize.assume_from_symbol = self.send(names[:allow_currency_from_symbol])
+          ::Money.default_currency = self.send(names[:default_currency])
         end
 
-        def _get_money( names )
-          _set_money_defaults( names )
-          ::Money.new( self.read_attribute( names[:cents_field] ), self.read_attribute( names[:currency_field] ) || ::Money.default_currency )
+        def _get_money(names)
+          _set_money_defaults(names)
+          ::Money.new(self.read_attribute(names[:cents_field]), self.read_attribute(names[:currency_field]) || ::Money.default_currency)
         end
 
-        def _check_money( names )
+        def _check_money(names)
           if [nil, ''].include? self.read_attribute.names[:cents_field]
             raise ArgumentError.new 'Unrecognized amount'
           end
-          _get_money( names )
+          _get_money(names)
         rescue
-          self.errors.add( names[:name], "#{$!}" )
+          self.errors.add(names[:name], "#{$!}")
           false
         end
 
-        def _set_money( _money, names )
+        def _set_money(_money, names)
           return if _money.blank?
-          _set_money_defaults( names )
-          money = _money.kind_of?( Money ) ? _money : ::Money.parse( _money )
-          self.write_attribute( names[:cents_field], money.cents )
-          self.write_attribute( names[:currency_field], money.currency.iso_code )
+          _set_money_defaults(names)
+          money = _money.kind_of?(Money) ? _money : ::Monetize.parse(_money)
+          self.write_attribute(names[:cents_field], money.cents)
+          self.write_attribute(names[:currency_field], money.currency.iso_code)
         rescue
-          self.errors.add( names[:name], "#{$!}" )
+          self.errors.add(names[:name], "#{$!}")
         end
 
-        def _get_formatted_money( names )
-          _get_money( names ).format( symbol: self.send( names[:allow_currency_from_symbol] ), no_cents_if_whole: true ) rescue nil
+        def _get_formatted_money(names)
+          _get_money(names).format(symbol: self.send(names[:allow_currency_from_symbol]), no_cents_if_whole: true) rescue nil
         end
 
       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: Moped::BSON::ObjectId, localize: rule['localized'] || false
+            klass.field :"#{name}_id", type: BSON::ObjectId, localize: rule['localized'] || false
 
             klass.cattr_accessor "_raw_#{base_collection_name}"
             klass.send :"_raw_#{base_collection_name}=", rule['select_options'].sort { |a, b| a['position'] <=> b['position'] }
@@ -134,8 +134,8 @@ module CustomFields
           #
           def group_by_select_option(name, order_by = nil)
             name_id = "#{name}_id"
-            groups = self.each.group_by{|x| x.send(name_id)}.map do |(k, v)|
-              {name_id => k, "group" => v}
+            groups = self.each.group_by { |x| x.send(name_id) }.map do |(k, v)|
+              { name_id => k, 'group' => v }
             end
 
             _select_options(name).map do |option|

data/lib/custom_fields/version.rb

@@ -1,6 +1,5 @@
-# encoding: utf-8
 module CustomFields #:nodoc
 
-  VERSION = '2.3.3'
+  VERSION = '2.4.0.rc5'
 
 end

data/lib/custom_fields.rb

@@ -2,12 +2,14 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 
 require 'active_support'
 require 'carrierwave/mongoid'
-require 'money'
+require 'monetize'
+
+Money.use_i18n = false
 
 module CustomFields
 
   @@options = {
-    reserved_names:     Mongoid.destructive_fields + %w(id _id send class),
+    reserved_names:     Mongoid.destructive_fields + %w(id _id send class destroy),
     default_currency:   'EUR'
   }
 
@@ -46,6 +48,7 @@ end
      types/integer
      types/float
      types/money
+     types/color
      types/relationship_default
      types/belongs_to
      types/has_many

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0.rc5
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -16,114 +16,128 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: carrierwave-mongoid
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: money
+  name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '10.4'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -137,45 +151,58 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
+        version: 4.2.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.9
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.8
-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 Locomotive.
-email:
-- didier@nocoffee.fr
+        version: 0.8.7
+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
 executables: []
 extensions: []
 extra_rdoc_files:
-- MIT-LICENSE
-- README.textile
+- LICENSE
+- README.md
 files:
-- MIT-LICENSE
-- README.textile
+- LICENSE
+- README.md
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/fr.yml
@@ -200,6 +227,7 @@ files:
 - lib/custom_fields/target_helpers.rb
 - lib/custom_fields/types/belongs_to.rb
 - lib/custom_fields/types/boolean.rb
+- lib/custom_fields/types/color.rb
 - lib/custom_fields/types/date.rb
 - lib/custom_fields/types/date_time.rb
 - lib/custom_fields/types/default.rb
@@ -216,8 +244,9 @@ files:
 - lib/custom_fields/types/tags.rb
 - lib/custom_fields/types/text.rb
 - lib/custom_fields/version.rb
-homepage: http://github.com/locomotivecms/custom_fields
-licenses: []
+homepage: https://github.com/locomotivecms/custom_fields
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -225,18 +254,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '2.4'
 requirements: []
-rubyforge_project: nowarning
-rubygems_version: 2.2.0
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Custom fields extension for Mongoid
+summary: Custom fields extension for Mongoid.
 test_files: []

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2013 [Didier Lafforgue]
-
-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 the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR 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.

data/README.textile

@@ -1,70 +0,0 @@
-"!https://secure.travis-ci.org/locomotivecms/custom_fields.png!":http://travis-ci.org/locomotivecms/custom_fields
-
-h1. CustomFields
-
-Manage custom fields to a mongoid document or a collection. This module is one of the core features we implemented in our custom cms, LocomotiveCMS.
-Basically, its aim is to provide to editors a way to manage extra fields to a Mongoid document through, for instance, a web UI.
-
-The main goals:
-
-* offering a very secure way to add / edit / delete extra fields to a Mongoid document
-* scoping the modifications added to a Mongoid document so that other documents of the same class won't be updated.
-
-h2. Requirements
-
-Ruby 2.1.x, ActiveSupport 3.2.21, MongoDB 2.0 and Mongoid 3.1.3
-
-h2. Examples
-
-h3. On a has_many relationship
-
-bc.. class Company
-  include CustomFields::Source
-
-  has_many :employees
-
-  custom_fields_for :employees
-end
-
-class Employee
-  include CustomFields::Target
-
-  field :name, String
-
-  belongs_to :company, :inverse_of => :employees
-end
-
-company = Company.new
-company.employees_custom_fields.build :label => 'His/her position', :name => 'position', :type => 'string', :required => true
-
-company.save
-
-company.employees.build :name => 'Michael Scott', :position => 'Regional manager'
-
-another_company = Company.new
-employee = another_company.employees.build
-employee.position # returns a "not defined method" error
-
-h3. On the class itself
-
-[IN PROGRESS]
-
-bc.. class Company
-  custom_fields_for_itself
-end
-
-company = Company.new
-company.self_metadata_custom_fields.build :label => 'Shipping Address', :name => 'address', :type => 'text'
-
-company.save
-
-company.self_metadata.address = '700 S Laflin, 60607 Chicago'
-
-another_company = Company.new
-other_company.self_metadata.address # returns a "not defined method" error
-
-h2. Contact
-
-Feel free to contact me at didier at nocoffee dot fr.
-
-Copyright (c) 2013 NoCoffee, released under the MIT license