ztk 1.4.8 → 1.4.9

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

@@ -6,23 +6,25 @@ module ZTK::DSL::Core
 
     def self.included(base)
       base.class_eval do
+        base.send(:extend, ZTK::DSL::Core::Options::ClassMethods)
+        base.add_option(:attribute)
         base.send(:extend, ZTK::DSL::Core::Attributes::ClassMethods)
       end
     end
 
     def attributes
-      @attributes ||= {}
+      @attributes ||= Hash.new
     end
 
     # @author Zachary Patten <zachary AT jovelabs DOT com>
     module ClassMethods
 
       def attribute(key, options={})
-        @attributes ||= {}
-        @attributes[key] = options[:default]
+        attribute_options[key] = options
 
         send(:define_method, key) do |*args|
           if args.count == 0
+            attributes[key] ||= self.class.attribute_options[key][:default]
             attributes[key]
           else
             send("#{key}=", *args)

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

@@ -0,0 +1,25 @@
+module ZTK::DSL::Core
+
+  # @author Zachary Patten <zachary AT jovelabs DOT com>
+  # @api private
+  module Options
+
+    def self.included(base)
+      base.class_eval do
+        base.send(:extend, ZTK::DSL::Core::Options::ClassMethods)
+      end
+    end
+
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    module ClassMethods
+
+      def add_option(key)
+        option_key = "#{key}_options"
+        cattr_accessor option_key
+        send(option_key) || send("#{option_key}=", {})
+      end
+
+    end
+
+  end
+end

data/lib/ztk/dsl/core.rb

@@ -5,11 +5,12 @@ module ZTK::DSL
   # @author Zachary Patten <zachary AT jovelabs DOT com>
   # @api private
   module Core
-    autoload :Attributes, "ztk/dsl/core/attributes"
-    autoload :Actions, "ztk/dsl/core/actions"
-    autoload :Dataset, "ztk/dsl/core/dataset"
-    autoload :IO, "ztk/dsl/core/io"
-    autoload :Relations, "ztk/dsl/core/relations"
+    autoload :Attributes, 'ztk/dsl/core/attributes'
+    autoload :Actions,    'ztk/dsl/core/actions'
+    autoload :Dataset,    'ztk/dsl/core/dataset'
+    autoload :IO,         'ztk/dsl/core/io'
+    autoload :Options,    'ztk/dsl/core/options'
+    autoload :Relations,  'ztk/dsl/core/relations'
 
     def self.included(base)
       base.class_eval do
@@ -22,6 +23,7 @@ module ZTK::DSL
         base.send(:include, ZTK::DSL::Core::Actions)
         base.send(:include, ZTK::DSL::Core::Dataset)
         base.send(:include, ZTK::DSL::Core::IO)
+        base.send(:include, ZTK::DSL::Core::Options)
         base.send(:include, ZTK::DSL::Core::Relations)
       end
     end

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.4.8"
+  VERSION = "1.4.9"
 
 end

data/spec/ztk/dsl_spec.rb

@@ -64,6 +64,17 @@ describe ZTK::DSL do
       dsl_test.name.should == data
     end
 
+    it "should allow setting a default value for an attribute" do
+      data = "Hello World"
+      class DSLTest < ZTK::DSL::Base
+        attribute :name, :default => "Hello World"
+      end
+
+      dsl_test = DSLTest.new
+
+      dsl_test.name.should == data
+    end
+
     it "should throw an exception when setting an invalid attribute" do
       data = "Hello World @ #{Time.now.utc}"
       class DSLTest < ZTK::DSL::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -206,6 +206,7 @@ files:
 - lib/ztk/dsl/core/attributes.rb
 - lib/ztk/dsl/core/dataset.rb
 - lib/ztk/dsl/core/io.rb
+- lib/ztk/dsl/core/options.rb
 - lib/ztk/dsl/core/relations.rb
 - lib/ztk/dsl/core/relations/belongs_to.rb
 - lib/ztk/dsl/core/relations/has_many.rb
@@ -264,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1371839736310854390
+      hash: 2449655142974466757
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -273,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1371839736310854390
+      hash: 2449655142974466757
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25