mongoid_auto_increment_id 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2c38dec21ef0b5b1e74421e2c52c365e361414
-  data.tar.gz: 63af6a893e7d8e26b96e87f14f21425dc465d7e6
+  metadata.gz: a8160d010eab6eba7d3cd0bd95ddbeacfcf5d7c0
+  data.tar.gz: cef309121e158817280cadd381a1452b5e750e3a
 SHA512:
-  metadata.gz: 93324b2c58cf12bd2cc1875453cb22a7c6d181a4febf24f367f32ff8d7d30b604e0cf5eaa73bff36d972e588cea1e279e49ea7c5be151ad1d85a7b9f5aefcc64
-  data.tar.gz: 0bede2413f1bb5836e10718d6e4ab902f17f00e531151a198a9f64253a8f7fb83c228b22834dcbb00cbdc6288e2282eceaeda52b5e00d16ac64009b9931c4f7c
+  metadata.gz: ff878aec05fdab650f9e6f68fcaef7fc9f20c92c2f2cc2ce17cc48bbdbc05fc071f4a0de7aaaa6ed840c55de291ab5681f50461282920d3f630b3c4b5a8653a0
+  data.tar.gz: 5b70429926b8cf38001d5289e86b997d7bf0294cec448121e0e9632c4608068030179db366aae120b40c5469f6aa090eb0b4d9c15d86735d08be71a8909787f7

data/README.md

@@ -4,20 +4,20 @@ Idea from MongoDB document: [How to Make an Auto Incrementing Field](http://www.
 
 ## Status
 
-- [![Gem Version](https://badge.fury.io/rb/mongoid_auto_increment_id.png)](https://rubygems.org/gems/mongoid_auto_increment_id)
-- [![CI Status](https://api.travis-ci.org/huacnlee/mongoid_auto_increment_id.png)](http://travis-ci.org/huacnlee/mongoid_auto_increment_id)
+- [![Gem Version](https://badge.fury.io/rb/mongoid_auto_increment_id.svg)](https://rubygems.org/gems/mongoid_auto_increment_id)
+- [![CI Status](https://api.travis-ci.org/huacnlee/mongoid_auto_increment_id.svg)](http://travis-ci.org/huacnlee/mongoid_auto_increment_id)
 
 ## Installation
 
 ```ruby
 # Mongoid 3.0.x
 gem 'mongoid_auto_increment_id', "0.6.1"
-
-# Mongoid 3.1.0
+# Mongoid 3.1.x
 gem 'mongoid_auto_increment_id', "0.6.2"
-
-# Mongoid 4.0.0+
+# Mongoid 4.x
 gem 'mongoid_auto_increment_id', "0.7.0"
+# Mongoid 5.x
+gem 'mongoid_auto_increment_id', "0.8.0"
 ```
 
 ## Configure
@@ -27,14 +27,14 @@ If you want use sequence cache to reduce MongoDB write, you can enable cache:
 config/initializes/mongoid_auto_increment_id.rb
 
 ```ruby
-Mongoid::AutoIncrementId.cache_store = ActiveSupport::Cache.lookup_store(:memcache_store, "127.0.0.1")
+# Mongoid::AutoIncrementId.cache_store = ActiveSupport::Cache::MemoryStore.new
 # First call will generate 200 ids and caching in cache_store
 # Then the next 199 ids will return from cache_store
 # Until 200 ids used, it will generate next 200 ids again.
 Mongoid::AutoIncrementId.seq_cache_size = 200
 ```
 
-> NOTICE! mongoid_auto_increment_id is very fast in default config, you may not need enable that, if you project not need insert huge rows in a moment.
+> NOTE: mongoid_auto_increment_id is very fast in default config, you may don't need enable that, if you project not need insert huge rows in a moment.
 
 ## USAGE
 

data/lib/mongoid/auto_increment_id/version.rb

@@ -0,0 +1,5 @@
+module Mongoid
+  module AutoIncrementId
+    VERSION = '0.8.1'
+  end
+end

data/lib/mongoid_auto_increment_id.rb

@@ -1,60 +1,65 @@
-require "mongoid/auto_increment_id/config"
+require "mongoid"
+require 'active_support/all'
+require 'mongoid/auto_increment_id/config'
+require 'mongoid/auto_increment_id/version'
 
 module Mongoid
   class Identity
-    # Generate auto increment id
-    # params:
-    def self.generate_id(document)
-      cache_key = self.maii_cache_key(document)
-      if Mongoid::AutoIncrementId.cache_enabled?
-        if ids = Mongoid::AutoIncrementId.cache_store.read(cache_key)
-          cached_id = self.shift_id(ids, cache_key)
-          return cached_id if !cached_id.blank?
+    MAII_TABLE_NAME = 'mongoid.auto_increment_ids'.freeze
+
+    class << self
+
+      # Generate auto increment id
+      # params:
+      def generate_id(document)
+        if AutoIncrementId.cache_enabled?
+          cache_key = self.maii_cache_key(document)
+          if ids = Mongoid::AutoIncrementId.cache_store.read(cache_key)
+            cached_id = self.shift_id(ids, cache_key)
+            return cached_id if !cached_id.blank?
+          end
+        end
+
+        opts = {
+          findAndModify: MAII_TABLE_NAME,
+          query: { _id: document.collection_name },
+          update: { '$inc' => { c: AutoIncrementId.seq_cache_size } },
+          upsert: true,
+          new: true
+        }
+        o = Mongoid.default_client.database.command(opts, {})
+
+        last_seq = o.documents[0]['value']['c'].to_i
+
+        if AutoIncrementId.cache_enabled?
+          ids = ((last_seq - AutoIncrementId.seq_cache_size) + 1 .. last_seq).to_a
+          self.shift_id(ids, cache_key)
+        else
+          last_seq
         end
       end
-      
-      database_name = Mongoid::Sessions.default.send(:current_database).name
 
-      o = nil
-      Mongoid::Sessions.default.cluster.with_primary do |node| 
-         o = node.command(database_name, 
-                      {"findAndModify" => "mongoid.auto_increment_ids",  
-                       :query  => { :_id => document.collection_name }, 
-                       :update => { "$inc" => { :c => Mongoid::AutoIncrementId.seq_cache_size }}, 
-                       :upsert => true, 
-                       :new => true }, {})
+      def shift_id(ids, cache_key)
+        return nil if ids.blank?
+        first_id = ids.shift
+        AutoIncrementId.cache_store.write(cache_key, ids)
+        first_id
       end
-      
-      last_seq = o["value"]["c"].to_i
-      
-      if Mongoid::AutoIncrementId.cache_enabled?
-        ids = ((last_seq - Mongoid::AutoIncrementId.seq_cache_size) + 1 .. last_seq).to_a
-        self.shift_id(ids, cache_key)
-      else
-        last_seq
+
+      def maii_cache_key(document)
+        "maii-seqs-#{document.collection_name}"
       end
     end
-    
-    
-    private
-    def self.shift_id(ids, cache_key)
-      return nil if ids.blank?
-      first_id = ids.shift
-      Mongoid::AutoIncrementId.cache_store.write(cache_key, ids)
-      first_id 
-    end
-    
-    def self.maii_cache_key(document)
-      "maii-seqs-#{document.collection_name}"
-    end
   end
 
   module Document
+    ID_FIELD = '_id'.freeze
+
     def self.included(base)
       base.class_eval do
         # define Integer for id field
         Mongoid.register_model(self)
-        field :_id, :type => Integer, :overwrite => true
+        field :_id, type: Integer, overwrite: true
       end
     end
 
@@ -64,11 +69,11 @@ module Mongoid
       nil
     end
 
-    alias_method :super_as_document,:as_document
+    alias_method :super_as_document, :as_document
     def as_document
       result = super_as_document
-      if result["_id"].blank?
-        result["_id"] = Identity.generate_id(self)
+      if result[ID_FIELD].blank?
+        result[ID_FIELD] = Identity.generate_id(self)
       end
       result
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_auto_increment_id
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 6.0.0
 description: This gem for change Mongoid id field as Integer like MySQL.
 email:
 - huacnlee@gmail.com
@@ -39,9 +39,11 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/mongoid/auto_increment_id/config.rb
+- lib/mongoid/auto_increment_id/version.rb
 - lib/mongoid_auto_increment_id.rb
 homepage: https://github.com/huacnlee/mongoid_auto_increment_id
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -59,9 +61,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Override id field with MySQL like auto increment for Mongoid
 test_files: []
-has_rdoc: