ztk 1.6.15 → 1.6.16

data/lib/ztk/command/private.rb

@@ -14,7 +14,7 @@ module ZTK
       # Formats a header suitable for writing to the direct logger when logging
       # sessions.
       def log_header(what)
-        count = 8
+        count = 12
         sep = ("=" * count)
         header = [sep, "[ #{what} ]", sep, "[ #{tag} ]", sep, "[ #{what} ]", sep].join
         "#{header}\n"

data/lib/ztk/dsl/base.rb

@@ -151,15 +151,15 @@ module ZTK::DSL
     end
 
     def initialize(id=nil, &block)
-      self.id = (id || self.class.id)
-      self.class.dataset.delete_if{ |d| d.id == self.id }
+      self.id = (id || self.class.next_id)
       self.class.dataset << self
+
       block_given? and ((block.arity < 1) ? instance_eval(&block) : block.call(self))
 
-      # primary_key_count = self.class.dataset.count do |d|
-      #   d.id == self.id
-      # end
-      # raise StandardError, "Primary key '#{self.id}' already exists!" if (primary_key_count > 1)
+      primary_key_count = self.class.dataset.count do |d|
+        d.id == self.id
+      end
+      raise StandardError, "Primary key '#{self.id}' already exists!" if (primary_key_count > 1)
     end
 
     # Instance Inspect

data/lib/ztk/dsl/core/dataset.rb

@@ -12,7 +12,6 @@ module ZTK::DSL::Core
 
     # @author Zachary Patten <zachary AT jovelabs DOT com>
     module ClassMethods
-
       def dataset
         klass = self.to_s.underscore.to_sym
         @@dataset ||= {}
@@ -27,9 +26,13 @@ module ZTK::DSL::Core
         @@dataset = nil
       end
 
-      def id
-        @@id ||= 0
-        (@@id += 1)
+      def next_id
+        klass = self.to_s.underscore.to_sym
+        @@id ||= {}
+        @@id[klass] ||= 0
+
+        @@id[klass] += 1
+        @@id[klass]
       end
 
     end

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.6.15"
+  VERSION = "1.6.16"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.6.15
+  version: 1.6.16
   prerelease: 
 platform: ruby
 authors:
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2199725361471494570
+      hash: 3831905173950647033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2199725361471494570
+      hash: 3831905173950647033
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25