custom_fields 1.0.0.beta.20 → 1.0.0.beta.21

data/lib/custom_fields/custom_fields_for.rb

@@ -5,15 +5,15 @@ module CustomFields
     extend ActiveSupport::Concern
 
     included do
-      cattr_accessor :custom_fields
+      cattr_accessor :_custom_fields_for
 
-      self.custom_fields = []
+      self._custom_fields_for = []
     end
 
     module InstanceMethods
 
-      def custom_fields?(collection_name)
-        self.class.custom_fields?(collection_name)
+      def custom_fields_for?(collection_name)
+        self.class.custom_fields_for?(collection_name)
       end
 
       def clone_metadata_for_custom_fields(metadata)
@@ -57,8 +57,8 @@ module CustomFields
     #
     module ClassMethods
 
-      def custom_fields?(collection_name)
-        self.custom_fields.include?(collection_name.to_s)
+      def custom_fields_for?(collection_name)
+        self._custom_fields_for.include?(collection_name.to_s)
       end
 
       def custom_fields_for(collection_name)
@@ -81,7 +81,7 @@ module CustomFields
         end
 
         # record the collection_name
-        self.custom_fields << collection_name.to_s
+        self._custom_fields_for << collection_name.to_s
 
         # common part
         class_eval <<-EOV
@@ -143,15 +143,17 @@ module CustomFields
         EOV
 
         # 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')
+        unless instance_methods.collect(&:to_s).include?('write_attributes_with_custom_fields')
+
           class_eval do
-            def write_attributes_with_custom_fields(attrs = nil)
+            def write_attributes_with_custom_fields(attrs = nil, guard_protected_attributes = true)
               self.instance_variable_set(:@_writing_attributes_with_custom_fields, true)
-              self.write_attributes_without_custom_fields(attrs)
+              self.write_attributes_without_custom_fields(attrs, guard_protected_attributes)
             end
 
             alias_method_chain :write_attributes, :custom_fields
           end
+
         end
 
         if itself

data/lib/custom_fields/extensions/mongoid/relations/accessors.rb

@@ -16,7 +16,7 @@ module Mongoid # :nodoc:
       #
       # @since 2.0.0.rc.1
       def create_relation_with_custom_fields(object, metadata)
-        if self.respond_to?(:custom_fields?) && self.custom_fields?(metadata.name)
+        if self.respond_to?(:custom_fields_for?) && self.custom_fields_for?(metadata.name)
           metadata = self.clone_metadata_for_custom_fields(metadata)
         end
 

data/lib/custom_fields/extensions/mongoid/relations/builders.rb

@@ -9,7 +9,7 @@ module Mongoid # :nodoc:
         def builder_with_custom_fields(name, metadata)
           tap do
             define_method("build_#{name}") do |*args|
-              if self.custom_fields?(metadata.name)
+              if self.custom_fields_for?(metadata.name)
                 metadata = self.clone_metadata_for_custom_fields(metadata)
               end
 

data/lib/custom_fields/proxy_class_enabler.rb

@@ -71,9 +71,12 @@ module CustomFields
               return unless field.valid?
             end
 
-            (self.custom_fields ||= []) << field
+            self.custom_fields ||= []
 
-            field.apply(self)
+             if self.lookup_custom_field(field._name).nil?
+               self.custom_fields << field
+               field.apply(self)
+             end
           end
 
           def self.lookup_custom_field(name)

data/lib/custom_fields/version.rb

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

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: custom_fields
 version: !ruby/object:Gem::Version 
-  hash: 62196395
   prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - beta
-  - 20
-  version: 1.0.0.beta.20
+  version: 1.0.0.beta.21
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -17,40 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 Z
+date: 2011-07-03 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  prerelease: false
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
         version: 2.0.2
-  requirement: *id001
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
-  type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
-        version: 3.0.7
-  requirement: *id002
+        version: 3.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
 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
@@ -87,6 +71,7 @@ files:
 - config/locales/en.yml
 - config/locales/fr.yml
 - config/locales/pt-BR.yml
+has_rdoc: true
 homepage: http://github.com/locomotivecms/custom_fields
 licenses: []
 
@@ -100,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -3396321950106991976
       segments: 
       - 0
       version: "0"
@@ -109,16 +94,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: nowarning
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Custom fields extension for Mongoid