custom_fields 2.0.0.rc5 → 2.0.0.rc6

data/lib/custom_fields/source.rb

@@ -34,8 +34,10 @@ module CustomFields
     # @return [ Class ] The modified class.
     #
     def klass_with_custom_fields(name)
-      recipe = self.custom_fields_recipe_for(name)
-      target = self.send(name).metadata.klass
+      # 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
+      target    = _metadata[:original_klass] || _metadata.klass # avoid to use an already enhanced klass
       target.klass_with_custom_fields(recipe)
     end
 
@@ -100,6 +102,11 @@ module CustomFields
       # puts "old_metadata = #{old_metadata.klass.inspect} / #{old_metadata.object_id.inspect}" # DEBUG
 
       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
+        metadata[:original_klass] ||= metadata.klass
+
         metadata.instance_variable_set(:@klass, self.klass_with_custom_fields(name))
       end
 

data/lib/custom_fields/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module CustomFields #:nodoc
 
-  VERSION = '2.0.0.rc5'
+  VERSION = '2.0.0.rc6'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc5
+  version: 2.0.0.rc6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2161347560 !ruby/object:Gem::Requirement
+  requirement: &2161152700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *2161347560
+  version_requirements: *2161152700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161373020 !ruby/object:Gem::Requirement
+  requirement: &2161161260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161373020
+  version_requirements: *2161161260
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
-  requirement: &2161368520 !ruby/object:Gem::Requirement
+  requirement: &2161171440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2161368520
+  version_requirements: *2161171440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2161378820 !ruby/object:Gem::Requirement
+  requirement: &2161178660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2161378820
+  version_requirements: *2161178660
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2161391900 !ruby/object:Gem::Requirement
+  requirement: &2161175020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2161391900
+  version_requirements: *2161175020
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2161388260 !ruby/object:Gem::Requirement
+  requirement: &2160277500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2161388260
+  version_requirements: *2160277500
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2161402860 !ruby/object:Gem::Requirement
+  requirement: &2160381640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2161402860
+  version_requirements: *2160381640
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2161397800 !ruby/object:Gem::Requirement
+  requirement: &2160379320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2161397800
+  version_requirements: *2160379320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153517660 !ruby/object:Gem::Requirement
+  requirement: &2160376800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2153517660
+  version_requirements: *2160376800
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2153515900 !ruby/object:Gem::Requirement
+  requirement: &2160375400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *2153515900
+  version_requirements: *2160375400
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2153511040 !ruby/object:Gem::Requirement
+  requirement: &2160641700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 4.2.8
   type: :development
   prerelease: false
-  version_requirements: *2153511040
+  version_requirements: *2160641700
 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 Locomotive.
 email:
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1509930786462088485
+      hash: 4211936348599931830
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: