custom_fields 1.0.0.beta.7 → 1.0.0.beta.8

data/lib/custom_fields/custom_fields_for.rb

@@ -55,7 +55,7 @@ module CustomFields
           class_eval <<-EOV
             embeds_one :#{collection_name}, :class_name => '::CustomFields::Metadata'
 
-            def #{singular_name}
+            def safe_#{singular_name}
               self.#{collection_name} || self.build_#{collection_name}
             end
 
@@ -65,16 +65,20 @@ module CustomFields
         # common part
         class_eval <<-EOV
           field :#{singular_name}_custom_fields_counter, :type => Integer, :default => 0
+          field :#{singular_name}_custom_fields_version, :type => Integer, :default => 0
 
           embeds_many :#{singular_name}_custom_fields, :class_name => '#{dynamic_custom_field_class_name}'
 
-          validates_associated :#{singular_name}_custom_fields
+          attr_accessor :invalidate_#{singular_name}_klass_flag
 
-          after_validation do |record|
-            if record.errors.empty?
-              record.invalidate_#{singular_name}_klass
+          before_save do |record|
+            if record.invalidate_#{singular_name}_klass?
+              record.#{singular_name}_custom_fields_version ||= 0
+              record.#{singular_name}_custom_fields_version += 1
+              # puts "[parent/before_save] set #{singular_name}_custom_fields_version " + record.#{singular_name}_custom_fields_version.to_s # debug purpose
             end
           end
+
           after_destroy     :invalidate_#{singular_name}_klass
 
           accepts_nested_attributes_for :#{singular_name}_custom_fields, :allow_destroy => true
@@ -88,13 +92,26 @@ module CustomFields
             metadata.klass.to_klass_with_custom_fields(self.ordered_#{singular_name}_custom_fields, self, metadata.name)
           end
 
+          def #{singular_name}_klass
+            metadata = self.relations['#{collection_name.to_s}']
+            metadata.klass.current_klass_with_custom_fields(self, metadata.name)
+          end
+
+          def #{singular_name}_klass_out_of_date?
+            self.#{singular_name}_klass.nil? || self.#{singular_name}_klass.version != self.#{singular_name}_custom_fields_version
+          end
+
           def invalidate_#{singular_name}_klass
             metadata = self.relations['#{collection_name.to_s}']
             metadata.klass.invalidate_proxy_class_with_custom_fields(self, metadata.name)
           end
+
+          def invalidate_#{singular_name}_klass?
+            self.invalidate_#{singular_name}_klass_flag == true
+          end
         EOV
 
-        # mongoid tiny patch: for performance optimization (ie: we do want to invalidate klass every time we save a field)
+        # mongoid tiny patch: for performance optimization (ie: we do want to invalidate klass with custom fields every time we save a field)
         unless instance_methods.include?('write_attributes_with_custom_fields')
           class_eval do
             def write_attributes_with_custom_fields(attrs = nil)

data/lib/custom_fields/field.rb

@@ -34,7 +34,11 @@ module CustomFields
 
     ## callbacks ##
     before_validation :set_alias
-    after_save        :invalidate_klass
+    after_validation  :set_target_klass_flag, :if => Proc.new { |f| f.changed? }
+
+    before_create   :invalidate_target_klass
+    before_update   :invalidate_target_klass
+    after_destroy   :invalidate_target_klass
 
     ## methods ##
 
@@ -69,13 +73,7 @@ module CustomFields
     end
 
     def write_attributes_with_invalidation(attrs = nil)
-      if self.association_name.to_s == '_metadata_custom_fields'
-        target_name = 'metadata'
-      else
-        target_name = self.association_name.to_s.gsub('_custom_fields', '').pluralize
-      end
-
-      klass = self._parent.send(:"fetch_#{target_name.singularize}_klass")
+      klass = self._parent.send(:"fetch_#{singular_target_name}_klass")
 
       write_attributes_without_invalidation(attrs)
 
@@ -84,6 +82,14 @@ module CustomFields
 
     alias_method_chain :write_attributes, :invalidation
 
+    def singular_target_name
+      if self.association_name.to_s == '_metadata_custom_fields'
+        'metadata'
+      else
+        self.association_name.to_s.gsub('_custom_fields', '').singularize
+      end
+    end
+
     def to_hash(more = {})
       self.fields.keys.inject({}) do |memo, meth|
         memo[meth] = self.send(meth.to_sym); memo
@@ -152,11 +158,20 @@ module CustomFields
 
     alias_method_chain :parentize, :custom_fields
 
-    def invalidate_klass
-      return if self._parent.instance_variable_get(:@_writing_attributes_with_custom_fields)
+    def invalidate_target_klass
+      # puts "[field/#{self.label}] invalidate_target_klass" # for debug purpose
+      if self._parent.instance_variable_get(:@_writing_attributes_with_custom_fields)
+        if self.destroyed? # force the parent to invalidate the related target class
+          self.set_target_klass_flag
+        end
+      else
+        self._parent.save
+      end
+    end
 
-      target_name = self.association_name.to_s.gsub('_custom_fields', '')
-      self._parent.send(:"invalidate_#{target_name}_klass")
+    def set_target_klass_flag
+      # puts "[field/set_target_klass_flag/#{self.label}] called" # debug purpose
+      self._parent.send(:"invalidate_#{self.singular_target_name}_klass_flag=", true)
     end
 
   end

data/lib/custom_fields/metadata.rb

@@ -24,8 +24,6 @@ module CustomFields
 
     alias_method_chain :parentize, :custom_fields
 
-
-
   end
 
 end

data/lib/custom_fields/proxy_class_enabler.rb

@@ -6,11 +6,16 @@ module CustomFields
     included do
 
       def self.to_klass_with_custom_fields(fields, parent, association_name)
-        klass_name = self.klass_name_with_custom_fields(parent, association_name)
+        klass = self.current_klass_with_custom_fields(parent, association_name)
 
-        klass = Object.const_defined?(klass_name) ? Object.const_get(klass_name): nil
+        # for debug purpose
+        # if klass.nil?
+        #   puts "[#{association_name.to_s.gsub(/^_/, '').singularize} / #{parent.name rescue 'unknown'}] no klass found"
+        # else
+        #   puts "[#{association_name.to_s.gsub(/^_/, '').singularize} / #{parent.name rescue 'unknown'}] klass nil ? #{klass.nil?} / current version ? #{klass.version.inspect} / parent ? #{self.custom_fields_version(parent, association_name)}" # for debug purpose
+        # end
 
-        if klass && klass.built_at != parent.updated_at.try(:utc) # new version ?
+        if klass && klass.version != self.custom_fields_version(parent, association_name) # new version ?
           self.invalidate_proxy_class_with_custom_fields(parent, association_name)
           klass = nil
         end
@@ -18,13 +23,21 @@ module CustomFields
         if klass.nil?
           klass = self.build_proxy_class_with_custom_fields(fields, parent, association_name)
 
+          klass_name = self.klass_name_with_custom_fields(parent, association_name)
+
           Object.const_set(klass_name, klass)
         end
 
         klass
       end
 
+      def self.custom_fields_version(parent, association_name)
+        singular_name = association_name.to_s.gsub(/^_/, '').singularize
+        parent.send(:"#{singular_name}_custom_fields_version")
+      end
+
       def self.invalidate_proxy_class_with_custom_fields(parent, association_name)
+        # puts "-> invalidate_proxy_class_with_custom_fields !!!!!" # for debug purpose
         klass_name = self.klass_name_with_custom_fields(parent, association_name)
 
         if Object.const_defined?(klass_name)
@@ -32,14 +45,22 @@ module CustomFields
         end
       end
 
+      def self.current_klass_with_custom_fields(parent, association_name)
+        klass_name = self.klass_name_with_custom_fields(parent, association_name)
+
+        Object.const_defined?(klass_name) ? Object.const_get(klass_name): nil
+      end
+
       def self.klass_name_with_custom_fields(parent, association_name)
         "#{association_name.to_s.gsub(/^_/, '').singularize.camelize}#{parent.class.name.camelize}#{parent._id}"
       end
 
       def self.build_proxy_class_with_custom_fields(fields, parent, association_name)
+        # puts "BUILDING PROXY CLASS #{association_name} / parent version #{self.custom_fields_version(parent, association_name)}" # for debug purpose
+
         (klass = Class.new(self)).class_eval <<-EOF
 
-          cattr_accessor :custom_fields, :_parent, :association_name, :built_at
+          cattr_accessor :custom_fields, :_parent, :association_name, :built_at, :version
 
           def self.model_name
             @_model_name ||= ActiveModel::Name.new(self.superclass)
@@ -90,7 +111,7 @@ module CustomFields
 
         [*fields].each { |field| klass.apply_custom_field(field) }
 
-        klass.built_at = parent.updated_at.try(:utc)
+        klass.version = self.custom_fields_version(parent, association_name)
 
         klass
       end

data/lib/custom_fields/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module CustomFields
-    VERSION = "1.0.0.beta.7"
+    VERSION = "1.0.0.beta.8"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: custom_fields
 version: !ruby/object:Gem::Version 
-  hash: 62196365
+  hash: 62196371
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - beta
-  - 7
-  version: 1.0.0.beta.7
+  - 8
+  version: 1.0.0.beta.8
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +01:00
+date: 2011-03-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency