custom_fields 1.0.0.beta.6 → 1.0.0.beta.7

data/lib/custom_fields/custom_fields_for.rb

@@ -94,6 +94,18 @@ module CustomFields
           end
         EOV
 
+        # mongoid tiny patch: for performance optimization (ie: we do want to invalidate klass 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)
+              self.instance_variable_set(:@_writing_attributes_with_custom_fields, true)
+              self.write_attributes_without_custom_fields(attrs)
+            end
+
+            alias_method_chain :write_attributes, :custom_fields
+          end
+        end
+
         if itself
           class_eval <<-EOV
             alias :self_custom_fields :#{singular_name}_custom_fields

data/lib/custom_fields/field.rb

@@ -34,6 +34,7 @@ module CustomFields
 
     ## callbacks ##
     before_validation :set_alias
+    after_save        :invalidate_klass
 
     ## methods ##
 
@@ -86,6 +87,12 @@ module CustomFields
     def to_hash(more = {})
       self.fields.keys.inject({}) do |memo, meth|
         memo[meth] = self.send(meth.to_sym); memo
+      end.tap do |hash|
+        self.class.field_types.keys.each do |type|
+          if self.respond_to?(:"#{type}_to_hash")
+            hash.merge!(self.send(:"#{type}_to_hash"))
+          end
+        end
       end.merge({
         'id'          => self._id,
         'new_record'  => self.new_record?,
@@ -145,6 +152,13 @@ module CustomFields
 
     alias_method_chain :parentize, :custom_fields
 
+    def invalidate_klass
+      return if self._parent.instance_variable_get(:@_writing_attributes_with_custom_fields)
+
+      target_name = self.association_name.to_s.gsub('_custom_fields', '')
+      self._parent.send(:"invalidate_#{target_name}_klass")
+    end
+
   end
 
 end

data/lib/custom_fields/proxy_class_enabler.rb

@@ -10,6 +10,11 @@ module CustomFields
 
         klass = Object.const_defined?(klass_name) ? Object.const_get(klass_name): nil
 
+        if klass && klass.built_at != parent.updated_at.try(:utc) # new version ?
+          self.invalidate_proxy_class_with_custom_fields(parent, association_name)
+          klass = nil
+        end
+
         if klass.nil?
           klass = self.build_proxy_class_with_custom_fields(fields, parent, association_name)
 
@@ -34,7 +39,7 @@ module CustomFields
       def self.build_proxy_class_with_custom_fields(fields, parent, association_name)
         (klass = Class.new(self)).class_eval <<-EOF
 
-          cattr_accessor :custom_fields, :_parent, :association_name
+          cattr_accessor :custom_fields, :_parent, :association_name, :built_at
 
           def self.model_name
             @_model_name ||= ActiveModel::Name.new(self.superclass)
@@ -85,6 +90,8 @@ module CustomFields
 
         [*fields].each { |field| klass.apply_custom_field(field) }
 
+        klass.built_at = parent.updated_at.try(:utc)
+
         klass
       end
 

data/lib/custom_fields/types/category.rb

@@ -28,6 +28,10 @@ module CustomFields
           self.category_items.collect(&:_id)
         end
 
+        def category_to_hash
+          { 'category_items' => self.category_items.collect(&:to_hash) }
+        end
+
         def apply_category_type(klass)
           klass.class_eval <<-EOF
 
@@ -82,6 +86,21 @@ module CustomFields
         embedded_in :custom_field, :inverse_of => :category_items
 
         validates_presence_of :name
+
+        def to_hash(more = {})
+          self.fields.keys.inject({}) do |memo, meth|
+            memo[meth] = self.send(meth.to_sym); memo
+          end.merge({
+            'id'          => self._id,
+            'new_record'  => self.new_record?,
+            'errors'      => self.errors
+          }).merge(more)
+        end
+
+        def to_json
+          self.to_hash.to_json
+        end
+
       end
     end
   end

data/lib/custom_fields/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: custom_fields
 version: !ruby/object:Gem::Version 
-  hash: 62196367
+  hash: 62196365
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - beta
-  - 6
-  version: 1.0.0.beta.6
+  - 7
+  version: 1.0.0.beta.7
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -17,12 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +01:00
+date: 2011-03-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: mongoid
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -36,11 +37,11 @@ dependencies:
         - 7
         version: 2.0.0.rc.7
   type: :runtime
-  requirement: *id001
-  name: mongoid
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -52,11 +53,11 @@ dependencies:
         - 4
         version: 3.0.4
   type: :runtime
-  requirement: *id002
-  name: activesupport
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: locomotive_carrierwave
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,8 +67,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  requirement: *id003
-  name: locomotive_carrierwave
+  version_requirements: *id003
 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: 
 - didier@nocoffee.fr