custom_fields 2.8.0 → 2.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 88e261b104e415fe6b64700e80b1f69e8e2448b7
-  data.tar.gz: 5dd052af6575958e56d77eac8ea79186833503fb
+SHA256:
+  metadata.gz: 061b3bb511a4f4faf547c49285c6c67a319d8ad748c7c0a21d37bfa67cb3d841
+  data.tar.gz: a45eebe1d9e9db697ee417c7b07d24633477351078cf0a1efb2e174e4c576b6d
 SHA512:
-  metadata.gz: 3f4d7290c9222c0ed84170942c6143a27a469aca8068bc556caeb5fb9c8f9967acb9b7cfcb04796c5785e9078ccad8ba92d7aab7cd9715319ae33912cca20fb1
-  data.tar.gz: 3576971a4a8f027036499520b95002ca27c7520db9418a7862aba0013b69d8bd8e61d86b21151a7dad820d37252cde870e075ef18babaa70c0d076390371f716
+  metadata.gz: 407631ca5ba6a4963221a27d87b87323143fbed3009646959c7d0db38cb7ea3c920301c0e77b4460d9a6399232d999639d8dc8c2eeda19ce6e5949c47d529f14
+  data.tar.gz: 608ba250b8dbc986a0dc0562ac830b8cfa11de3b18ea53a0d798ed23382cc3f54ad5343eca1ce41d3f9210439ff4001578eb829ea73729ebfb78e6da8c3caad5

data/{LICENSE → MIT-LICENSE}

@@ -1,4 +1,6 @@
-Copyright (c) 2017, NoCoffee
+The MIT License (MIT)
+
+Copyright (c) 2018 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

data/README.md

@@ -17,8 +17,8 @@ Requirements
 ------------
 
 * MongoDB 3.x
-* Mongoid 5.x
-* ActiveSupport 4.2.x
+* Mongoid 6.x
+* ActiveSupport 5.2.x
 
 Examples
 --------
@@ -93,7 +93,7 @@ Feel free to contact me at did at locomotivecms dot com.
 License
 -------
 
-Copyright (c) 2017 NoCoffee, released under the [MIT License (MIT)], see [LICENSE].
+Copyright (c) 2018 NoCoffee, released under the [MIT License (MIT)], see [MIT-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.rb

@@ -29,6 +29,8 @@ end
      extensions/carrierwave
      extensions/mongoid/document
      extensions/mongoid/factory
+     extensions/mongoid/criteria/queryable/smash
+     extensions/mongoid/relations/options
      extensions/mongoid/relations/referenced/many
      extensions/mongoid/relations/referenced/in
      extensions/mongoid/fields.rb
@@ -36,7 +38,6 @@ end
      extensions/mongoid/fields/localized.rb
      extensions/mongoid/validations/collection_size.rb
      extensions/mongoid/validations/macros.rb
-     extensions/mongoid/attributes
      extensions/origin/smash.rb
      types/default
      types/string

data/lib/custom_fields/extensions/active_support.rb

@@ -24,5 +24,7 @@ class String
     end
   end
 
-  alias_method_chain :constantize, :custom_fields
+  alias_method :constantize_without_custom_fields, :constantize
+  alias_method :constantize, :constantize_with_custom_fields
+
 end

data/lib/custom_fields/extensions/carrierwave.rb

@@ -19,7 +19,30 @@ module CarrierWave
       end
     end
 
-    alias_method_chain :mount_uploader, :localization
+    alias_method :mount_uploader_without_localization, :mount_uploader
+    alias_method :mount_uploader, :mount_uploader_with_localization
+
+  end
+
+  class Mounter
+
+    def remove_previous_with_localization(before=nil, after=nil)
+      _after = after
+
+      if after && after.first.is_a?(Hash)
+        locale = ::Mongoid::Fields::I18n.locale.to_s
+        _after = [after.first[locale]]
+      end
+
+      remove_previous_without_localization(before, _after)
+    end
+
+    alias_method :remove_previous_without_localization, :remove_previous
+    alias_method :remove_previous, :remove_previous_with_localization
+
+
   end
 
 end
+
+

data/lib/custom_fields/extensions/mongoid/criteria/queryable/smash.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+module Mongoid
+  class Criteria
+    module Queryable
+
+      # This is a smart hash for use with options and selectors.
+      class Smash < Hash
+
+        private
+
+        # Get the localized value for the key if needed. If the field uses
+        # localization the current locale will be appended to the key in
+        # MongoDB dot notation.
+        #
+        # @api private
+        #
+        # @example Get the normalized key name.
+        #   smash.localized_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 localized_key(name, serializer)
+          serializer && serializer.localized? ? "#{name}.#{::Mongoid::Fields::I18n.locale}" : name
+        end
+
+      end
+
+    end
+  end
+end

data/lib/custom_fields/extensions/mongoid/relations/options.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+module Mongoid
+  module Relations
+
+    module Options
+
+      def validate_with_custom_fields!(options)
+        _options = options.dup
+        _options.delete(:custom_fields_parent_klass)
+        validate_without_custom_fields!(_options)
+      end
+
+      alias_method :validate_without_custom_fields!, :validate!
+      alias_method :validate!, :validate_with_custom_fields!
+
+    end
+
+  end
+end

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

@@ -7,7 +7,10 @@ module Mongoid # :nodoc:
           def valid_options_with_parent_class
             valid_options_without_parent_class.push :custom_fields_parent_klass
           end
-          alias_method_chain :valid_options, :parent_class
+
+          alias_method :valid_options_without_parent_class, :valid_options
+          alias_method :valid_options, :valid_options_with_parent_class
+
         end
       end
     end

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

@@ -17,7 +17,9 @@ module Mongoid #:nodoc:
           end
           build_without_custom_fields(attributes, type)
         end
-        alias_method_chain :build, :custom_fields
+
+        alias_method :build_without_custom_fields, :build
+        alias_method :build, :build_with_custom_fields
 
         # new should point to the new build method
         alias :new :build_with_custom_fields

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

@@ -20,7 +20,8 @@ module Mongoid
         self.validate_each_without_collection(record, attribute, value)
       end
 
-      alias_method_chain :validate_each, :collection
+      alias_method :validate_each_without_collection, :validate_each
+      alias_method :validate_each, :validate_each_with_collection
 
       private
 

data/lib/custom_fields/field.rb

@@ -95,7 +95,7 @@ module CustomFields
       return if self.label.blank? && self.name.blank?
 
       if self.name.blank?
-        self.name = self.label.parameterize('_').gsub('-', '_').downcase
+        self.name = self.label.parameterize(separator: '_').gsub('-', '_').downcase
       end
     end
 

data/lib/custom_fields/types/belongs_to.rb

@@ -42,7 +42,7 @@ module CustomFields
 
             klass.field position_name, type: ::Integer, default: 0
 
-            options = { class_name: rule['class_name'] }
+            options = { class_name: rule['class_name'], optional: true }
             options[:inverse_of] = rule['inverse_of'] unless rule['inverse_of'].blank? # an empty String can cause weird behaviours
 
             klass.belongs_to rule['name'].to_sym, options

data/lib/custom_fields/types/password.rb

@@ -19,14 +19,16 @@ module CustomFields
           # @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']
+            label, name = rule['label'], rule['name']
 
             klass.field :"#{name}_hash"
 
             klass.send(:define_method, name.to_sym) { '' }
             klass.send(:define_method, :"#{name}=") { |value| _encrypt_password(name, value) }
+            klass.send(:define_method, :"#{name}_confirmation") { '' }
+            klass.send(:define_method, :"#{name}_confirmation=") { |value| _set_confirmation_password(name, value) }
 
-            klass.validate { _check_password(name) }
+            klass.validate { _check_password(label, name) }
           end
 
           # Build a hash storing the raw value for
@@ -54,6 +56,10 @@ module CustomFields
 
         end # ClassMethods
 
+        def _set_confirmation_password(name, confirmation)
+          self.instance_variable_set(:"@#{name}_confirmation", confirmation)
+        end
+
         def _encrypt_password(name, new_password)
           return if new_password.blank?
 
@@ -62,13 +68,18 @@ module CustomFields
           self.send(:"#{name}_hash=", BCrypt::Password.create(new_password))
         end
 
-        def _check_password(name)
+        def _check_password(label, name)
           new_password = self.instance_variable_get(:"@#{name}")
+          confirmation = self.instance_variable_get(:"@#{name}_confirmation")
 
           return if new_password.blank?
 
           if new_password.size < CustomFields::Types::Password::Field::MIN_PASSWORD_LENGTH
-            self.errors.add(name, :too_short, count: 6)
+            self.errors.add(name, :too_short, count: CustomFields::Types::Password::Field::MIN_PASSWORD_LENGTH)
+          end
+
+          if confirmation && confirmation != new_password
+            self.errors.add("#{name}_confirmation", :confirmation, attribute: label || name)
           end
         end
 

data/lib/custom_fields/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 5.1.5
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -86,10 +86,10 @@ email: didier@nocoffee.fr
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE
+- MIT-LICENSE
 - README.md
 files:
-- LICENSE
+- MIT-LICENSE
 - README.md
 - config/locales/de.yml
 - config/locales/en.yml
@@ -99,12 +99,13 @@ files:
 - lib/custom_fields.rb
 - lib/custom_fields/extensions/active_support.rb
 - lib/custom_fields/extensions/carrierwave.rb
-- lib/custom_fields/extensions/mongoid/attributes.rb
+- lib/custom_fields/extensions/mongoid/criteria/queryable/smash.rb
 - lib/custom_fields/extensions/mongoid/document.rb
 - lib/custom_fields/extensions/mongoid/factory.rb
 - lib/custom_fields/extensions/mongoid/fields.rb
 - lib/custom_fields/extensions/mongoid/fields/i18n.rb
 - lib/custom_fields/extensions/mongoid/fields/localized.rb
+- lib/custom_fields/extensions/mongoid/relations/options.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
@@ -147,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '2.4'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Custom fields extension for Mongoid.

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

@@ -1,14 +0,0 @@
-  module Mongoid
-  module Attributes
-
-    # FIXME: ::Mongoid::Fields::I18n.locale is also a valid locale
-    def selection_included?(name, selection, field)
-      if field && field.localized?
-        selection.has_key?("#{name}.#{::I18n.locale}") || selection.has_key?("#{name}.#{::Mongoid::Fields::I18n.locale}")
-      else
-        selection.has_key?(name)
-      end
-    end
-
-  end
-end