protokoll 0.3.1 → 0.4.0

data/test/protokoll_test.rb

@@ -5,213 +5,343 @@ class ProtokollTest < ActiveSupport::TestCase
   def setup
     time = Time.local(2011, 9, 25, 12, 0, 0)
     Timecop.travel(time)
-    
-    Protocol.protokoll.count = 0
   end
   
+  def teardown
+    reset_models
+  end
+  
+  def reset_models
+    ProtokollTest.send(:remove_const, 'Protocol') if defined? Protocol
+    ProtokollTest.send(:remove_const, 'Call')     if defined? Call
+  end
+  
+  ##
+  # Tests
+  ##
+  
   test "using new number_symbol with default pattern should get 20110900001" do
-    Protocol.protokoll.number_symbol = "$"
-    Protocol.protokoll.pattern = "%Y%m$$$$$"
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%Y%m$$$$$", :number_symbol => "$"
+    end
+  
+    protocol = Protocol.create
+    assert_equal "20110900001", protocol.number
+  end
+  
+  test "should get 20110900001 (format number %Y%m#####)" do
+    class Protocol < ActiveRecord::Base
+      protokoll :number
+    end
+    
+    protocol = Protocol.create
+    assert_equal "20110900001", protocol.number
+  end
+  
+  test "should get 20110900002 for second save (format number %Y%m#####)" do
+    class Protocol < ActiveRecord::Base
+      protokoll :number
+    end
     
     protocol1 = Protocol.create
-    assert_equal "20110900001", protocol1.number
+    protocol2 = Protocol.create
+    
+    assert_equal "20110900002", protocol2.number
   end
   
-  test "first using # should get 1" do
-    Protocol.protokoll.pattern = "#"
-     
+  test "should get 201100002 for second save (format number %Y#####)" do
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%Y#####"
+    end
+    
     protocol = Protocol.create
-    assert_equal "1", protocol.number
+    
+    assert_equal "201100001", protocol.number
   end
   
-  test "second protocol on DB should have number should equals 2" do
-    Protocol.protokoll.pattern = "#"
+  test "second protocol on DB should have number should equals 1" do
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "#"
+    end
     
-    Protocol.create
     protocol = Protocol.create
-    assert_equal "2", protocol.number
+    assert_equal "1", protocol.number
   end
-  
+     
   test "third protocol on DB should have number should equals 3" do
-    Protocol.protokoll.pattern = "#"
-
-    protocol1 = Protocol.create
-    protocol2 = Protocol.create
-    protocol3 = Protocol.create
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "#"
+    end
+  
+    Protocol.new.save
+    Protocol.new.save
+    protocol3 = Protocol.new
+    protocol3.save
+    
     assert_equal "3", protocol3.number
   end
-    
+   
   test "first using format A# should get A1" do
-    Protocol.protokoll.pattern = "A#"
-
-    protocol1 = Protocol.create
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "A#"
+    end
+  
+    protocol1 = Protocol.new
+    protocol1.save
+    
     assert_equal "A1", protocol1.number
   end
   
-  test "second using format A# should get A2" do
-    Protocol.protokoll.pattern = "A#"
-
-    protocol1 = Protocol.create
-    protocol2 = Protocol.create
-    assert_equal "A2", protocol2.number
-  end
-
   test "first using format A## should get A01" do
-    Protocol.protokoll.pattern = "A##"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "A##"
+    end
+  
     protocol1 = Protocol.create
     assert_equal "A01", protocol1.number
   end
-
+   
   test "second using format A## should get A02" do
-    Protocol.protokoll.pattern = "A##"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "A##"
+    end
+  
     protocol1 = Protocol.create
     protocol2 = Protocol.create
     assert_equal "A02", protocol2.number
   end
-
+     
   test "third using format A## should get A03" do
-    Protocol.protokoll.pattern = "A##"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "A##"
+    end
+  
     protocol1 = Protocol.create
     protocol2 = Protocol.create
     protocol3 = Protocol.create
     assert_equal "A03", protocol3.number
   end
-
+     
   test "first use of %y# should get 111" do
-    Protocol.protokoll.pattern = "%y#"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%y#"
+    end
+  
     protocol1 = Protocol.create
     assert_equal "111", protocol1.number
   end
-
-  test "second use of %y## should get 1101" do
-    Protocol.protokoll.pattern = "%y##"
-
-    protocol1 = Protocol.create
-    assert_equal "1101", protocol1.number
-  end
-
+  
+  #   
   test "first use of %y%m## should get 110901" do
-    Protocol.protokoll.pattern = "%y%m##"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%y%m##"
+    end
+  
     protocol1 = Protocol.create
     assert_equal "110901", protocol1.number
   end
-
-  test "second use of %y%m## on next month after should get 111001" do
-    Protocol.protokoll.pattern = "%y%m##"
-
-    protocol1 = Protocol.create
+  #    
+  test "using %y%m## on next month after should get 111001" do
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%y%m##"
+    end
+  
+    time = Time.local(2011, 9, 25, 12, 0, 0)
+    Timecop.travel(time)
+  
+    Protocol.create
+    Protocol.create
+  
     Timecop.travel(Time.now + 1.month)
-    protocol2 = Protocol.create
-
-    assert_equal "111001", protocol2.number
-  end
-
-  test "%y%m%H#### should get 1109120001" do
-    Protocol.protokoll.pattern = "%y%m%H####"
-
-    protocol1 = Protocol.create
-
-    assert_equal "1109120001", protocol1.number
+  
+    protocol = Protocol.create
+    assert_equal "111001", protocol.number
   end
-
-  test "%y## on next year should get 1201" do
-    Protocol.protokoll.pattern = "%y##"
-
-    time = Time.local(2011, 9, 25, 12, 3, 0) # 
+     
+   test "%y%m%H#### should get 1109120001" do
+     class Protocol < ActiveRecord::Base
+       protokoll :number, :pattern => "%y%m%H####"
+     end
+   
+     protocol1 = Protocol.create
+   
+     assert_equal "1109120001", protocol1.number
+   end
+    
+   test "%y## on next year should get 1201" do
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%y##"
+    end
+  
+    time = Time.local(2011, 9, 25, 12, 3, 0) # 2011
     protocol1 = Protocol.create
-    time = Time.local(2012, 9, 25, 12, 3, 0) # exactly 1 year after
+    time = Time.local(2012, 9, 25, 12, 3, 0) # 2012 - exactly 1 year after
     Timecop.travel(time)
-
+  
     protocol2 = Protocol.create
-
+  
     assert_equal "1201", protocol2.number
-  end
-
+   end
+  
   test "500.time create using %y%m%H#### should get 1109120500" do
-    Protocol.protokoll.pattern = "%y%m%H####"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%y%m%H####"
+    end
+  
     500.times { Protocol.create }
-
+  
     assert_equal "1109120500", Protocol.last.number
   end
-
+    
   test "PROT%H%m%y#### should get PROT%H%m%y0001" do
-    Protocol.protokoll.pattern = "PROT%H%m%y####"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "PROT%H%m%y####"
+    end
+  
     protocol1 = Protocol.create
-
+  
     assert_equal "PROT1209110001", protocol1.number
   end
-
+    
   test "PROT%Y%m%H#### should get PROT201109120001" do
-    Protocol.protokoll.pattern = "PROT%Y%m%H####"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "PROT%Y%m%H####"
+    end
+  
     protocol1 = Protocol.create
-
+  
     assert_equal "PROT201109120001", protocol1.number
   end
-
+   
   test "use of sufix ####PROTO should get 0001PROTO" do
-    Protocol.protokoll.pattern = "####PROTO"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "####PROTO"
+    end
+  
     protocol1 = Protocol.create
-
+  
     assert_equal "0001PROTO", protocol1.number
   end
-
+    
   test "use of sufix %Y%M####PROTO on 12:03 should get 2011030001PROTO" do
-    Protocol.protokoll.pattern = "%Y%M####PROTO"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%Y%M####PROTO"
+    end
+  
     time = Time.local(2011, 9, 25, 12, 3, 0)
     Timecop.travel(time)
-
+  
     protocol1 = Protocol.create
-
+  
     assert_equal "2011030001PROTO", protocol1.number
   end
-
+  
   test "use of sufix %Y%M####PROTO on 12:15 should get 2011150001PROTO" do
-    Protocol.protokoll.pattern = "%Y%M####PROTO"
-
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%Y%M####PROTO"
+    end
+  
     time = Time.local(2011, 9, 25, 12, 15, 0)
     Timecop.travel(time)
-
+  
     protocol1 = Protocol.create
-
+  
     assert_equal "2011150001PROTO", protocol1.number
   end
   
   test "using 2 models" do
-    Protocol.protokoll.pattern = "%Y##"
-    Call.protokoll.pattern = "%Y##"
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%Y##"
+    end
     
+    class Call < ActiveRecord::Base
+      protokoll :number, :pattern => "%Y##"
+    end
+  
     protocol = Protocol.create
     call = Call.create
     assert_equal "201101", protocol.number
     assert_equal "201101", call.number
   end
   
-  ## Can't reproduce this on test environmet!
-  ## if you know how to do that, contact-me!
-  # test "Start application with populated db." do  
-  #   Protocol.protokoll.pattern = "%Y%M####PROTO"
-  # 
-  #   Protocol.create
-  #   Protocol.create
-  #   Protocol.create
-  #   
-  #   # restart application or reload Protocol model
-  #   # how do I do that? 
-  #
-  #   protocol = Protocol.create
-  # 
-  #   assert_equal "2011090004PROTO", protocol.number
-  # end
+  test "using 2 models with different patterns" do
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%YA#"
+    end
+    
+    class Call < ActiveRecord::Base
+      protokoll :number, :pattern => "%YB#"
+    end
+  
+    protocol = Protocol.create
+    call = Call.create
+    assert_equal "2011A1", protocol.number
+    assert_equal "2011B1", call.number
+  end
+  
+  test "updating model should not get a different number" do    
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%Y##"
+    end
+  
+    protocol = Protocol.new
+  
+    protocol.save
+    assert_equal "201101", protocol.number
+  
+    protocol.save
+    assert_equal "201101", protocol.number
+  end
+  
+  test "reserve_number should set number to instance" do
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%Y##"
+    end
+  
+    protocol = Protocol.new
+    protocol.reserve_number!
+  
+    assert_equal "201101", protocol.number
+    protocol.save
+    assert_equal "201101", protocol.number
+  
+    protocol = Protocol.new
+    protocol.save
+    assert_equal "201102", protocol.number
+  end
+  
+  test "reserve_number should assure number if reserved" do
+    class Protocol < ActiveRecord::Base
+      protokoll :number, :pattern => "%Y##"
+    end
+  
+    protocol1 = Protocol.new
+    protocol1.reserve_number!
+  
+    protocol2 = Protocol.new
+    protocol2.save
+  
+    assert_equal "201101", protocol1.number
+    assert_equal "201102", protocol2.number
+  end
+  
+  test "reserve_number should assure number if reserved if next month" do
+     class Protocol < ActiveRecord::Base
+       protokoll :number, :pattern => "%Y%m##"
+     end
+  
+     protocol1 = Protocol.new
+     protocol1.reserve_number!
+  
+     Timecop.travel(Time.now + 1.month)
+     
+     protocol2 = Protocol.new
+     protocol2.save!
+  
+     assert_equal "20110901", protocol1.number
+     assert_equal "20111001", protocol2.number
+   end
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protokoll
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70244469257640 !ruby/object:Gem::Requirement
+  requirement: &70246610625400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244469257640
+  version_requirements: *70246610625400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70244469257140 !ruby/object:Gem::Requirement
+  requirement: &70246610622920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244469257140
+  version_requirements: *70246610622920
 description: Rails 3 gem to enable creation of a custom autoincrement Time based string
   on a model defined by a pattern. ex. 20110001, 20110002, 20110003, 20120001, 20120002...
 email:
@@ -41,9 +41,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/protokoll/auto_increment.rb
-- lib/protokoll/class_variable.rb
-- lib/protokoll/extract_number.rb
+- lib/generators/protokoll/migration/migration_generator.rb
+- lib/generators/protokoll/migration/templates/create_custom_auto_increments.rb
+- lib/protokoll/counter.rb
+- lib/protokoll/formater.rb
+- lib/protokoll/models/custom_auto_increment.rb
+- lib/protokoll/protokoll.rb
 - lib/protokoll/version.rb
 - lib/protokoll.rb
 - lib/tasks/protokoll_tasks.rake
@@ -54,9 +57,8 @@ files:
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/call.rb
-- test/dummy/app/models/principal.rb
-- test/dummy/app/models/protocol.rb
+- test/dummy/app/models/call_defined_in_tests.rb
+- test/dummy/app/models/protocol_defined_in_tests.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -76,8 +78,8 @@ files:
 - test/dummy/config.ru
 - test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20110923024431_create_protocols.rb
-- test/dummy/db/migrate/20110923101536_create_principals.rb
 - test/dummy/db/migrate/20110928013630_create_calls.rb
+- test/dummy/db/migrate/20120222164124_create_custom_auto_increments.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3
@@ -111,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A simple Rails gem to create custom autoincrement Time base values to a database
@@ -121,9 +123,8 @@ test_files:
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/call.rb
-- test/dummy/app/models/principal.rb
-- test/dummy/app/models/protocol.rb
+- test/dummy/app/models/call_defined_in_tests.rb
+- test/dummy/app/models/protocol_defined_in_tests.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -143,8 +144,8 @@ test_files:
 - test/dummy/config.ru
 - test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20110923024431_create_protocols.rb
-- test/dummy/db/migrate/20110923101536_create_principals.rb
 - test/dummy/db/migrate/20110928013630_create_calls.rb
+- test/dummy/db/migrate/20120222164124_create_custom_auto_increments.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/db/test.sqlite3

data/lib/protokoll/auto_increment.rb

@@ -1,95 +0,0 @@
-module Protokoll
-
-  class AutoIncrement    
-    attr_accessor :options
-    attr_accessor :count
-    
-    def initialize
-      @count = 0
-    end
-    
-    def pattern=(p)
-      options[:pattern] = p
-    end
-    
-    def pattern
-      options[:pattern]
-    end
-    
-    def number_symbol=(s)
-      options[:number_symbol] = s
-    end
-    
-    def number_symbol
-      options[:number_symbol]
-    end
-    
-    def next_custom_number(column, number)
-      prefix(options[:pattern]).to_s + 
-      counter(options[:pattern], number).to_s + 
-      sufix(options[:pattern]).to_s
-    end
-    
-    def prefix(pattern)
-      prefx = extract_prefix(pattern)
-      expand_times(prefx.to_s)
-    end
-    
-    def counter(pattern, n)
-      format_counter(digits_size(pattern), n)
-    end
-
-    def sufix(pattern)
-      sufx = extract_sufix(pattern)
-      expand_times(sufx.to_s)
-    end
-    
-    def format_counter(zeros, value)
-      "%0#{zeros}d" % value
-    end
-
-    def extract_prefix(pattern)
-      # Company#### => Company
-      symbol = options[:number_symbol]
-      (pattern =~ /^(\s|\d)*[^#{symbol}]+/ and $&)
-    end
-
-    def extract_sufix(pattern)
-      # ###Company => Company
-      symbol = options[:number_symbol]
-      (pattern =~ /[^#{symbol}]+$/ and $&)
-    end
-
-    def expand_times(pattern)
-      pattern.sub!("%y", Time.now.strftime("%y"))
-      pattern.sub!("%Y", Time.now.strftime("%Y"))
-      pattern.sub!("%d", Time.now.strftime("%d"))
-      pattern.sub!("%m", Time.now.strftime("%m"))
-      pattern.sub!("%M", Time.now.strftime("%M"))
-      pattern.sub("%H", Time.now.strftime("%H"))
-    end
-
-    def digits_size(pattern)
-      symbol = options[:number_symbol]
-      (pattern =~ /[#{symbol}]+/ and $&).length
-    end
-
-    def outdated?(record)
-      Time.now.strftime(update_event).to_i > record.created_at.strftime(update_event).to_i
-    end
-
-    # BUG 1 : If using %y%m# and only year changes (user stays 
-    # more then one year without updating the model) counter doesn't updates!
-    def update_event
-      pattern = options[:pattern]
-      event = String.new
-      
-      event += "%Y" if pattern.include? "%y" or pattern.include? "%Y"
-      event += "%m" if pattern.include? "%m"
-      event += "%H" if pattern.include? "%H"
-      event += "%M" if pattern.include? "%M"
-      event
-    end
-
-  end
-end

data/lib/protokoll/class_variable.rb

@@ -1,13 +0,0 @@
-module Protokoll
-  module ClassVariable
-    def self.add_to(klass, instance, options = nil)
-      if not klass.class_variables.include? instance
-        klass.class_variable_set instance, options[:default]
-      end
-    end
-    
-    def self.get_from(klass, instance)
-      klass.class_variable_get(instance)
-    end
-  end
-end