mongoid_auto_increment_id 0.4.0 → 0.5.0

data/README.md

@@ -9,27 +9,26 @@ Idea from MongoDB document: [How to Make an Auto Incrementing Field](http://www.
 ## Installation
 
     # for Mongoid 2.2.x
-    gem 'mongoid_auto_increment_id', "0.2.2" 
+    gem 'mongoid_auto_increment_id', "0.2.2"
     # for Mongoid 2.3.x
-    gem 'mongoid_auto_increment_id', "0.3.1" 
-
-
-## REQUIREMENTS
-
-* Mongoid 2.2.0+
+    gem 'mongoid_auto_increment_id', "0.3.1"
+    # for Mongoid 2.4.x
+    gem 'mongoid_auto_increment_id', "0.4.0"
+    # for Mongoid 3.0.x
+    gem 'mongoid_auto_increment_id', "0.5.0"
 
 ## USAGE
 
     ruby > post = Post.new(:title => "Hello world")
-     => #<Post _id: , _type: nil, title: "Hello world", body: nil> 
+     => #<Post _id: , _type: nil, title: "Hello world", body: nil>
     ruby > post.save
      => true
     ruby > post.inspect
-     => "#<Post _id: 6, _type: nil, title: \"Hello world\", body: nil>" 
+     => "#<Post _id: 6, _type: nil, title: \"Hello world\", body: nil>"
     ruby > Post.find("6")
-     => "#<Post _id: 6, _type: nil, title: \"Hello world\", body: nil>" 
+     => "#<Post _id: 6, _type: nil, title: \"Hello world\", body: nil>"
     ruby > Post.find(6)
-     => "#<Post _id: 6, _type: nil, title: \"Hello world\", body: nil>" 
+     => "#<Post _id: 6, _type: nil, title: \"Hello world\", body: nil>"
     ruby > Post.desc(:_id).all.to_a.collect { |row| row.id }
      => [20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1]
 
@@ -38,24 +37,28 @@ Idea from MongoDB document: [How to Make an Auto Incrementing Field](http://www.
 
 with `mongoid_auto_increment_id`:
 
-          user     system      total        real
-    Generate 1  0.010000   0.000000   0.010000 (  0.006182)
-    Post current: 1
+```
+       user     system      total        real
+Generate 1  0.010000   0.000000   0.010000 (  0.004616)
+Post current: 1
+
+Generate 100  0.110000   0.010000   0.120000 (  0.161558)
+Post current: 101
 
-    Generate 100  0.130000   0.010000   0.140000 (  0.406619)
-    Post current: 101
+Generate 10,000 12.460000   1.710000  14.170000 ( 17.940543)
+Post current: 10101
+```
 
-    Generate 10,000  10.160000   0.560000  10.720000 ( 12.518690)
-    Post current: 10101
-    
 without:
 
-          user     system      total        real
-    Generate 1  0.000000   0.000000   0.000000 (  0.171523)
-    Post current: 1
+```
+       user     system      total        real
+Generate 1  0.000000   0.000000   0.000000 (  0.004660)
+Post current: 1
 
-    Generate 100  0.110000   0.000000   0.110000 (  0.129670)
-    Post current: 101
+Generate 100  0.090000   0.000000   0.090000 (  0.091748)
+Post current: 101
 
-    Generate 10,000  9.340000   0.470000   9.810000 ( 11.233426)
-    Post current: 10101
+Generate 10,000  7.710000   0.950000   8.660000 (  8.660268)
+Post current: 10101
+```

data/lib/mongoid_auto_increment_id.rb

@@ -1,24 +1,20 @@
-module Mongoid  
-  class Identity      
-    def identify
-      nil
-    end
-    
-    # Generate auto increment id     
-    def generate_id
-      counter = Mongoid.master.collection("mongoid.auto_increment_ids")
-      o = counter.find_and_modify({:query => {:_id => document.collection_name},
-                                          :update => {:$inc => {:c => 1}}, 
-                                          :new => true, 
-                                          :upsert => true})
-      o["c"].to_i
+module Mongoid
+  class Identity
+    # Generate auto increment id
+    def self.generate_id(document)
+      o = Mongoid::Sessions.default.command({:findAndModify => "mongoid.auto_increment_ids",
+                                             :query  => { :_id => document.collection_name },
+                                             :update => { "$inc" => { :c => 1 } },
+                                             :upsert => true,
+                                             :new    => true })
+      o["value"]["c"]
     end
   end
-  
-  module Document  
+
+  module Document
     # define Integer for id field
     included do
-      identity :type => Integer
+      field :_id, :type => Integer
     end
 
     # hack id nil when Document.new
@@ -26,53 +22,14 @@ module Mongoid
       Identity.new(self).create
       nil
     end
-    
+
     alias_method :super_as_document,:as_document
     def as_document
       result = super_as_document
       if result["_id"].blank?
-        result["_id"] = Identity.new(self).generate_id
+        result["_id"] = Identity.generate_id(self)
       end
       result
     end
   end
-  
-  module Criterion #:nodoc:
-    class Unconvertable < String
-      def initialize(value)
-        super(value.to_s)
-      end
-    end
-  end
-  
-  module Extensions #:nodoc:
-    module ObjectId #:nodoc:
-      # Override Mongoid::Extensions::ObjectId::Conversions.convert for covert id to Integer type.
-      module Conversions
-        def convert(klass, args, reject_blank = true)
-          
-          case args
-          when ::Array
-            args.delete_if { |arg| arg.blank? } if reject_blank
-            args.replace(args.map { |arg| convert(klass, arg, reject_blank) })
-          when ::Hash
-            args.tap do |hash|
-              hash.each_pair do |key, value|
-                # TODO: this code it not good
-                if key.to_s == "_id" and value.class == "".class
-                  value = value.to_i
-                end
-                hash[key] = value
-              end
-            end
-          when ::Integer
-            args
-          else
-            return nil if not args.to_s.match(/\d+/)
-            args.to_i
-          end
-        end
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_auto_increment_id
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70160606208780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *70160606208780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc
 description: This gem for change Mongoid id field as Integer like MySQL.
 email:
 - huacnlee@gmail.com
@@ -51,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Override id field with MySQL like auto increment for Mongoid