auto_increment 1.3.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de47f750eacb36eb55191fedfa48c4171fbb76c9
-  data.tar.gz: 19e51a34cb362de1f4e7943f53c46725cc0e4965
+SHA256:
+  metadata.gz: f19f9f54c7b8a7641d6adb7527d9f9054ad131d015af8aec346cac61711129f7
+  data.tar.gz: 6ac27b9292e3003db26a709ac7b4c78f18b1e5d7c0c35c0f9f1e47a7f7132763
 SHA512:
-  metadata.gz: 4ee67e7884c39f127c8df23b6bbd25b25ceee9b6de60a81c328f79d1ed191a61efdd07980afd0a8e4476c7333ee22e89e7d31007a65fc8a0ccfac042fee68b9e
-  data.tar.gz: ba0e2b25e96905833c11b9d4be7f00de95e2bbeda2fe15693adf3c5ab78c3260d5309628f8655a4f006877e8a6e34098cf6e2d0c0ad8e4ef59aae4e6c405aa03
+  metadata.gz: 85ac0c4b0cd645f05703685bfcf3d64158a409db01d37eda4bf85c0e65c57029a2d656a1830fce754b150a901533ee5f4f60e152fce632926805c8f88ccd0e3b
+  data.tar.gz: bab85c29b564da957bb9088000bf4da689e937ba86caacbc4290d910480d4bf620e44ba68c0f1f9acc6eccaca57a5513474bbf553ba402d70d0709f8a9a76c37

data/.travis.yml

@@ -2,10 +2,13 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.3.1
-  - 2.2.5
+  - 2.6.6
+before_install:
+  - gem update --system
 gemfile:
-  - gemfiles/rails_5.gemfile
-  - gemfiles/rails_4.gemfile
-
-script: 'bundle exec rake'
+  - gemfiles/rails_4.2.11.1.gemfile
+  - gemfiles/rails_5.0.7.2.gemfile
+  - gemfiles/rails_5.1.6.2.gemfile
+  - gemfiles/rails_5.2.2.1.gemfile
+  - gemfiles/rails_6.0.3.4.gemfile
+  - gemfiles/rails_6.1.0.gemfile

data/Appraisals

@@ -1,9 +1,18 @@
-appraise 'rails-4' do
-  gem 'activerecord', '~> 4.0'
-  gem 'activesupport', '~> 4.0'
-end
+RAILS_VERSIONS = %w(
+  4.2.11.1
+  5.0.7.2
+  5.1.6.2
+  5.2.2.1
+  6.0.3.4
+  6.1.0
+)
 
-appraise 'rails-5' do
-  gem 'activerecord', '~> 5.0'
-  gem 'activesupport', '~> 5.0'
+RAILS_VERSIONS.each do |version|
+  appraise "rails_#{version}" do
+    gem 'activerecord', version
+    gem 'activesupport', version
+    if version.split('.').first.to_i < 6
+      gem 'sqlite3', '1.3.13'
+    end
+  end
 end

data/Gemfile

@@ -1,8 +1,3 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-# Specify your gem's dependencies in auto_increment.gemspec
 gemspec
-
-group :development do
-  gem 'appraisal'
-end

data/README.md

@@ -8,50 +8,58 @@ auto_increment provides automatic incrementation for a integer or string fields
 
 ## Installation
 
-You can use auto_increment as a gem in Rails 4 and Rails 5.
+You can use auto_increment as a gem from Rails 4.2 to Rails 6.1.
 
 To use the gem version, put the following gem requirement in your `Gemfile`:
 
-    gem "auto_increment"
-
+```rb
+gem "auto_increment"
+```
 
 ## Usage
 
 To work with a auto increment column you used to do something like this in your model:
 
-    before_create :set_code
-    def set_code
-      max_code = Operation.maximum(:code)
-      self.code = max_code.to_i + 1
-    end
+```rb
+before_create :set_code
+def set_code
+  max_code = Operation.maximum(:code)
+  self.code = max_code.to_i + 1
+end
+```
 
 Looks fine, but not when you need to do it over and over again. In fact auto_increment does it under the cover.
 
 All you need to do is this:
 
-    auto_increment :code
+```rb
+auto_increment :code
+```
 
 And your code field will be incremented
 
-
 ## Customizing
 
 So you have a different column or need a scope. auto_increment provides options. You can use it like this:
 
-    auto_increment :letter, scope: [:account_id, :job_id], initial: 'C', force: true, lock: false
+```rb
+auto_increment :letter, scope: [:account_id, :job_id], model_scope: :in_account, initial: 'C', force: true, lock: false, before: :create
+```
 
 First argument is the column that will be incremented. Can be integer or string.
 
 * scope: you can define columns that will be scoped and you can use as many as you want (default: nil)
+* model_scope: you can define model scopes that will be executed and you can use as many as you want (default: nil)
 * initial: initial value of column (default: 1)
 * force: you can set a value before create and auto_increment will not change that, but if you do want this, set force to true (default: false)
 * lock: you can set a lock on the max query. (default: false)
+* before: you can choose a different callback to be used (:create, :save, :validation) (default: create)
 
 
 ## Compatibility
 
-Tested with Rails 4 and Rails 5 in Ruby 2.2.5 and Ruby 2.3.1
+Tested with Rails 6.1.0, 6.0.3.4, 5.2.2.1, 5.1.6.2, 5.0.7.2 and 4.2.11.1 in Ruby 2.6.6.
 
 ## License
 
-MIT License. Copyright 2011 29sul Tecnologia da Informação <http://www.29sul.com.br/>
+[MIT License](LICENSE.txt)

data/auto_increment.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.licenses    = 'MIT'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Felipe Diesel']
-  s.email       = ['felipediesel@gmail.com']
+  s.email       = ['diesel@hey.com']
   s.homepage    = 'http://github.com/felipediesel/auto_increment'
   s.summary     = 'Auto increment a string or integer field'
   s.description = 'Automaticaly increments a string or integer field ' \
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_dependency 'activerecord', '>= 4.0', '< 5.1'
-  s.add_dependency 'activesupport', '>= 4.0', '< 5.1'
+  s.add_dependency 'activerecord', '>= 4.0'
+  s.add_dependency 'activesupport', '>= 4.0'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fuubar'
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'appraisal'
 
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'sqlite3', '>= 1.3.13'
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails_4.2.11.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "4.2.11.1"
+gem "activesupport", "4.2.11.1"
+gem "sqlite3", "1.3.13"
+
+gemspec path: "../"

data/gemfiles/rails_5.0.7.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.7.2"
+gem "activesupport", "5.0.7.2"
+gem "sqlite3", "1.3.13"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.6.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.1.6.2"
+gem "activesupport", "5.1.6.2"
+gem "sqlite3", "1.3.13"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.2.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.2.2.1"
+gem "activesupport", "5.2.2.1"
+gem "sqlite3", "1.3.13"
+
+gemspec path: "../"

data/gemfiles/rails_6.0.3.4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "6.0.3.4"
+gem "activesupport", "6.0.3.4"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "6.1.0"
+gem "activesupport", "6.1.0"
+
+gemspec path: "../"

data/lib/auto_increment/active_record.rb

@@ -6,7 +6,11 @@ module AutoIncrement
     # +AutoIncrement::ActiveRecord::ClassMethods+
     module ClassMethods
       def auto_increment(column = nil, options = {})
-        before_create Incrementor.new(column, options)
+        options.reverse_merge! before: :create
+
+        callback = "before_#{options[:before]}"
+
+        send callback, Incrementor.new(column, options)
       end
     end
   end

data/lib/auto_increment/incrementor.rb

@@ -9,8 +9,9 @@ module AutoIncrement
       end
 
       @column = column || options[:column] || :code
-      @options = options.reverse_merge scope: nil, initial: 1, force: false
+      @options = options.reverse_merge initial: 1, force: false
       @options[:scope] = [@options[:scope]] unless @options[:scope].is_a? Array
+      @options[:model_scope] = [@options[:model_scope]] unless @options[:model_scope].is_a? Array
     end
 
     def before_create(record)
@@ -18,6 +19,9 @@ module AutoIncrement
       write if can_write?
     end
 
+    alias before_validation before_create
+    alias before_save before_create
+
     private
 
     def can_write?
@@ -38,14 +42,22 @@ module AutoIncrement
       query
     end
 
+    def build_model_scope(query)
+      @options[:model_scope].reject(&:nil?).each do |scope|
+        query = query.send(scope)
+      end
+
+      query
+    end
+
     def maximum
-      query = build_scopes @record.class
+      query = build_scopes(build_model_scope(@record.class))
       query.lock if lock?
 
       if string?
         query.select("#{@column} max")
-          .order("LENGTH(#{@column}) DESC, #{@column} DESC")
-          .first.try :max
+             .order(Arel.sql("LENGTH(#{@column}) DESC, #{@column} DESC"))
+             .first.try :max
       else
         query.maximum @column
       end

data/lib/auto_increment/version.rb

@@ -1,4 +1,4 @@
 # +AutoIncrement::VERSION+
 module AutoIncrement
-  VERSION = '1.3.0'
+  VERSION = '1.5.2'.freeze
 end

data/spec/lib/active_record_spec.rb

@@ -7,17 +7,19 @@ describe AutoIncrement do
     @account1 = Account.create name: 'My Account'
     @account2 = Account.create name: 'Another Account', code: 50
 
-    @user_account1 = @account1.users.create name: 'Felipe', letter_code: 'Z'
-    @user_account2 = @account2.users.create name: 'Daniel'
+    @user1_account1 = @account1.users.create name: 'Felipe', letter_code: 'Z'
+    @user1_account2 = @account2.users.create name: 'Daniel'
+    @user2_account2 = @account2.users.create name: 'Mark'
+    @user3_account2 = @account2.users.create name: 'Robert'
   end
 
   describe 'initial' do
     it { expect(@account1.code).to eq 1 }
-    it { expect(@user_account1.letter_code).to eq 'A' }
+    it { expect(@user1_account1.letter_code).to eq 'A' }
   end
 
   describe 'do not increment outside scope' do
-    it { expect(@user_account2.letter_code).to eq 'A' }
+    it { expect(@user1_account2.letter_code).to eq 'A' }
   end
 
   describe 'not set column if is already set' do
@@ -25,7 +27,7 @@ describe AutoIncrement do
   end
 
   describe 'set column if option force is used' do
-    it { expect(@user_account1.letter_code).to eq 'A' }
+    it { expect(@user1_account1.letter_code).to eq 'A' }
   end
 
   describe 'locks query for increment' do
@@ -53,4 +55,15 @@ describe AutoIncrement do
     it { expect(@accounts.size).to eq 25 }
     it { expect(account_last_letter_code).to eq 'Y' }
   end
+
+  describe 'set before validation' do
+    account3 = Account.new
+    account3.valid?
+
+    it { expect(account3.code).not_to be_nil }
+  end
+
+  describe 'uses model scopes' do
+    it { expect(@user3_account2.letter_code).to eq('C') }
+  end
 end

data/spec/models/account.rb

@@ -1,6 +1,6 @@
 # Spec +Account+
 class Account < ActiveRecord::Base
-  auto_increment :code
+  auto_increment :code, before: :validation
 
   has_many :users
 end

data/spec/models/user.rb

@@ -1,7 +1,11 @@
 # + Spec +User+
 class User < ActiveRecord::Base
   auto_increment :letter_code, scope: :account_id, initial: 'A', force: true,
-                               lock: true
+    lock: true, model_scope: :with_mark
 
   belongs_to :account
+
+  default_scope -> { where 'name <> ?', 'Mark' }
+
+  scope :with_mark, -> { unscoped }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auto_increment
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Felipe Diesel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -190,9 +178,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.13
 description: Automaticaly increments a string or integer field in ActiveRecord.
 email:
-- felipediesel@gmail.com
+- diesel@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -208,8 +210,13 @@ files:
 - README.md
 - Rakefile
 - auto_increment.gemspec
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_5.gemfile
+- gemfiles/.bundle/config
+- gemfiles/rails_4.2.11.1.gemfile
+- gemfiles/rails_5.0.7.2.gemfile
+- gemfiles/rails_5.1.6.2.gemfile
+- gemfiles/rails_5.2.2.1.gemfile
+- gemfiles/rails_6.0.3.4.gemfile
+- gemfiles/rails_6.1.0.gemfile
 - lib/auto_increment.rb
 - lib/auto_increment/active_record.rb
 - lib/auto_increment/incrementor.rb
@@ -241,8 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Auto increment a string or integer field

data/gemfiles/rails_4.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "activerecord", "~> 4.0"
-gem "activesupport", "~> 4.0"
-
-group :development do
-  gem "appraisal"
-end
-
-gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "activerecord", "~> 5.0"
-gem "activesupport", "~> 5.0"
-
-group :development do
-  gem "appraisal"
-end
-
-gemspec :path => "../"