auto_increment 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a36a39a264726b9982a4d095c35fea157c26f5c7
-  data.tar.gz: e9b05d63b7f60324d93d629ebeb6918570587c9a
+  metadata.gz: af472f5d68643f3e99904a990f327d9846d19e33
+  data.tar.gz: 380099f99c07728694985db36741aea2c42c3727
 SHA512:
-  metadata.gz: c570534697d6be0655f3f5c2e1206438fdee3324474e60bd9420c819225b68767694c34eaea809a41460a8b8130257a525ed5a651fb9437a832f26253d577849
-  data.tar.gz: fd281c2cf3c6f083aa3eb9f7851b7d30e4e4d7f2e2b05b27038bce56f748b14b4b9a3c1a38ea4692408787e4225661758a582b92b905f5ad90fa629a0eeefe1b
+  metadata.gz: 54c9892f0e7d2570879a979aa7f108ab0965171564328e0cb5eda8cb0cb75116ea27e2bca2a64c2d5741c0e1ca7b7983e9625cec9fd1b7199064aaf91388ebb4
+  data.tar.gz: 018cc0922a78a5398880e7f36bc0c0e70a14746b98d937c62b62694c692e6576feb572147cfa42477114da24064705227110aeb9c52212acd2159a1698317ec0

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in auto_increment.gemspec
 gemspec

data/Guardfile

@@ -1,5 +1,5 @@
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
+  watch('spec/spec_helper.rb')  { 'spec' }
+end

data/README.md

@@ -17,7 +17,7 @@ To use the gem version, put the following gem requirement in your `Gemfile`:
 
 ## Usage
 
-To work with a auto increment column you used to do sometihng like this in your model:
+To work with a auto increment column you used to do something like this in your model:
 
     before_create :set_code
     def set_code
@@ -29,7 +29,7 @@ Looks fine, but not when you need to do it over and over again. In fact auto_inc
 
 All you need to do is this:
 
-    auto_increment
+    auto_increment :code
 
 And your code field will be incremented
 
@@ -38,17 +38,19 @@ And your code field will be incremented
 
 So you have a different column or need a scope. auto_increment provides options. You can use it like this:
 
-    auto_increment column: :letter, scope: [:account_id, :job_id], initial: 'C', force: true
+    auto_increment :letter, scope: [:account_id, :job_id], initial: 'C', force: true, lock: false
+
+First argument is the column that will be incremented. Can be integer or string.
 
-* column: the column that will be incremented. Can be integer os string (default: code)
 * scope: you can define columns that will be scoped 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)
 
 
 ## Compatibility
 
-Tested with Rails 4.0.13 in Ruby 2.0.0
+Tested with Rails 4.2.2 in Ruby 2.0.0
 
 ## License
 

data/auto_increment.gemspec

@@ -1,37 +1,36 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "auto_increment/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'auto_increment/version'
 
-Gem::Specification.new do |spec|
-  spec.name        = "auto_increment"
-  spec.version     = AutoIncrement::VERSION
-  spec.licenses    = %w(MIT)
-  spec.platform    = Gem::Platform::RUBY
-  spec.authors     = ["Felipe Diesel"]
-  spec.email       = ["felipediesel@gmail.com"]
-  spec.homepage    = "http://github.com/felipediesel/auto_increment"
-  spec.summary     = %q{Auto increment a string or integer field}
-  spec.description = %q{Automaticaly increments a string or integer field in ActiveRecord.}
+Gem::Specification.new do |s|
+  s.name        = 'auto_increment'
+  s.version     = AutoIncrement::VERSION.dup
+  s.licenses    = 'MIT'
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Felipe Diesel']
+  s.email       = ['felipediesel@gmail.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 ' \
+                  'in ActiveRecord.'
 
-  spec.rubyforge_project = "auto_increment"
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ['lib']
 
-  spec.files         = `git ls-files`.split("\n")
-  spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  s.add_dependency 'activerecord', '~> 4.0'
+  s.add_dependency 'activesupport', '~> 4.0'
 
-  spec.add_dependency "activerecord", "~> 4.0"
-  spec.add_dependency "activesupport", "~> 4.0"
+  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_development_dependency 'rake', '~> 0'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  s.add_development_dependency 'rspec', '~> 3.3'
+  s.add_development_dependency 'rspec-nc', '~> 0.2'
+  s.add_development_dependency 'guard', '~> 2.12'
+  s.add_development_dependency 'guard-rspec', '~> 4.5'
+  s.add_development_dependency 'fuubar', '~> 2'
+  s.add_development_dependency 'coveralls', '~> 0'
+  s.add_development_dependency 'database_cleaner', '~> 1.4'
 
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-nc"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "fuubar"
-  spec.add_development_dependency "coveralls"
-
-  spec.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'sqlite3', '~> 1.3'
 end

data/lib/auto_increment.rb

@@ -1,13 +1,14 @@
-require "date"
-require "i18n"
-require "active_record"
-require "active_support"
-require "active_support/time_with_zone"
-require "auto_increment/version"
+require 'date'
+require 'i18n'
+require 'active_record'
+require 'active_support'
+require 'active_support/time_with_zone'
+require 'auto_increment/version'
 
+# +AutoIncrement+
 module AutoIncrement
-  autoload :Incrementor, "auto_increment/incrementor"
-  autoload :ActiveRecord   , "auto_increment/active_record"
+  autoload :Incrementor, 'auto_increment/incrementor'
+  autoload :ActiveRecord, 'auto_increment/active_record'
 end
 
 ActiveRecord::Base.send :include, AutoIncrement::ActiveRecord

data/lib/auto_increment/active_record.rb

@@ -1,10 +1,12 @@
+# +AutoIncrement+
 module AutoIncrement
+  # +AutoIncrement::ActiveRecord+
   module ActiveRecord
     extend ActiveSupport::Concern
-
+    # +AutoIncrement::ActiveRecord::ClassMethods+
     module ClassMethods
-      def auto_increment(options = {})
-        before_create Incrementor.new(options)
+      def auto_increment(column = nil, options = {})
+        before_create Incrementor.new(column, options)
       end
     end
   end

data/lib/auto_increment/incrementor.rb

@@ -1,8 +1,16 @@
+# +AutoIncrement+
 module AutoIncrement
+  # +AutoIncrement::Incrementor+
   class Incrementor
-    def initialize(options = {})
-       @options = options.reverse_merge  column: :code, scope: nil, initial: 1, force: false
-       @options[:scope] = [ @options[:scope] ] unless @options[:scope].is_a? Array
+    def initialize(column = nil, options = {})
+      if column.is_a? Hash
+        options = column
+        column = nil
+      end
+
+      @column = column || options[:column] || :code
+      @options = options.reverse_merge scope: nil, initial: 1, force: false
+      @options[:scope] = [@options[:scope]] unless @options[:scope].is_a? Array
     end
 
     def before_create(record)
@@ -13,16 +21,16 @@ module AutoIncrement
     private
 
     def can_write?
-      @record.send(@options[:column]).blank? or @options[:force]
+      @record.send(@column).blank? || @options[:force]
     end
 
     def write
-      @record.send :write_attribute, @options[:column], increment
+      @record.send :write_attribute, @column, increment
     end
 
     def build_scopes(query)
       @options[:scope].each do |scope|
-        if scope.present? and @record.respond_to?(scope)
+        if scope.present? && @record.respond_to?(scope)
           query = query.where(scope => @record.send(scope))
         end
       end
@@ -32,18 +40,29 @@ module AutoIncrement
 
     def maximum
       query = build_scopes @record.class
+      query.lock if lock?
 
-      if @options[:initial].class == String
-        query.select("#{@options[:column]} max").order("LENGTH(#{@options[:column]}) DESC, #{@options[:column]} DESC").first.try :max
+      if string?
+        query.select("#{@column} max")
+          .order("LENGTH(#{@column}) DESC, #{@column} DESC")
+          .first.try :max
       else
-        query.maximum @options[:column]
+        query.maximum @column
       end
     end
 
+    def lock?
+      @options[:lock] == true
+    end
+
     def increment
       max = maximum
 
       max.blank? ? @options[:initial] : max.next
     end
+
+    def string?
+      @options[:initial].class == String
+    end
   end
-end
+end

data/lib/auto_increment/version.rb

@@ -1,3 +1,4 @@
+# +AutoIncrement::VERSION+
 module AutoIncrement
-  VERSION = "1.1.1"
+  VERSION = '1.2.0'
 end

data/spec/lib/active_record_spec.rb

@@ -16,15 +16,41 @@ describe AutoIncrement do
     it { expect(@user_account1.letter_code).to eq 'A' }
   end
 
-  describe "do not increment outside scope" do
+  describe 'do not increment outside scope' do
     it { expect(@user_account2.letter_code).to eq 'A' }
   end
 
-  describe "not set column if is already set" do
+  describe 'not set column if is already set' do
     it { expect(@account2.code).to eq 50 }
   end
 
-  describe "set column if option force is used" do
+  describe 'set column if option force is used' do
     it { expect(@user_account1.letter_code).to eq 'A' }
   end
+
+  describe 'locks query for increment' do
+    before :all do
+      threads = []
+      lock = Mutex.new
+      @account = Account.create name: 'Another Account', code: 50
+      @accounts = []
+      5.times do |_t|
+        threads << Thread.new do
+          lock.synchronize do
+            5.times do |_thr|
+              @accounts << (@account.users.create name: 'Daniel')
+            end
+          end
+        end
+      end
+      threads.each(&:join)
+    end
+
+    let(:account_last_letter_code) do
+      @accounts.sort_by(&:letter_code).last.letter_code
+    end
+
+    it { expect(@accounts.size).to eq 25 }
+    it { expect(account_last_letter_code).to eq 'Y' }
+  end
 end

data/spec/lib/incrementor_spec.rb

@@ -2,24 +2,30 @@ require 'spec_helper'
 
 describe AutoIncrement::Incrementor do
   {
-    nil => 1, 0 => 1, 1 => 2, 'A' => 'B', 'Z' => 'AA', 'AA' => 'AB', 'AAAAA' => 'AAAAB'
+    nil => 1,
+    0 => 1,
+    1 => 2,
+    'A' => 'B',
+    'Z' => 'AA',
+    'AA' => 'AB',
+    'AAAAA' => 'AAAAB'
   }.each do |previous_value, next_value|
     describe "increment value for #{previous_value}" do
-      it {
+      it do
         allow(subject).to receive(:maximum) { previous_value }
         expect(subject.send(:increment)).to eq next_value
-      }
+      end
     end
   end
 
-  describe "initial value of string" do
-    subject {
+  describe 'initial value of string' do
+    subject do
       AutoIncrement::Incrementor.new initial: 'A'
-    }
+    end
 
-    it {
+    it do
       allow(subject).to receive(:maximum) { nil }
       expect(subject.send(:increment)).to eq 'A'
-    }
+    end
   end
 end

data/spec/models/account.rb

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

data/spec/models/user.rb

@@ -1,5 +1,7 @@
+# + Spec +User+
 class User < ActiveRecord::Base
-  auto_increment column: :letter_code, scope: :account_id, initial: 'A', force: true
+  auto_increment :letter_code, scope: :account_id, initial: 'A', force: true,
+                               lock: true
 
   belongs_to :account
 end

data/spec/spec_helper.rb

@@ -3,7 +3,11 @@ Coveralls.wear!
 
 require 'pry'
 require 'auto_increment'
+require 'database_cleaner'
 
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+ActiveRecord::Base.establish_connection adapter: 'sqlite3',
+                                        database: 'spec/db/sync.db',
+                                        timeout: 5000
 
-require 'support/active_record'
+# require 'support/active_record'
+require 'support/database_cleaner'

data/spec/support/active_record.rb

@@ -1,8 +1,10 @@
+# +ActiveRecord+ migration for Accounts
 ActiveRecord::Migration.create_table :accounts do |t|
   t.string :name
-  t.date :code
+  t.integer :code
 end
 
+# +ActiveRecord+ migration for Users
 ActiveRecord::Migration.create_table :users do |t|
   t.string :name
   t.integer :account_id

data/spec/support/database_cleaner.rb

@@ -0,0 +1,12 @@
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auto_increment
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Felipe Diesel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -56,114 +56,128 @@ dependencies:
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   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: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: Automaticaly increments a string or integer field in ActiveRecord.
 email:
 - felipediesel@gmail.com
@@ -185,12 +199,14 @@ files:
 - lib/auto_increment/active_record.rb
 - lib/auto_increment/incrementor.rb
 - lib/auto_increment/version.rb
+- spec/db/sync.db
 - spec/lib/active_record_spec.rb
 - spec/lib/incrementor_spec.rb
 - spec/models/account.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
+- spec/support/database_cleaner.rb
 homepage: http://github.com/felipediesel/auto_increment
 licenses:
 - MIT
@@ -210,16 +226,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: auto_increment
+rubyforge_project: 
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Auto increment a string or integer field
 test_files:
+- spec/db/sync.db
 - spec/lib/active_record_spec.rb
 - spec/lib/incrementor_spec.rb
 - spec/models/account.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
+- spec/support/database_cleaner.rb
 has_rdoc: