auto_increment 0.1 → 0.2

data/lib/auto_increment/active_record.rb

@@ -4,7 +4,7 @@ module AutoIncrement
   def auto_increment(options = {})
     raise ArgumentError, "Hash expected, got #{options.class.name}" if not options.is_a?(Hash) and not options.empty?
 
-    default_options = { :column => :code, :scope => nil, :initial => 1 }
+    default_options = { :column => :code, :scope => nil, :initial => 1, :force => false }
     options = default_options.merge(options) unless options.nil?
 
     options[:scope] = [options[:scope]] if options[:scope].class != Array
@@ -12,7 +12,7 @@ module AutoIncrement
     before_create "auto_increment_#{options[:column]}"
 
     define_method "auto_increment_#{options[:column]}" do
-
+      return if self.send(options[:column]).present? and !options[:force]
       query = self.class.scoped
       options[:scope].each do |scope|
         if scope.present? and respond_to?(scope)

data/lib/auto_increment/version.rb

@@ -1,3 +1,3 @@
 module AutoIncrement
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/test/auto_increment_test.rb

@@ -41,12 +41,26 @@ class AutoIncrementActiveRecordTest < ActiveRecord::TestCase
     assert_equal 'A', @user_account2.letter_code
   end
 
-  test "checks if Z increments to AA" do
+  test "Z increments to AA" do
     assert_equal 'AA', @user4.letter_code
   end
 
-  test "checks if AA increments to AB" do
+  test "AA increments to AB" do
     assert_equal 'AB', @user5.letter_code
   end
 
+  test "not set column if is already set" do
+    account = Account.new :name => 'Another Account', :code => 50
+    account.save
+
+    assert_equal account.code, 50
+  end
+
+  test "set column if option force is used" do
+    User.destroy_all
+    user = User.new :name => 'Maria', :letter_code => 'Z'
+    user.save
+
+    assert_equal user.letter_code, 'A'
+  end
 end

data/test/test_helper.rb

@@ -29,7 +29,7 @@ class Account < ActiveRecord::Base
 end
 
 class User < ActiveRecord::Base
-  auto_increment :column => :letter_code, :scope => :account_id, :initial => 'A'
+  auto_increment :column => :letter_code, :scope => :account_id, :initial => 'A', :force => true
 
   belongs_to :account
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: auto_increment
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Felipe Diesel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 -03:00
+date: 2011-03-31 00:00:00 -03:00
 default_executable: 
 dependencies: []