custom_fields 2.2.0 → 2.2.1

data/config/locales/en.yml

@@ -6,11 +6,16 @@ en:
       select: Select
       boolean: Checkbox
       date: Date
-      integer: Integer
       file: File
       integer: Integer
       float: Float
       money: Money
+      email: E-mail
+      tags: Tags
       belongs_to: Belongs to
       has_many: Has many
-      many_to_many: Many To Many
+      many_to_many: Many To Many
+
+  errors:
+    messages:
+      at_least_one_element: "must have at least one element"

data/config/locales/fr.yml

@@ -11,6 +11,7 @@ fr:
       integer: Entier
       float: Décimal
       money: Monnaie
+      tags: Libellés
       belongs_to: Appartient à
       has_many: A plusieurs
       many_to_many: A plusieurs et appartient à
@@ -20,4 +21,5 @@ fr:
 
   errors:
     messages:
-      blank: "doit être rempli(e)"
+      blank: "doit être rempli(e)"
+      at_least_one_element: "doit avoir au moins un élément"

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

@@ -0,0 +1,43 @@
+# encoding: utf-8
+module Mongoid
+  module Validations
+
+    # Validates that the specified collections do or do not match a certain
+    # size.
+    #
+    # @example Set up the collection size validator.
+    #
+    #   class Person
+    #     include Mongoid::Document
+    #     has_many :addresses
+    #
+    #     validates_collection_size_of :addresses, in: 1..10
+    #   end
+    class CollectionSizeValidator < LengthValidator
+
+      def validate_each_with_collection(record, attribute, value)
+        value = collection_to_size(record, attribute)
+
+        self.validate_each_without_collection(record, attribute, value)
+      end
+
+      alias_method_chain :validate_each, :collection
+
+      private
+
+      def collection_to_size(record, attribute)
+        relation = record.relations[attribute.to_s]
+
+        source = case relation.macro
+        when :embeds_many, :has_many
+          record.send(attribute)
+        when :has_and_belongs_to_many
+          record.send(relation.key.to_sym)
+        end
+
+        OpenStruct.new(length: source.try(:size) || 0)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Mongoid
+  module Validations
+    module Macros
+      extend ActiveSupport::Concern
+
+      # Validates the size of a collection.
+      #
+      # @example
+      #   class Person
+      #     include Mongoid::Document
+      #     has_many :addresses
+      #
+      #     validates_collection_size_of :addresses, minimum: 1
+      #   end
+      #
+      # @param [ Array ] args The names of the fields to validate.
+      #
+      # @since 2.4.0
+      def validates_collection_size_of(*args)
+        validates_with(Mongoid::Validations::CollectionSizeValidator, _merge_attributes(args))
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# encoding: utf-8
+module Origin
+
+  # This is a smart hash for use with options and selectors.
+  class Smash < Hash
+
+    private
+
+    # Get the normalized value for the key. If localization is in play the
+    # current locale will be appended to the key in MongoDB dot notation.
+    #
+    # FIXME (Did).
+    # This version DOES NOT USE ::I18n.locale directly.
+    # See the localized.rb file for more explanation.
+    #
+    # @api private
+    #
+    # @example Get the normalized key name.
+    #   smash.normalized_key("field", serializer)
+    #
+    # @param [ String ] name The name of the field.
+    # @param [ Object ] serializer The optional field serializer.
+    #
+    # @return [ String ] The normalized key.
+    #
+    # @since 1.0.0
+    def normalized_key(name, serializer)
+      # serializer && serializer.localized? ? "#{name}.#{::I18n.locale}" : name
+      serializer && serializer.localized? ? "#{name}.#{::Mongoid::Fields::I18n.locale}" : name
+    end
+
+  end
+end

data/lib/custom_fields/types/has_many.rb

@@ -59,7 +59,7 @@ module CustomFields
             klass.accepts_nested_attributes_for rule['name'], allow_destroy: true
 
             if rule['required']
-              klass.validates_length_of rule['name'], minimum: 1
+              klass.validates_collection_size_of rule['name'], minimum: 1, message: :at_least_one_element, on: :update
             end
           end
 

data/lib/custom_fields/types/many_to_many.rb

@@ -38,6 +38,10 @@ module CustomFields
 
             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
+
               def filtered(conditions = {}, order_by = nil)
                 list = conditions.empty? ? self : self.where(conditions)
 
@@ -56,7 +60,7 @@ module CustomFields
             end
 
             if rule['required']
-              klass.validates_length_of rule['name'], minimum: 1
+              klass.validates_collection_size_of rule['name'], minimum: 1, message: :at_least_one_element
             end
           end
 

data/lib/custom_fields/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module CustomFields #:nodoc
 
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 
 end

data/lib/custom_fields.rb

@@ -31,6 +31,9 @@ end
      extensions/mongoid/fields.rb
      extensions/mongoid/fields/i18n.rb
      extensions/mongoid/fields/localized.rb
+     extensions/mongoid/validations/collection_size.rb
+     extensions/mongoid/validations/macros.rb
+     extensions/origin/smash.rb
      types/default
      types/string
      types/text

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -208,6 +208,9 @@ files:
 - lib/custom_fields/extensions/mongoid/fields.rb
 - lib/custom_fields/extensions/mongoid/relations/referenced/in.rb
 - lib/custom_fields/extensions/mongoid/relations/referenced/many.rb
+- lib/custom_fields/extensions/mongoid/validations/collection_size.rb
+- lib/custom_fields/extensions/mongoid/validations/macros.rb
+- lib/custom_fields/extensions/origin/smash.rb
 - lib/custom_fields/field.rb
 - lib/custom_fields/source.rb
 - lib/custom_fields/target.rb
@@ -249,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 633775837337620959
+      hash: 4168219824119967597
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: