mongoid_auto_increment 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8e52be8ea6565f7e0aa8568608b2a475e5f7a24b
-  data.tar.gz: 847afa9a1c993683742629c35b6065a2c9629a10
+SHA256:
+  metadata.gz: 1c73073d5d05e77517252042ad3a63bb484d5660d5e87cfe4b5ac1a58489d4f7
+  data.tar.gz: a8656612fed0486a237e94eef56c367d16b993dd485397dd32b4901b4eb65fbe
 SHA512:
-  metadata.gz: 5af0b3fb0a4f675069befa779baa3c6e5b5c7ef916afeda0d89fd6cb06a7ac5b238ca7c554ff33b19da30657d6d08edf99249b582398a4803e267f1916681ab1
-  data.tar.gz: 90d05e81ce3542f11726b974c9200cc8769100087ae37ae39f06c9091a35d1291834b54ca311f663c71349dbc7ed23df290ecd2e77d47bf60e75677ef4805f65
+  metadata.gz: 680eb520bbfe7602d7ba364584d781f495bc78c13415205edb9e3f49b51592131e79dc63a723fbe0b179f4bca5acde0b827585d2bcc9713c2cc73848b1d7af65
+  data.tar.gz: a2afacf125b79de0feb111c87835a18773905a1c1c17f7e95b3245fe8f18eccaf3844454e70886185ad5c44e3fb90173067c2f2c14470e42f966285688c117cb

data/.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: _proton
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

data/.travis.yml

@@ -5,24 +5,40 @@ language: ruby
 
 cache: bundler                                                                                                
 
-rvm:                                                                                                          
-  - 2.2                                                                                                       
-  - 2.1.1                                                                                                     
-  - 2.0.0                                                                                                     
-  - 1.9.3                                                                                                     
+rvm:
+  - 3.2.0
+  - 3.1.0
+  - 3.0.0
+  - 2.7.0
+  - 2.3
+  - 2.2
+  - 2.1.1
+  - 2.0.0
 
-env:                                                                                                          
-  - MONGOID_VERSION=2                                                                                         
-  - MONGOID_VERSION=3                                                                                         
-  - MONGOID_VERSION=4                                                                                         
-  - MONGOID_VERSION=5 
-  - MONGOID_VERSION=6 
+env:
+  - MONGOID_VERSION=2
+  - MONGOID_VERSION=3
+  - MONGOID_VERSION=4
+  - MONGOID_VERSION=5
+  - MONGOID_VERSION=6
+  - MONGOID_VERSION=7
+  - MONGOID_VERSION=8
 
 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
+  exclude:
+  - rvm: 2.0.0
+    env: MONGOID_VERSION=6
+  - rvm: 2.1.1
+    env: MONGOID_VERSION=6
+  - rvm: 2.0.0
+    env: MONGOID_VERSION=7
+  - rvm: 2.1.1
+    env: MONGOID_VERSION=7
+  - rvm: 2.0.0
+    env: MONGOID_VERSION=8
+  - rvm: 2.1.1
+    env: MONGOID_VERSION=8
+  - rvm: 2.2
+    env: MONGOID_VERSION=8
+  - rvm: 2.3
+    env: MONGOID_VERSION=8

data/Gemfile

@@ -8,11 +8,11 @@ gem 'mongoid', '>= 2.0'
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem 'bundler'
+  gem 'database_cleaner-mongoid', '~> 2.0', '>= 2.0.1'
   gem 'jeweler', '~> 2.1.1'
-  gem 'rake'
   gem 'rack', '~> 1.6.4'
+  gem 'rake'
   gem 'rdoc'
   gem 'rspec', '>= 2.0.0'
   gem 'simplecov', '>= 0.4.0', require: false
-  gem 'database_cleaner', '>= 0.8.0'
 end

data/README.md

@@ -0,0 +1,88 @@
+# Mongoid::AutoIncrement
+
+Add SQL like auto-incrementing fields to your Mongoid documents. This gem is
+inspired by http://ihswebdesign.com/blog/autoincrement-in-mongodb-with-ruby/
+and the [mongomapper_id2](https://github.com/phstc/mongomapper_id2) gem.
+
+[![travis CI](https://secure.travis-ci.org/proton/mongoid_auto_increment.png)](http://travis-ci.org/proton/mongoid_auto_increment) 
+[![codetriage](https://www.codetriage.com/proton/mongoid_auto_increment/badges/users.svg)](https://www.codetriage.com/proton/mongoid_auto_increment)
+
+## Installation
+
+Add to Gemfile:
+
+    gem 'mongoid_auto_increment'
+
+## Getting Started
+
+Just add `auto_increment :field` to your Mongoid model where `:field` is the
+name of the auto-incremented field you want to create. Example:
+
+    class Book
+      include Mongoid::Document
+
+      field :title
+      field :author
+
+      auto_increment :sequence
+    end
+
+`auto_increment :sequence` will create a field of type `Integer` named
+`sequence` for `Book`.  Whenever an instance of the model is created (intially
+saved to mongoDB), the `auto_increment` field will automatically be set to the
+next number in the sequence.
+
+You can add more than one auto-incremented field per model.
+
+### Options
+
+    auto_increment :sequence, collection: :some_collection
+
+`mongoid_auto_inc` keeps track of the current number in the sequence by
+creating a separate document mongoDB to query and update.  By default
+`auto_increment` will save this document to a mongoDB collection called
+`sequences`.  If you wish to save to a different collection use the
+`:collection` option to specify its name.
+
+    auto_increment :sequence, step: 5
+
+If desired, you can override the `:step`, or increment amount (default is 1).
+
+    auto_increment :sequence, seed: 3333
+
+Use the `:seed` option to set the initial value of the auto-incremented field.
+ The first number assigned from the sequence will be the next number after the
+seed value (including the step - so for `seed: 1000, step: 5`, first value
+will be 1005).
+
+    auto_increment :sequence, scope: :some_field_or_relation
+    auto_increment :sequence, scope: [ :some_field_or_relation, :another_field_or_relation ]
+
+Use the `:scope` option to scope an auto-incremented field to a query. 
+Similar to Mongoid, the scope may contain one or many fields or relations. 
+Each unique scope will result in it's own stream of incremented values.
+
+## Contributing to Mongoid::AutoIncrement
+
+*   Check out the latest master to make sure the feature hasn't been
+    implemented or the bug hasn't been fixed yet
+*   Check out the issue tracker to make sure someone already hasn't requested
+    it and/or contributed it
+*   Fork the project
+*   Start a feature/bugfix branch
+*   Commit and push until you are happy with your contribution
+*   Make sure to add tests for it. This is important so I don't break it in a
+    future version unintentionally.
+*   Please try not to mess with the Rakefile, version, or history. If you want
+    to have your own version, or is otherwise necessary, that is fine, but
+    please isolate to its own commit so I can cherry-pick around it.
+
+## Support us
+
+https://www.patreon.com/_proton
+
+## Copyright
+
+(c) 2011-2023 Peter Savichev (proton) (c) 2010-2011 Jeff Smith
+
+See LICENSE.txt for further details.

data/Rakefile

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'rubygems'
 require 'rake'
 require 'bundler'
@@ -8,21 +6,21 @@ Bundler::GemHelper.install_tasks
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "mongoid_auto_increment"
-  gem.homepage = "http://github.com/proton/mongoid_auto_increment"
-  gem.license = "MIT"
-  gem.summary = %q{Auto-incrementing fields for Mongoid documents}
-  gem.description = %q{Add SQL like auto-incrementing fields to your Mongoid documents.}
-  gem.email = "psavichev@gmail.com"
-  gem.authors = ["Peter Savichev (proton)"]
+  gem.name = 'mongoid_auto_increment'
+  gem.homepage = 'http://github.com/proton/mongoid_auto_increment'
+  gem.license = 'MIT'
+  gem.summary = 'Auto-incrementing fields for Mongoid documents'
+  gem.description = 'Add SQL like auto-incrementing fields to your Mongoid documents.'
+  gem.email = 'psavichev@gmail.com'
+  gem.authors = ['Peter Savichev (proton)']
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -33,11 +31,11 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
 end
 
-task :default => :spec
+task default: :spec
 
 require 'rdoc/task'
 RDoc::Task.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?('VERSION') ? File.read('VERSION') : ''
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "mongoid_auto_increment #{version}"
@@ -45,15 +43,15 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc "Build gem"
+desc 'Build gem'
 task :build do
-	puts "Regenerating gemspec"
-  system "rake gemspec"
-	puts "Building"
-  system "gem build mongoid_auto_increment.gemspec"
+  puts 'Regenerating gemspec'
+  system 'rake gemspec'
+  puts 'Building'
+  system 'gem build mongoid_auto_increment.gemspec'
 end
 
-desc "Release gem"
-task :release => :build do
-	version = File.exist?('VERSION') ? File.read('VERSION') : ""
+desc 'Release gem'
+task release: :build do
+  version = File.exist?('VERSION') ? File.read('VERSION') : ''
 end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.6

data/lib/mongoid_auto_increment/incrementor.rb

@@ -1,35 +1,36 @@
 # This is a modified version of the code found on this blog post:
-#   http://ihswebdesign.com/blog/autoincrement-in-mongodb-with-ruby/
+# http://ihswebdesign.com/blog/autoincrement-in-mongodb-with-ruby/
 module MongoidAutoIncrement
   class Incrementor
     class Sequence
-      def initialize(sequence, collection_name, seed, step)
+      def initialize(sequence, collection_name, seed, step, scope)
         @sequence = sequence.to_s
         @collection = collection_name.to_s
+        @scope = scope || {}
         exists? || create(seed)
         @step = step.to_i
       end
 
-       def inc
+      def inc
         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 = {
-            "query"  => query,
-            "update" => {"$inc" => { "number" => @step }},
-            "new"    => true # return the modified document
+            'query'  => query,
+            'update' => { '$inc' => { 'number' => @step } },
+            'new'    => true # return the modified document
           }
-          collection.find_and_modify(opts)["number"]
+          collection.find_and_modify(opts)['number']
         end
-       end
+      end
 
       def current
         if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '3'
-          collection.find(query).one["number"]
+          collection.find(query).one['number']
         else
-          collection.find_one(query)["number"]
+          collection.find_one(query)['number']
         end
       end
 
@@ -41,9 +42,9 @@ module MongoidAutoIncrement
 
       def create(number)
         if ::Mongoid::VERSION >= '5'
-          collection.insert_one(query.merge({ "number" => number }))
+          collection.insert_one(query.merge('number' => number))
         else
-          collection.insert(query.merge({ "number" => number }))
+          collection.insert(query.merge('number' => number))
         end
       end
 
@@ -58,18 +59,35 @@ module MongoidAutoIncrement
       end
 
       def query
-        { "seq_name" => @sequence }
+        @scope.merge('seq_name' => @sequence)
       end
     end
 
-    def initialize(options=nil)
-    end
+    def initialize(options = nil); end
 
-    def inc(sequence, options)
-      collection = options[:collection] || "sequences"
+    def inc(sequence, options, record)
+      collection = options[:collection] || 'sequences'
       seed = options[:seed].to_i
       step = options[:step] || 1
-      Sequence.new(sequence, collection, seed, step).inc
+      scope = resolve_scope(record, options[:scope])
+
+      Sequence.new(sequence, collection, seed, step, scope).inc
+    end
+
+    private
+
+    def resolve_scope(record, scope)
+      Array(scope).each_with_object({}) do |scope_item, query|
+        reflection = record.class.reflect_on_association(scope_item)
+
+        if reflection
+          scope_value = record.send(reflection.foreign_key)
+          scope_item  = reflection.foreign_key
+          query[scope_item] = scope_value
+        else
+          query[scope_item] = record.read_attribute(scope_item)
+        end
+      end
     end
   end
 end

data/lib/mongoid_auto_increment.rb

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

data/mongoid_auto_increment.gemspec

@@ -2,28 +2,29 @@
 # 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.4 ruby lib
+# stub: mongoid_auto_increment 0.1.6 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "mongoid_auto_increment"
-  s.version = "0.1.4"
+  s.name = "mongoid_auto_increment".freeze
+  s.version = "0.1.6"
 
-  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 = "2016-12-05"
-  s.description = "Add SQL like auto-incrementing fields to your Mongoid documents."
-  s.email = "psavichev@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Peter Savichev (proton)".freeze]
+  s.date = "2023-03-08"
+  s.description = "Add SQL like auto-incrementing fields to your Mongoid documents.".freeze
+  s.email = "psavichev@gmail.com".freeze
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
+    ".github/FUNDING.yml",
     ".rspec",
     ".travis.yml",
     "Gemfile",
     "LICENSE",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "lib/mongoid_auto_increment.rb",
@@ -31,52 +32,30 @@ Gem::Specification.new do |s|
     "mongoid_auto_increment.gemspec",
     "spec/models/book.rb",
     "spec/models/comment.rb",
+    "spec/models/ingredient.rb",
     "spec/models/invoice.rb",
     "spec/models/order.rb",
     "spec/models/post.rb",
+    "spec/models/recipe.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.rubygems_version = "2.4.8"
-  s.summary = "Auto-incrementing fields for Mongoid documents"
+  s.homepage = "http://github.com/proton/mongoid_auto_increment".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.4.6".freeze
+  s.summary = "Auto-incrementing fields for Mongoid documents".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  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_development_dependency(%q<bundler>, [">= 0"])
-      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<bundler>, [">= 0"])
-      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<bundler>, [">= 0"])
-    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
+  s.add_runtime_dependency(%q<mongoid>.freeze, [">= 2.0"])
+  s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+  s.add_development_dependency(%q<database_cleaner-mongoid>.freeze, ["~> 2.0", ">= 2.0.1"])
+  s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.1.1"])
+  s.add_development_dependency(%q<rack>.freeze, ["~> 1.6.4"])
+  s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+  s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
+  s.add_development_dependency(%q<rspec>.freeze, [">= 2.0.0"])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0.4.0"])
 end
 

data/spec/models/ingredient.rb

@@ -0,0 +1,12 @@
+class Ingredient
+  include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '4'
+
+  field :name
+  field :type
+
+  belongs_to :recipe
+
+  auto_increment :order, scope: :recipe
+  auto_increment :cost, scope: %i[recipe type]
+end

data/spec/models/invoice.rb

@@ -4,6 +4,5 @@ class Invoice
 
   field :name
 
-  auto_increment :num, :seed => 1000, :step => 5
+  auto_increment :num, seed: 1000, step: 5
 end
-

data/spec/models/order.rb

@@ -4,5 +4,5 @@ class Order
 
   field :title
 
-  auto_increment :num, :seed => 1000
+  auto_increment :num, seed: 1000
 end

data/spec/models/post.rb

@@ -4,7 +4,7 @@ class Post
 
   field :title
 
-  auto_increment :key, :seed => 500
+  auto_increment :key, seed: 500
   auto_increment :num
 
   embeds_many :comments

data/spec/models/recipe.rb

@@ -0,0 +1,11 @@
+class Recipe
+  include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION >= '4'
+
+  field :name
+  field :chef
+
+  has_many :ingredients
+
+  auto_increment :rank, scope: :chef
+end

data/spec/mongoid_auto_increment_spec.rb

@@ -1,25 +1,24 @@
 require 'spec_helper'
 
 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'
-    @record1 = Record.create :name => 'First record'
-    @record2 = Record.create :name => 'Second record'
-    @record3 = Record.create :name => 'Third record'
+    @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
@@ -120,7 +119,64 @@ describe 'mongoid_auto_increment' do
     end
 
     it 'should have a sequence name of "Record"' do
-      expect(collection.find(:seq_name => 'Record').first).not_to eq nil
+      expect(collection.find(seq_name: 'Record').first).not_to eq nil
+    end
+  end
+
+  describe 'auto-increment with scope' do
+    context 'when scope is a relation' do
+      before do
+        @recipe1 = Recipe.create
+        @recipe2 = Recipe.create
+      end
+
+      it 'should have multiple with the same value' do
+        expect(@recipe1.ingredients.create.order).to eq 1
+        expect(@recipe2.ingredients.create.order).to eq 1
+      end
+
+      it 'should increment each scope separately' do
+        3.times.each { |n| @recipe1.ingredients.create(name: n + 1) }
+        9.times.each { |n| @recipe2.ingredients.create(name: n + 1) }
+        expect(Ingredient.find_by(recipe: @recipe2, name: 3).order).to eq 3
+        expect(Ingredient.find_by(recipe: @recipe2, name: 9).order).to eq 9
+      end
+    end
+
+    context 'when scope is a field' do
+      it 'should have multiple with the same value' do
+        expect(Recipe.create(chef: 'Jack').rank).to eq 1
+        expect(Recipe.create(chef: 'Jill').rank).to eq 1
+      end
+
+      it 'should increment each scope separately' do
+        3.times.each { |n| Recipe.create(chef: 'Jack', name: n + 1) }
+        9.times.each { |n| Recipe.create(chef: 'Jill', name: n + 1) }
+        expect(Recipe.find_by(chef: 'Jack', name: 3).rank).to eq 3
+        expect(Recipe.find_by(chef: 'Jill', name: 9).rank).to eq 9
+      end
+    end
+
+    context 'when scope is an array' do
+      before do
+        @recipe1 = Recipe.create
+        @recipe2 = Recipe.create
+      end
+
+      it 'should have multiple with the same value' do
+        expect(Ingredient.create(recipe: @recipe1, type: 'greens').cost).to eq 1
+        expect(Ingredient.create(recipe: @recipe1, type: 'meats').cost).to eq 1
+        expect(Ingredient.create(recipe: @recipe2, type: 'greens').cost).to eq 1
+      end
+
+      it 'should increment each scope separately' do
+        2.times.each { |n| Ingredient.create(recipe: @recipe1, type: 'greens', name: n + 1) }
+        3.times.each { |n| Ingredient.create(recipe: @recipe1, type: 'meats', name: n + 1) }
+        5.times.each { |n| Ingredient.create(recipe: @recipe2, type: 'greens', name: n + 1) }
+        expect(Ingredient.find_by(recipe: @recipe1, type: 'greens', name: 2).cost).to eq 2
+        expect(Ingredient.find_by(recipe: @recipe1, type: 'meats', name: 3).cost).to eq 3
+        expect(Ingredient.find_by(recipe: @recipe2, type: 'greens', name: 5).cost).to eq 5
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-MODELS = File.join(File.dirname(__FILE__), "models")
+MODELS = File.join(File.dirname(__FILE__), 'models')
 
-require "rubygems"
-require "mongoid"
-require "mongoid_auto_increment"
-require "database_cleaner"
-require "simplecov"
+require 'rubygems'
+require 'mongoid'
+require 'mongoid_auto_increment'
+require 'database_cleaner/mongoid'
+require 'simplecov'
 
 SimpleCov.start
 
@@ -15,25 +15,23 @@ Dir["#{MODELS}/*.rb"].each { |f| require f }
 
 if defined?(::Mongoid::VERSION) && ::Mongoid::VERSION > '3'
   Mongoid.configure do |config|
-    config.connect_to "mongoid_auto_increment_test"
+    config.connect_to 'mongoid_auto_increment_test'
   end
 else
-  Mongoid.config.master = Mongo::Connection.new.db("mongoid_auto_increment_test")
+  Mongoid.config.master = Mongo::Connection.new.db('mongoid_auto_increment_test')
 end
 Mongoid.logger = Logger.new($stdout)
 
-DatabaseCleaner.orm = "mongoid"
-
 RSpec.configure do |config|
   config.before(:all) do
-    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner[:mongoid].strategy = :deletion
   end
 
   config.before(:each) do
-    DatabaseCleaner.start
+    DatabaseCleaner[:mongoid].start
   end
 
   config.after(:each) do
-    DatabaseCleaner.clean
+    DatabaseCleaner[:mongoid].clean
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_auto_increment
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Peter Savichev (proton)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -39,33 +39,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: database_cleaner-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,60 +101,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.4.0
 description: Add SQL like auto-incrementing fields to your Mongoid documents.
 email: psavichev@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.rdoc
+- README.md
 files:
+- ".github/FUNDING.yml"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - lib/mongoid_auto_increment.rb
@@ -156,9 +163,11 @@ files:
 - mongoid_auto_increment.gemspec
 - spec/models/book.rb
 - spec/models/comment.rb
+- spec/models/ingredient.rb
 - spec/models/invoice.rb
 - spec/models/order.rb
 - spec/models/post.rb
+- spec/models/recipe.rb
 - spec/models/record.rb
 - spec/mongoid_auto_increment_spec.rb
 - spec/spec_helper.rb
@@ -166,7 +175,7 @@ homepage: http://github.com/proton/mongoid_auto_increment
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,9 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: Auto-incrementing fields for Mongoid documents
 test_files: []

data/README.rdoc

@@ -1,67 +0,0 @@
-= Mongoid::AutoIncrement
-
-Add SQL like auto-incrementing fields to your Mongoid documents.
-This gem is inspired by http://ihswebdesign.com/blog/autoincrement-in-mongodb-with-ruby/ and the mongomapper_id2[https://github.com/phstc/mongomapper_id2] gem.
-
-{<img src="https://secure.travis-ci.org/proton/mongoid_auto_increment.png" />}[http://travis-ci.org/proton/mongoid_auto_increment]
-
-== Installation
-
-Add to Gemfile:
-
-    gem 'mongoid_auto_increment'
-
-== Getting Started
-
-Just add <tt>auto_increment :field</tt> to your Mongoid model where <tt>:field</tt> is the name of the auto-incremented field you want to create.
-Example:
-
-    class Book
-      include Mongoid::Document
-
-      field :title
-      field :author
-
-      auto_increment :sequence
-    end
-
-<tt>auto_increment :sequence</tt> will create a field of type <tt>Integer</tt> named <tt>sequence</tt> for <tt>Book</tt>.  Whenever an instance of the model is created (intially saved to mongoDB), the <tt>auto_increment</tt> field will automatically be set to the next number in the sequence.
-
-You can add more than one auto-incremented field per model.
-
-=== Options
-
-    auto_increment :sequence, :collection => :some_collection
-
-<tt>mongoid_auto_inc</tt> keeps track of the current number in the sequence by creating a separate document mongoDB to query and update.  By default <tt>auto_increment</tt> will save this document to a mongoDB collection called <tt>sequences</tt>.  If you wish to save to a different collection use the <tt>:collection</tt> option to specify its name.
-
-    auto_increment :sequence, :step => 5
-
-If desired, you can override the <tt>:step</tt>, or increment amount (default is 1).
-
-    auto_increment :sequence, :seed => 3333
-
-Use the <tt>:seed</tt> option to set the initial value of the auto-incremented field.  The first number assigned from the sequence will be the next number after the seed value (including the step - so for <tt>:seed => 1000, :step => 5</tt>, first value will be 1005).
-
-== Contributing to Mongoid::AutoIncrement
-
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Support us
-
-
-{<img src="http://api.flattr.com/button/flattr-badge-large.png" />}[https://flattr.com/submit/auto?user_id=proton&url=https://github.com/proton/mongoid_auto_increment/&title=MongoidAutoIncrement&language=&tags=github&category=software]
-
-
-== Copyright
-
-(c) 2011 Peter Savichev (proton)
-(c) 2010-2011 Jeff Smith
-
-See LICENSE.txt for further details.