custom_fields 2.3.4 → 2.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b1a552f6a1354a2b634cf8a23abac17ce397b4
-  data.tar.gz: 1cd897947e6db09f0e32543a57d89121348d7eb0
+  metadata.gz: 0691b611ee56693347828a7d7c2d5e831d4bfdf4
+  data.tar.gz: 58c48324ef9366f1d1a36876bc0239c212bf5378
 SHA512:
-  metadata.gz: 38424e89463d3223cccf7c6663d8a06583b45d7cbfde534fb58dadb4e18db267f9ae22ccf8609d17af567903d04c5079950429350b55c8cc00230f0ce946de28
-  data.tar.gz: 36cf663eb585b4cf26d0d3ac6dc5301d0bfe4074a56bddd94e9e157587e3dc8dcd92ef949ff2c6d43a82fe437d86757614ee01ad192aa234ceb20354d781ad47
+  metadata.gz: 377cdb5985891770d23ec1f76a0bf6a93057c5ef31c5687b0c743b253f591f34ac2c728f26ca7e46ea2634723b2439ad2cbcfd78e5ad310ea50bd307a3fc512b
+  data.tar.gz: cf70d24c170faa1f6c27c864fcf06cf0f2a3ac5ce2bf7accad0d9e1bf22cd6967872a5df2c7bfe546b3cf8f69ae5becfb67c34e03e979ec6742ca9406e3b3532

data/README.textile

@@ -12,7 +12,7 @@ The main goals:
 
 h2. Requirements
 
-Ruby 2.1.x, ActiveSupport 3.2.21, MongoDB 2.0 and Mongoid 3.1.3
+ActiveSupport 3.2.13, MongoDB 2.0 and Mongoid 3.1.3
 
 h2. Examples
 

data/lib/custom_fields.rb

@@ -4,10 +4,12 @@ require 'active_support'
 require 'carrierwave/mongoid'
 require 'money'
 
+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'
   }
 

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

@@ -4,17 +4,16 @@ 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/i18n.rb

@@ -20,10 +20,10 @@ module Mongoid #:nodoc
       end
 
       def self.fallbacks
-        if !self.instance.fallbacks.blank?
-          self.instance.fallbacks
-        elsif ::I18n.respond_to?(:fallbacks)
+        if ::I18n.respond_to?(:fallbacks)
           ::I18n.fallbacks
+        elsif !self.instance.fallbacks.blank?
+          self.instance.fallbacks
         else
           nil
         end
@@ -35,11 +35,7 @@ module Mongoid #:nodoc
       end
 
       def self.fallbacks?
-        !self.instance.fallbacks.blank? || ::I18n.respond_to?(:fallbacks)
-      end
-
-      def self.clear_fallbacks
-        self.instance.fallbacks.try(:clear)
+        ::I18n.respond_to?(:fallbacks) || !self.instance.fallbacks.blank?
       end
 
       def self.with_locale(new_locale = nil)
@@ -56,4 +52,4 @@ module Mongoid #:nodoc
 
   end
 
-end
+end

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

@@ -4,19 +4,13 @@ module Mongoid # :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

@@ -7,22 +7,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

@@ -13,7 +13,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/field.rb

@@ -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
@@ -172,12 +172,9 @@ module CustomFields
       operations['$set'].merge!({ 'custom_fields_recipe.version' => self.custom_fields_version(name) })
       collection, selector = self.send(name).collection, self.send(name).criteria.selector
 
-      # 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
-      end
+      # puts "selector = #{selector.inspect}, memo = #{attributes.inspect}" # DEBUG
+
+      collection.find(selector).update operations, multi: true
     end
 
     # If the localized attribute has been changed in at least one of the custom fields,

data/lib/custom_fields/types/file.rb

@@ -27,11 +27,7 @@ module CustomFields
             end
 
             if rule['required']
-              # FIXME: previously, we called "klass.validates_presence_of name"
-              # but it didn't work well with localized fields.
-              klass.validate do |object|
-                UploaderPresenceValidator.new(object, name).validate
-              end
+              klass.validates_presence_of name
             end
           end
 
@@ -68,20 +64,6 @@ module CustomFields
 
       end
 
-      class UploaderPresenceValidator
-
-        def initialize(document, name)
-          @document, @name = document, name
-        end
-
-        def validate
-          if @document.send(@name).blank?
-            @document.errors.add(@name, :blank)
-          end
-        end
-
-      end
-
       class FileUploader < ::CarrierWave::Uploader::Base
       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
@@ -34,7 +26,7 @@ module CustomFields
           # @param [ Hash ] rule It contains the name of the relation and if it is required or not
           #
           def apply_has_many_custom_field(klass, rule)
-            # puts "#{klass.inspect}.has_many #{rule['name'].inspect}, class_name: #{rule['class_name'].inspect}, inverse_of: #{rule['inverse_of']}, order_by: #{rule['order_by'].inspect}" # DEBUG
+            # puts "#{klass.inspect}.has_many #{rule['name'].inspect}, class_name: #{rule['class_name'].inspect}, inverse_of: #{rule['inverse_of']}" # DEBUG
             position_name = "position_in_#{rule['inverse_of']}"
 
             _order_by   = rule['order_by'] || position_name.to_sym.asc
@@ -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
@@ -50,7 +42,7 @@ module CustomFields
                 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)
+                  ids = base.send(relation_metadata.key.to_sym)
                   list.entries.sort { |a, b| ids.index(a.id) <=> ids.index(b.id) }
                 end
               end
@@ -72,4 +64,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)
+          ::Money.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 : ::Money.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'] }

data/lib/custom_fields/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 4.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 4.0.8
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.99'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Custom fields extension for Mongoid