mongoid_auto_increment 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9eeb16f6ea0902e9ea57a6613f9bb9e51296911
-  data.tar.gz: 272948307465c5e11b5e170dab2bab8496839855
+  metadata.gz: b57a7c8bdd4f11322259437dcbc1eb638cd5dbaf
+  data.tar.gz: 4fcdc18e4e4a85450d1ab866365487134d39bc51
 SHA512:
-  metadata.gz: a68283041794f73a6a20a2c75c5a17f41db893890c0b2fd3ebc0839b9f0ca60f1eff25ac29f1756eb390dcb36d2c02b54a193bb3fc4e4f47f57d2a730c69147a
-  data.tar.gz: 0a0631d984d6f98ce8f7c38f21af554ec6bfde1d7dbebee4454deca9075398d5e5ef8535eb3ebcc8fb7117d13a08787a2662a6751bfebe4e3365d20e6fb8e8f6
+  metadata.gz: ecc781dd2b785471d5a2461960e86e5a051d1fae86b2b6052ed10992db64792d581e5b819c0843e5ffbc2402722c9d92a275d1d2f245d44da9158cb1fe5826dd
+  data.tar.gz: b4dca684087f93dabf4ce126dce9da61df4c31ad7529cbeacdfe8e41fb9c72922d7f8cf170e445f6136ccd2b820eefb1a8ec2e5aa04d9058fcfcff27a3107f1c

data/.travis.yml

@@ -1 +1,28 @@
 services: mongodb
+sudo: false                                                                                                   
+
+language: ruby                                                                                                
+
+cache: bundler                                                                                                
+
+rvm:                                                                                                          
+  - 2.2                                                                                                       
+  - 2.1.1                                                                                                     
+  - 2.0.0                                                                                                     
+  - 1.9.3                                                                                                     
+
+env:                                                                                                          
+  - MONGOID_VERSION=2                                                                                         
+  - MONGOID_VERSION=3                                                                                         
+  - MONGOID_VERSION=4                                                                                         
+  - MONGOID_VERSION=5 
+  - MONGOID_VERSION=6 
+
+matrix:
+  exclude: 
+    - rvm: 1.9.3
+      env: MONGOID_VERSION=6
+    - rvm: 2.0.0
+      env: MONGOID_VERSION=6
+    - rvm: 2.1.1
+      env: MONGOID_VERSION=6

data/Gemfile

@@ -2,14 +2,24 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mongoid_auto_increment.gemspec
 
-gem 'mongoid', '>= 2.0'
+version = case ENV['MONGOID_VERSION']
+          when /6/ then '~> 6.0'
+          when /5/ then '~> 5.0'
+          when /4/ then '~> 4.0'
+          when /3/ then '~> 3.0'
+          else
+            '~> 2.0'
+          end
+
+gem 'mongoid', version
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem 'bundler'
-  gem 'jeweler', '~> 1.8.6'
+  gem 'jeweler', '~> 2.1.1'
   gem 'rake'
+  gem 'rack', '~> 1.6.4'
   gem 'rdoc'
   gem 'rspec', '>= 2.0.0'
   gem 'simplecov', '>= 0.4.0', require: false

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/mongoid_auto_increment.rb

@@ -6,10 +6,17 @@ module MongoidAutoIncrement
   module ClassMethods
     def auto_increment(name, options={})
       field name, :type => Integer
-      seq_name = "#{self.name.downcase}_#{name}"
-      @@incrementor = MongoidAutoIncrement::Incrementor.new unless defined? @@incrementor
 
-      before_create { self.send("#{name}=", @@incrementor.inc(seq_name, options)) }
+      unless defined? @@incrementor
+        @@incrementor = MongoidAutoIncrement::Incrementor.new
+      end
+
+      options ||= {}
+      seq_name  = options[:name] || "#{self.name.downcase}_#{name}"
+
+      before_create do
+        send("#{name}=", @@incrementor.inc(seq_name, options))
+      end
     end
   end
 end

data/lib/mongoid_auto_increment/incrementor.rb

@@ -11,7 +11,9 @@ module MongoidAutoIncrement
       end
 
        def inc
-        if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION > '3'
+        if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '5'
+          collection.find(query).find_one_and_update({ '$inc' => { number: @step } }, new: true, upsert: true, return_document: :after)['number']
+        elsif defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '3'
           collection.find(query).modify({ '$inc' => { number: @step } }, new: true, upsert: true)['number']
         else
           opts = {
@@ -24,7 +26,7 @@ module MongoidAutoIncrement
        end
 
       def current
-        if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION > '3'
+        if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '3'
           collection.find(query).one["number"]
         else
           collection.find_one(query)["number"]
@@ -38,11 +40,17 @@ module MongoidAutoIncrement
       end
 
       def create(number)
-        collection.insert(query.merge({ "number" => number }))
+        if ::Mongoid::VERSION >= '5'
+          collection.insert_one(query.merge({ "number" => number }))
+        else
+          collection.insert(query.merge({ "number" => number }))
+        end
       end
 
       def collection
-        if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION > '3'
+        if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '5'
+          Mongoid.default_client[@collection]
+        elsif defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '3'
           Mongoid.default_session[@collection]
         else
           Mongoid.database[@collection]
@@ -58,7 +66,6 @@ module MongoidAutoIncrement
     end
 
     def inc(sequence, options)
-      options ||= {}
       collection = options[:collection] || "sequences"
       seed = options[:seed].to_i
       step = options[:step] || 1

data/mongoid_auto_increment.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: mongoid_auto_increment 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mongoid_auto_increment"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Peter Savichev (proton)"]
-  s.date = "2013-11-17"
+  s.date = "2016-12-01"
   s.description = "Add SQL like auto-incrementing fields to your Mongoid documents."
   s.email = "psavichev@gmail.com"
   s.extra_rdoc_files = [
@@ -32,42 +34,45 @@ Gem::Specification.new do |s|
     "spec/models/invoice.rb",
     "spec/models/order.rb",
     "spec/models/post.rb",
+    "spec/models/record.rb",
     "spec/mongoid_auto_increment_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/proton/mongoid_auto_increment"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.4.8"
   s.summary = "Auto-incrementing fields for Mongoid documents"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.0"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.6"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.1.1"])
       s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rack>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0.4.0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0.8.0"])
     else
-      s.add_dependency(%q<mongoid>, [">= 2.0"])
+      s.add_dependency(%q<mongoid>, ["~> 2.0"])
       s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.6"])
+      s.add_dependency(%q<jeweler>, ["~> 2.1.1"])
       s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rack>, ["~> 1.6.4"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_dependency(%q<simplecov>, [">= 0.4.0"])
       s.add_dependency(%q<database_cleaner>, [">= 0.8.0"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 2.0"])
+    s.add_dependency(%q<mongoid>, ["~> 2.0"])
     s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.6"])
+    s.add_dependency(%q<jeweler>, ["~> 2.1.1"])
     s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rack>, ["~> 1.6.4"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
     s.add_dependency(%q<simplecov>, [">= 0.4.0"])

data/spec/models/book.rb

@@ -1,7 +1,8 @@
 class Book
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '4'
 
   field :title
 
   auto_increment :sequence
-end
+end

data/spec/models/comment.rb

@@ -1,9 +1,10 @@
 class Comment
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '4'
 
   field :text
 
   auto_increment :idn
 
   embedded_in :post
-end
+end

data/spec/models/invoice.rb

@@ -1,5 +1,6 @@
 class Invoice
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '4'
 
   field :name
 

data/spec/models/order.rb

@@ -1,7 +1,8 @@
 class Order
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '4'
 
   field :title
 
   auto_increment :num, :seed => 1000
-end
+end

data/spec/models/post.rb

@@ -1,5 +1,6 @@
 class Post
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '4'
 
   field :title
 
@@ -7,4 +8,4 @@ class Post
   auto_increment :num
 
   embeds_many :comments
-end
+end

data/spec/models/record.rb

@@ -0,0 +1,8 @@
+class Record
+  include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '4'
+
+  field :name
+
+  auto_increment :id2, name: 'Record'
+end

data/spec/mongoid_auto_increment_spec.rb

@@ -1,95 +1,126 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe "mongoid_auto_increment" do
+describe 'mongoid_auto_increment' do
 
   before(:each) do
-    @book1 = Book.create :name => "The Rails Way"
-    @book2 = Book.create :name => "The Ruby Programming Language "
-    @book3 = Book.create :name => "Metaprogramming Ruby"
-    @order1 = Order.create :name => "First Order"
-    @order2 = Order.create :name => "Second Order"
-    @order3 = Order.create :name => "Last Order"
-    @post1 = Post.create :name => "First Post"
-    @post2 = Post.create :name => "Second Post"
-    @post3 = Post.create :name => "Last Post"
-    @comment1 = @post1.comments.create :name => "First Comment"
-    @comment2 = @post1.comments.create :name => "Second Comment"
-    @invoice1 = Invoice.create :name => "First invoice"
-    @invoice2 = Invoice.create :name => "Second invoice"
-    @invoice3 = Invoice.create :name => "Third invoice"
+    @book1 = Book.create :name => 'The Rails Way'
+    @book2 = Book.create :name => 'The Ruby Programming Language '
+    @book3 = Book.create :name => 'Metaprogramming Ruby'
+    @order1 = Order.create :name => 'First Order'
+    @order2 = Order.create :name => 'Second Order'
+    @order3 = Order.create :name => 'Last Order'
+    @post1 = Post.create :name => 'First Post'
+    @post2 = Post.create :name => 'Second Post'
+    @post3 = Post.create :name => 'Last Post'
+    @comment1 = @post1.comments.create :name => 'First Comment'
+    @comment2 = @post1.comments.create :name => 'Second Comment'
+    @invoice1 = Invoice.create :name => 'First invoice'
+    @invoice2 = Invoice.create :name => 'Second invoice'
+    @invoice3 = Invoice.create :name => 'Third invoice'
+    @record1 = Record.create :name => 'First record'
+    @record2 = Record.create :name => 'Second record'
+    @record3 = Record.create :name => 'Third record'
   end
 
-  describe "single auto-increment field" do
-    it "should have id 1" do
-      @book1.sequence.should eql 1
+  describe 'single auto-increment field' do
+    it 'should have id 1' do
+      expect(@book1.sequence).to eql 1
     end
 
-    it "should have id 2" do
-      @book2.sequence.should eql 2
+    it 'should have id 2' do
+      expect(@book2.sequence).to eql 2
     end
 
-    it "should have id 3" do
-      @book3.sequence.should eql 3
+    it 'should have id 3' do
+      expect(@book3.sequence).to eql 3
     end
 
-    it "should have id 1" do
-      @comment1.idn.should eql 1
+    it 'should have id 1' do
+      expect(@comment1.idn).to eql 1
     end
 
-    it "should have id 2" do
-      @comment2.idn.should eql 2
+    it 'should have id 2' do
+      expect(@comment2.idn).to eql 2
     end
   end
 
-  describe "single auto-increment field with seed 1000" do
-    it "should have id 1001" do
-      @order1.num.should eql 1001
+  describe 'single auto-increment field with seed 1000' do
+    it 'should have id 1001' do
+      expect(@order1.num).to eql 1001
     end
 
-    it "should have id 1002" do
-      @order2.num.should eql 1002
+    it 'should have id 1002' do
+      expect(@order2.num).to eql 1002
     end
 
-    it "should have id 1003" do
-      @order3.num.should eql 1003
+    it 'should have id 1003' do
+      expect(@order3.num).to eql 1003
     end
   end
 
-  describe "two auto-increment fields" do
-    it "should have id 1" do
-      @post1.key.should eql 501
+  describe 'two auto-increment fields' do
+    it 'should have id 1' do
+      expect(@post1.key).to eql 501
     end
 
-    it "should have id 2" do
-      @post2.key.should eql 502
+    it 'should have id 2' do
+      expect(@post2.key).to eql 502
     end
 
-    it "should have id 3" do
-      @post3.key.should eql 503
+    it 'should have id 3' do
+      expect(@post3.key).to eql 503
     end
 
-    it "should have id 1" do
-      @post1.num.should eql 1
+    it 'should have id 1' do
+      expect(@post1.num).to eql 1
     end
 
-    it "should have id 2" do
-      @post2.num.should eql 2
+    it 'should have id 2' do
+      expect(@post2.num).to eql 2
     end
 
-    it "should have id 3" do
-      @post3.num.should eql 3
+    it 'should have id 3' do
+      expect(@post3.num).to eql 3
     end
   end
 
-  describe "auto-increment with step" do
-    it "should have id 1005" do
-      @invoice1.num.should eq 1005
+  describe 'auto-increment with step' do
+    it 'should have id 1005' do
+      expect(@invoice1.num).to eq 1005
     end
-    it "should have id 1010" do
-      @invoice2.num.should eq 1010
+    it 'should have id 1010' do
+      expect(@invoice2.num).to eq 1010
     end
-    it "should have id 1015" do
-      @invoice3.num.should eq 1015
+    it 'should have id 1015' do
+      expect(@invoice3.num).to eq 1015
+    end
+  end
+
+  describe 'auto-increment with name' do
+    def collection
+      coll_name = 'sequences'
+
+      if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '5'
+        Mongoid.default_client[coll_name]
+      elsif defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '3'
+        Mongoid.default_session[coll_name]
+      else
+        Mongoid.database[coll_name]
+      end
+    end
+
+    it 'should have id 1' do
+      expect(@record1.id2).to eq 1
+    end
+    it 'should have id 2' do
+      expect(@record2.id2).to eq 2
+    end
+    it 'should have id 3' do
+      expect(@record3.id2).to eq 3
+    end
+
+    it 'should have a sequence name of "Record"' do
+      expect(collection.find(:seq_name => 'Record').first).not_to eq nil
     end
   end
 end

metadata

@@ -1,125 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_auto_increment
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Peter Savichev (proton)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
 description: Add SQL like auto-incrementing fields to your Mongoid documents.
@@ -130,8 +144,8 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .rspec
-- .travis.yml
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -145,6 +159,7 @@ files:
 - spec/models/invoice.rb
 - spec/models/order.rb
 - spec/models/post.rb
+- spec/models/record.rb
 - spec/mongoid_auto_increment_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/proton/mongoid_auto_increment
@@ -157,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Auto-incrementing fields for Mongoid documents