custom_fields 2.4.0.rc5 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59df522a773c83afb22a2378a12e14dce6cd8b3
-  data.tar.gz: d74bbf77539f97cc86e993ff8ae0cecdd21f8bc2
+  metadata.gz: a2d0f1cab5f7e3c7153f38202b4a77b8f466e04d
+  data.tar.gz: eb6e1f46553f3a565939c16ecd15ae5ab6613d87
 SHA512:
-  metadata.gz: 3b1b96bc1e316bb42c4760444a358e38ae77ea07adcb9448b2defb12695505e9b6afa205f28ec8f6a7e292924fc39c10e6cff255ea8717d464b88acfdac32354
-  data.tar.gz: e6a53bca57082c639dccca3b06aed49a952ae59482918b583de4db343fd13b06ca97d18f537c8a89244ae82ea373d4e9e7e729decc9d83b2963d0b196f5790ea
+  metadata.gz: bef098cd02a0e26ef093432d3dd3233d361b8e4cec1d32c88f94928c7644e9653974e8789bbed6609f5e550c54225997de3130da7f16605fdb607cce56efd3a6
+  data.tar.gz: dd15ddff7b81739385881fbd93e3897ca511db4a6fce1b8aa1eb1df3770848280077eb176e041e0e2c54006d04d724075d685db00c58ea1b7c7fb92752028896

data/README.md

@@ -16,8 +16,8 @@ The main goals:
 Requirements
 ------------
 
-* MongoDB 2.x
-* Mongoid 4.x
+* MongoDB 3.x
+* Mongoid 5.x
 * ActiveSupport 4.2.x
 
 Examples
@@ -88,12 +88,12 @@ Run `COVERAGE=true rspec` or `COVERAGE=true rake`.
 Contact
 -------
 
-Feel free to contact me at didier at nocoffee dot fr.
+Feel free to contact me at did at locomotivecms dot com.
 
 License
 -------
 
-Copyright (c) 2013-2015 NoCoffee, released under the [MIT License (MIT)], see [LICENSE].
+Copyright (c) 2013-2016 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"
@@ -101,4 +101,4 @@ Copyright (c) 2013-2015 NoCoffee, released under the [MIT License (MIT)], see [L
 [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"
+[Travis CI Status]: https://img.shields.io/travis/locomotivecms/custom_fields.svg?style=flat "Travis CI Status"

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

@@ -0,0 +1,14 @@
+  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

data/lib/custom_fields/source.rb

@@ -180,7 +180,7 @@ module CustomFields
         next if _fields.empty?
 
         _operation = { "$#{operation_name}" => _fields }
-        collection.find(selector).update _operation, multi: true
+        collection.find(selector).update_many _operation
       end
     end
 
@@ -214,7 +214,7 @@ module CustomFields
         next if updates.empty?
 
         collection = self.send(name).collection
-        collection.find(record.atomic_selector).update({ '$set' => updates })
+        collection.find(record.atomic_selector).update_one({ '$set' => updates })
       end
     end
 

data/lib/custom_fields/types/belongs_to.rb

@@ -11,7 +11,7 @@ module CustomFields
         included do
 
           def belongs_to_to_recipe
-            { 'class_name' => self.class_name }
+            { 'class_name' => self.class_name, 'inverse_of' => self.inverse_of }
           end
 
           def belongs_to_is_relationship?
@@ -42,7 +42,10 @@ module CustomFields
 
             klass.field position_name, type: ::Integer, default: 0
 
-            klass.belongs_to rule['name'].to_sym, class_name: rule['class_name']
+            options = { class_name: rule['class_name'] }
+            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
 
             if rule['required']
               klass.validates_presence_of rule['name'].to_sym

data/lib/custom_fields/types/file.rb

@@ -27,7 +27,11 @@ module CustomFields
             end
 
             if rule['required']
-              klass.validates_presence_of name
+              # 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
             end
           end
 
@@ -64,6 +68,20 @@ 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/version.rb

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

data/lib/custom_fields.rb

@@ -35,6 +35,7 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc5
+  version: 2.5.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,182 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 5.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: monetize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.1
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  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: 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:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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: 0.8.7
+        version: 1.3.1
 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
@@ -211,6 +85,7 @@ 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/document.rb
 - lib/custom_fields/extensions/mongoid/factory.rb
 - lib/custom_fields/extensions/mongoid/fields.rb
@@ -264,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '2.4'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Custom fields extension for Mongoid.