custom_fields 1.0.0.beta.23 → 1.0.0.beta.24

data/lib/custom_fields/types/boolean.rb

@@ -5,23 +5,7 @@ module CustomFields
       extend ActiveSupport::Concern
 
       included do
-        register_type :boolean
-      end
-
-      module InstanceMethods
-
-        def apply_boolean_type(klass)
-
-          klass.class_eval <<-EOF
-            alias :#{self.safe_alias}= :#{self._name}=
-
-            def #{self.safe_alias}
-              ::Boolean.set(self.send(:#{self._name}))
-            end
-          EOF
-
-        end
-
+        register_type :boolean, ::Boolean
       end
 
     end

data/lib/custom_fields/types/has_many/proxy_collection.rb

@@ -75,11 +75,11 @@ module CustomFields
 
         def collection(reload_embedded = false)
           if self.target_klass.embedded?
-            parent_target_klass = self.target_klass._parent
+            parent_target = self.target_klass._parent
 
-            parent_target_klass = parent_target_klass.reload if reload_embedded
+            parent_target = parent_target.reload if reload_embedded
 
-            parent_target_klass.send(self.target_klass.association_name)
+            parent_target.send(self.target_klass.association_name)
           else
             self.target_klass
           end

data/lib/custom_fields/types/has_many/reverse_lookup_proxy_collection.rb

@@ -23,18 +23,20 @@ module CustomFields
         end
 
         def persist
-          (self.previous_state[:ids] - self.ids).each do |id|
-            self.set_foreign_key_and_position(id, nil)
+          (self.previous_state[:values] - self.values).each do |object|
+            self.set_foreign_key_and_position(object, nil)
           end
 
-          self.ids.each_with_index do |id, position|
-            self.set_foreign_key_and_position(id, self.parent._id, position)
+          self.values.each_with_index do |object, position|
+            self.set_foreign_key_and_position(object, self.parent._id, position)
           end
 
           if self.target_klass.embedded?
             self.target_klass._parent.save!(:validate => false)
           end
 
+          self.reorder # update positions in the internal collection (self.values)
+
           self.reset_previous_state
         end
 
@@ -52,29 +54,35 @@ module CustomFields
         end
 
         def reload
-          self.update(self.reverse_collection)
+          self.update(self.reverse_collection(true))
 
           self.reset_previous_state
         end
 
         protected
 
-        def reverse_collection
-          self.collection.where(self.reverse_lookup_field => self.parent._id).order_by([[:"#{self.reverse_lookup_field}_position", :asc]])
+        def reverse_collection(reload = false)
+          self.collection(reload).where(self.reverse_lookup_field => self.parent._id).order_by([[:"#{self.reverse_lookup_field}_position", :asc]])
+        end
+
+        def reorder
+          self.values.sort! { |a, b| a.send(:"#{self.reverse_lookup_field}_position") <=> b.send(:"#{self.reverse_lookup_field}_position") }
         end
 
-        def set_foreign_key_and_position(object_id, value, position = nil)
+        def set_foreign_key_and_position(object, value, position = nil)
+          objects = [object]
+
           if self.target_klass.embedded?
-            object = self.collection.find(object_id)
-          else
-            object = self.previous_state[:values].detect { |o| o._id == object_id }
+            # Fixme (Did): objects in self.values are different from the ones in self.collection
+            objects << self.collection.find(object._id)
           end
 
-          object.send("#{self.reverse_lookup_field}=".to_sym, value)
-
-          object.send("#{self.reverse_lookup_field}_position=".to_sym, position)
+          objects.each do |o|
+            o.send("#{self.reverse_lookup_field}=".to_sym, value)
+            o.send("#{self.reverse_lookup_field}_position=".to_sym, position)
+          end
 
-          if self.target_klass.embedded?
+          unless self.target_klass.embedded?
             object.save(:validate => false)
           end
         end

data/lib/custom_fields/version.rb

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

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: custom_fields
 version: !ruby/object:Gem::Version 
-  hash: 62196397
   prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - beta
-  - 23
-  version: 1.0.0.beta.23
+  version: 1.0.0.beta.24
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -17,40 +10,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 Z
+date: 2011-08-25 00:00:00 Z
 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: 21
-        segments: 
-        - 3
-        - 0
-        - 9
         version: 3.0.9
-  requirement: *id002
+  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
@@ -102,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -3936643888107415339
       segments: 
       - 0
       version: "0"
@@ -111,11 +94,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []