protokoll 0.2.0 → 0.3.0

data/lib/protokoll/class_variable.rb

@@ -0,0 +1,13 @@
+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

data/lib/protokoll/version.rb

@@ -1,3 +1,3 @@
 module Protokoll
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/protokoll.rb

@@ -1,38 +1,35 @@
 require "protokoll/auto_increment"
 require "protokoll/extract_number"
+require "protokoll/class_variable"
 
 module Protokoll
   extend ActiveSupport::Concern
-  
+
   module ClassMethods
-    @@protokoll = nil
-    
-    def protokoll
-      @@protokoll
-    end
-    
     def protokoll(column = nil, _options = {})
-      @@protokoll = AutoIncrement.new  if @@protokoll.nil?
-      return @@protokoll if column.nil? 
+      ClassVariable.add_to self, :@@protokoll, :default => AutoIncrement.new
+      
+      prot = ClassVariable.get_from self, :@@protokoll
+      return prot if column.nil? 
       
       options = { :pattern => "%Y%m#####", :number_symbol => "#"}
       options.merge!(_options)
-
-      @@protokoll.options = options          
-    
+      
+      prot.options = options          
+          
       before_save do |record|      
         last = record.class.last
         
         if last.present?
-          if @@protokoll.outdated?(last)
-            @@protokoll.count = 0 
+          if prot.outdated?(last)
+            prot.count = 0 
           else
-            @@protokoll.count = ExtractNumber.number(last[column], options[:pattern]) 
+            prot.count = ExtractNumber.number(last[column], options[:pattern]) 
           end
         end
         
-        @@protokoll.count += 1
-        record[column] = @@protokoll.next_custom_number(column, @@protokoll.count)
+        prot.count += 1
+        record[column] = prot.next_custom_number(column, prot.count)
       end
     end
   end

data/test/dummy/app/models/call.rb

@@ -0,0 +1,3 @@
+class Call < ActiveRecord::Base
+  protokoll :number
+end

data/test/dummy/db/migrate/20110928013630_create_calls.rb

@@ -0,0 +1,8 @@
+class CreateCalls < ActiveRecord::Migration
+  def change
+    create_table :calls do |t|
+      t.string :number
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,13 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110923101536) do
+ActiveRecord::Schema.define(:version => 20110928013630) do
+
+  create_table "calls", :force => true do |t|
+    t.string   "number"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "principals", :force => true do |t|
     t.string   "protokoll_number"

data/test/dummy/log/development.log

@@ -140,3 +140,58 @@ Migrating to CreatePrincipals (20110923101536)
    (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
    (0.0ms)  PRAGMA index_list("principals")
    (0.0ms)  PRAGMA index_list("protocols")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateProtocols (20110923024431)
+Migrating to CreatePrincipals (20110923101536)
+Migrating to CreateCalls (20110928013630)
+   (0.0ms)  select sqlite_version(*)
+   (0.4ms)  CREATE TABLE "calls" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110928013630')
+   (0.3ms)  select sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.0ms)  PRAGMA index_list("calls")
+   (0.0ms)  PRAGMA index_list("principals")
+   (0.0ms)  PRAGMA index_list("protocols")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (2.9ms)  CREATE TABLE "calls" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (3.5ms)  CREATE TABLE "principals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "protokoll_number" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (5.8ms)  CREATE TABLE "protocols" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (3.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (3.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (4.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110928013630')
+   (6.5ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110923024431')
+   (5.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110923101536')
+   (0.1ms)  select sqlite_version(*)
+   (10.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  PRAGMA index_list("schema_migrations")
+   (6.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateProtocols (20110923024431)
+   (0.4ms)  CREATE TABLE "protocols" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110923024431')
+Migrating to CreatePrincipals (20110923101536)
+   (0.5ms)  CREATE TABLE "principals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "protokoll_number" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110923101536')
+Migrating to CreateCalls (20110928013630)
+   (0.3ms)  CREATE TABLE "calls" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20110928013630')
+   (0.3ms)  select sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.0ms)  PRAGMA index_list("calls")
+   (0.0ms)  PRAGMA index_list("principals")
+   (0.0ms)  PRAGMA index_list("protocols")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.3ms)  select sqlite_version(*)
+   (10.5ms)  CREATE TABLE "calls" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (10.8ms)  CREATE TABLE "principals" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "protokoll_number" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (4.9ms)  CREATE TABLE "protocols" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "number" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (3.9ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  PRAGMA index_list("schema_migrations")
+   (3.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (9.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110928013630')
+   (15.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110923024431')
+   (12.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20110923101536')