ztk 1.6.30 → 1.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWQxOGYzNTBiMmJmZjI0ZTM4YzZlZjRlMGQ0NDMzODJmNmQ0MDBjYQ==
+    NDlkMjkwMjJjNmFmN2I1YzBhMmUxOWUyYTU2NmMzYTM5OGQxOGE0Mg==
   data.tar.gz: !binary |-
-    YWQzMjAzOTZjYWQzY2U4YTgwYmI3ZjY2Mjg1ZmRhMzdkM2JiMTZkMw==
+    ZGQ1ZTAxZjExYzkwOTA4MjYzZGQ2YTU5MjNmMTgxYmY3NTQ3MmQ1ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjQ1MmU3Mzk4ZDVkZjlmMDI3MGQ5MTE5ZmRjNzQ4NjJjZDJmN2E3MzVkZWUw
-    MzcyMmRiNzI5YjZhOTlkMWUxMWM1NDcxMzA0MDNjMTdiYTY5NzgwOWNiODA1
-    MThhNzI0ZDg3YjZhMDE3NmU0YTBiOTQ2OTI4MzE3ZTIxMDVmNmQ=
+    YzhjMDg1MTQ1NWRjNmI2YWY5Y2U0YjQxOGI3ZjE5OGNiNTgwMjkxY2UxODdh
+    YWEwZDIwYzJmNWQxNTdhY2U5NzMyZmZhN2IzNTQ1MWMwMjZhNWYwMWVlODg1
+    ZjBmZjJmZDVmYjJlNTBiMDFjYzFlNTU3NTJmOTUxMTQ3MTZjMWI=
   data.tar.gz: !binary |-
-    NDQ5OWVlNGYzOWI2MmI5NzYyOTY1ZmRkYTk3MTM5MTMwMzljMjA3MjNlYzUx
-    MzBmZWYyNmUwZTk5MWVmNWZjMmFmMjM0NWE5MDFiNjQ2MzFiYWNiMjE5N2Jl
-    NTk5ZWE2OTNjMjBjMGI0OTlkMmYxODdmMDNlZDU4MDY4ZDllOGQ=
+    MGRmMzE2NjdjYWNlMjNmY2VmYzc3MTJkNDJmN2NmZmZmNTAwNjQ1MThkZDZl
+    MzE0MWM0OTM1YWRhMzNiMzI5OWQ1YjU1YTQxYjQ0OWY2Zjk5Y2ZmNjE0Y2Fi
+    OGYwZWU2M2UzNzZlOWMwZDI5NTk2NjQwNDE3ZGFjYWViYzUyOWE=

data/lib/ztk/dsl/base.rb

@@ -154,12 +154,21 @@ module ZTK::DSL
       self.id = (id || self.class.next_id)
       self.class.dataset << self
 
-      block_given? and ((block.arity < 1) ? instance_eval(&block) : block.call(self))
+      do_block(&block)
+    end
+
+    def do_block(&block)
+      if block_given?
+        if (block.arity < 1)
+          instance_eval(&block)
+        else
+          block.call(self)
+        end
+      end
 
-      primary_key_count = self.class.dataset.count do |d|
-        d.id == self.id
+      if (self.class.dataset.count{ |data| (data.id == self.id) } > 1)
+        raise StandardError, "Primary key '#{self.id}' already exists!"
       end
-      raise StandardError, "Primary key '#{self.id}' already exists!" if (primary_key_count > 1)
     end
 
     # Instance Inspect
@@ -188,7 +197,7 @@ module ZTK::DSL
       def inspect
         details = Array.new
         details << "count=#{self.all.count}" if self.all.count > 0
-        "#<#{self.class.to_s}:#{self.id} #{details.join(', ')}>"
+        "#<#{self.to_s} #{details.join(', ')}>"
       end
 
     end

data/lib/ztk/dsl/core/actions/find.rb

@@ -23,7 +23,11 @@ module ZTK::DSL::Core::Actions
       end
 
       def first(*args)
-        find(*args).first
+        if args.count == 0
+          all.first
+        else
+          find(*args).first
+        end
       end
 
       def count

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

@@ -35,7 +35,13 @@ module ZTK::DSL::Core
 
         send(:define_method, "#{key}=") do |value|
           attributes[key] = value
+          value
         end
+
+        self.class.send(:define_method, "find_by_#{key}") do |value|
+          all.select{ |object| (object.send(key) == value) }
+        end
+
       end
 
     end

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.6.30"
+  VERSION = "1.7.0"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.6.30
+  version: 1.7.0
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport