custom_fields 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b705c9d565edfff9e7a521cd52e97ed7259323
-  data.tar.gz: 61b63be379d8181d08a6a1adca3bf08208ffe993
+  metadata.gz: 72c3c8e193eb2324800d6718260672b8a1bd6aaf
+  data.tar.gz: 269f5073245c71a88b20eb1da47cacab116c55c0
 SHA512:
-  metadata.gz: e5a0d31ff44f359c071e4f6e50463109d99f465acd4610372b0af09afc5b058565460a91923e646bff5274f0942e4a0a2611dae007d3845134f7608eaed852ae
-  data.tar.gz: 0aec87c37bbb221f6cb781ffcd52dea2cc26bfdc008f6259414097bd95d694de28085537a059bb54fa5f883bf699d6f4cddca7d884f46b7c3965d1756bba5f1f
+  metadata.gz: db1aef98d5992fd7611e64b469c01216c9ccecf101aecdee36060418cc5993142661d8fd852e0f095917df93dc6a7e951971a451720696d56e0769d3be787b0b
+  data.tar.gz: 75cf473439bb423f18b48223ac252b798eb3d45d4280157aa49f9a87fdca7e528a25ddee64a8187def6b4045f7d7cf65bab1d7624c60aa24251d8cb138e5ce80

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

@@ -7,10 +7,12 @@ module Mongoid # :nodoc:
 
         class << self
 
-          def valid_options
-            [:autosave, :foreign_key, :index, :polymorphic, :custom_fields_parent_klass]
+          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

data/lib/custom_fields/source.rb

@@ -172,9 +172,12 @@ 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
 
-      # puts "selector = #{selector.inspect}, memo = #{attributes.inspect}" # DEBUG
-
-      collection.find(selector).update operations, multi: true
+      # 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
     end
 
     # If the localized attribute has been changed in at least one of the custom fields,

data/lib/custom_fields/target.rb

@@ -73,6 +73,8 @@ module CustomFields
       # @return [ Class ] the custom klass
       #
       def klass_with_custom_fields(recipe)
+        return self if recipe.blank? # no recipe provided
+
         name = recipe['name']
 
         (modules = self.name.split('::')).pop

data/lib/custom_fields/types/has_many.rb

@@ -34,7 +34,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']}" # DEBUG
+            # 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
             position_name = "position_in_#{rule['inverse_of']}"
 
             _order_by   = rule['order_by'] || position_name.to_sym.asc
@@ -43,7 +43,7 @@ module CustomFields
             klass.has_many rule['name'], class_name: rule['class_name'], inverse_of: _inverse_of, order: _order_by do
 
               def filtered(conditions = {}, order_by = nil)
-                list = conditions.empty? ? self : self.where(conditions)
+                list = conditions.empty? ? self.unscoped : self.where(conditions)
 
                 if order_by
                   list.order_by(order_by)

data/lib/custom_fields/version.rb

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

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   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: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.8
   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
@@ -176,13 +176,19 @@ extra_rdoc_files:
 files:
 - MIT-LICENSE
 - README.textile
+- config/locales/de.yml
+- config/locales/en.yml
+- config/locales/fr.yml
+- config/locales/pt-BR.yml
+- config/locales/ru.yml
+- lib/custom_fields.rb
 - lib/custom_fields/extensions/active_support.rb
 - lib/custom_fields/extensions/carrierwave.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/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
@@ -210,12 +216,6 @@ files:
 - lib/custom_fields/types/tags.rb
 - lib/custom_fields/types/text.rb
 - lib/custom_fields/version.rb
-- lib/custom_fields.rb
-- config/locales/de.yml
-- config/locales/en.yml
-- config/locales/fr.yml
-- config/locales/pt-BR.yml
-- config/locales/ru.yml
 homepage: http://github.com/locomotivecms/custom_fields
 licenses: []
 metadata: {}
@@ -225,17 +225,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Custom fields extension for Mongoid