mongomapper_plugins 0.0.8 → 1.0.0

data/lib/mongo_mapper/plugins/auto_increment_id.rb

@@ -11,19 +11,16 @@ module MongoMapper
         end
       end
 
-      module InstanceMethods
-        private
-          def generate_document_id(options={})
-            while true
-              oldest_number = self.class.fields(:_id).sort([[:_id, :descending]]).first.try(:id)
-              self.id = oldest_number.to_i + 1
-              begin
-                break if collection.insert({:_id => id}, :safe => true)
-              rescue Mongo::OperationFailure => e
-                #Ignored, trying to get the next key
-              end
-            end
+      def generate_document_id(options={})
+        while true
+          oldest_number = self.class.fields(:_id).sort([[:_id, :descending]]).first.try(:id)
+          self.id = oldest_number.to_i + 1
+          begin
+            break if collection.insert({:_id => id}, :safe => true)
+          rescue Mongo::OperationFailure => e
+            #Ignored, trying to get the next key
           end
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/updating_modifiers.rb

@@ -6,85 +6,83 @@ module MongoMapper
       def self.configure(mod)
       end
 
-      module InstanceMethods
-        def set(hash)
-          hash.each do |key, value|
-            obj, method = get_obj_and_method(key)
-            obj.send("#{method}=", value)
-          end
-          super hash_to_mongo(hash)
+      def set(hash)
+        hash.each do |key, value|
+          obj, method = get_obj_and_method(key)
+          obj.send("#{method}=", value)
         end
+        super hash_to_mongo(hash)
+      end
 
-        def increment(hash)
-          hash.each do |key, value|
-            obj, method = get_obj_and_method(key)
-            val = obj.send(method)
-            obj.send("#{method}=", val + value)
-          end
-          super hash_to_mongo(hash)
+      def increment(hash)
+        hash.each do |key, value|
+          obj, method = get_obj_and_method(key)
+          val = obj.send(method)
+          obj.send("#{method}=", val + value)
         end
+        super hash_to_mongo(hash)
+      end
 
-        def decrement(hash)
-          hash.each do |key, value|
-            obj, method = get_obj_and_method(key)
-            val = obj.send(method)
-            obj.send("#{method}=", val - value)
-          end
-          super hash_to_mongo(hash)
+      def decrement(hash)
+        hash.each do |key, value|
+          obj, method = get_obj_and_method(key)
+          val = obj.send(method)
+          obj.send("#{method}=", val - value)
         end
+        super hash_to_mongo(hash)
+      end
 
-        def push(hash)
-          hash.each do |key, value|
-            obj, method = get_obj_and_method(key)
-            obj = obj.send(method)
-            obj.push value
-          end
-          super hash_to_mongo(hash)
+      def push(hash)
+        hash.each do |key, value|
+          obj, method = get_obj_and_method(key)
+          obj = obj.send(method)
+          obj.push value
         end
+        super hash_to_mongo(hash)
+      end
 
-        def pull(hash)
-          hash.each do |key, value|
-            obj, method = get_obj_and_method(key)
-            obj = obj.send(method)
-            obj.delete_if { |e| e == value }
-          end
-          super hash_to_mongo(hash)
+      def pull(hash)
+        hash.each do |key, value|
+          obj, method = get_obj_and_method(key)
+          obj = obj.send(method)
+          obj.delete_if { |e| e == value }
         end
+        super hash_to_mongo(hash)
+      end
 
-        def add_to_set(hash)
-          hash.each do |key, value|
-            obj, method = get_obj_and_method(key)
-            obj = obj.send(method)
-            obj.push(value) unless obj.include?(value)
-          end
-          super hash_to_mongo(hash)
+      def add_to_set(hash)
+        hash.each do |key, value|
+          obj, method = get_obj_and_method(key)
+          obj = obj.send(method)
+          obj.push(value) unless obj.include?(value)
         end
-        alias push_uniq add_to_set
+        super hash_to_mongo(hash)
+      end
+      alias push_uniq add_to_set
 
-        private
-          def get_obj_and_method(key)
-            children = key.to_s.split(/\./)
-            method = children.pop
+      private
+      def get_obj_and_method(key)
+        children = key.to_s.split(/\./)
+        method = children.pop
 
-            obj = self
-            children.each do |child|
-              obj = obj.send(child)
-            end
+        obj = self
+        children.each do |child|
+          obj = obj.send(child)
+        end
 
-            [obj, method]
-          end
+        [obj, method]
+      end
 
-          def hash_to_mongo(arg)
-            if arg.is_a?(Hash)
-              keys = arg.keys
-              keys.each do |k|
-                arg[k] = hash_to_mongo(arg[k])
-              end
-              arg
-            else
-              arg && arg.respond_to?(:to_mongo) ? arg.to_mongo : arg
-            end
+      def hash_to_mongo(arg)
+        if arg.is_a?(Hash)
+          keys = arg.keys
+          keys.each do |k|
+            arg[k] = hash_to_mongo(arg[k])
           end
+          arg
+        else
+          arg && arg.respond_to?(:to_mongo) ? arg.to_mongo : arg
+        end
       end
     end
   end

data/lib/mongo_mapper/plugins/versioned_update.rb

@@ -12,18 +12,24 @@ module MongoMapper
 
       module OverriddenMethods
         private
-          def update(options={})
-            version = self._version
+        # Overriding save_to_collection in lib/mongo_mapper/plugins/querying.rb
+        def save_to_collection(options={})
+          if persisted?
+            @_new = false
+            old_version = self._version
             self._version += 1
-            ret = collection.update({:_id => _id, :_version => version},
-                                    to_mongo,
-                                    :safe => true)
+            ret = collection.update({:_id => _id, :_version => old_version},
+                             to_mongo,
+                             :safe => true)
             if ret['n'] == 0
               self._version -= 1
               raise InvalidVersion
             end
             ret['err'].nil?
+          else
+            super
           end
+        end
       end
 
       class InvalidVersion < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongomapper_plugins
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-28 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153690340 !ruby/object:Gem::Requirement
+  requirement: &70105439900920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +21,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2153690340
+  version_requirements: *70105439900920
 description: A repository of MongoMapper plugins.
 email: andrew@andrewtimberlake.com
 executables: []
@@ -38,7 +37,6 @@ files:
 - lib/mongomapper_plugins/railtie.rb
 - lib/mongomapper_plugins.rb
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/andrewtimberlake/mongomapper_plugins
 licenses: []
 post_install_message: 
@@ -60,8 +58,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A repository of MongoMapper plugins.
 test_files: []
+has_rdoc: