yaml-model 1.0.2 → 1.2.0

data/lib/yaml-model.rb

@@ -3,6 +3,13 @@ require 'yaml-model/version'
 
 class YAML_Model
 
+  def self.inherited( child )
+    child.instance_eval('@__attributes = {}')
+    child.define_singleton_method( :attributes ) do
+      @__attributes
+    end
+  end
+
   class Error < Exception
   end
 
@@ -25,45 +32,53 @@ class YAML_Model
     @@database[ :data ][ self.name ] ||= []
   end
 
-  def assert( assertion, info )
+  def self.assert( assertion, info )
     raise Error.new( info.inspect ) unless assertion
   end
 
-  def assert_type( variable, types )
+  def self.assert_type( variable, types )
     assert( [types].flatten.inject(false){|result,type|result||=(type===variable)}, "Invalid type: `#{variable.class.name}`" )
   end
 
-  def self.type attr, types, &block
+  def self.type attr, types, options = {}, &block
+    @__attributes[ attr ] = [ types, options ]
     define_method attr do
       instance_eval "@#{attr}"
     end
     define_method "#{attr}=".to_sym do |value|
-      assert_type value, types
+      YAML_Model.assert_type value, types
       instance_exec( value, &block ) if block_given?
       instance_eval "@#{attr} = value"
     end
-    define_method "__assert_type__#{attr}" do
-      assert_type( instance_eval( "@#{attr}" ), types )
+    define_singleton_method "__#{attr}__default".to_sym do
+      options[ :default ]
+    end
+    define_method "__#{attr}__assert_type" do
+      YAML_Model.assert_type( instance_eval( "@#{attr}" ), types )
     end
   end
 
   def initialize
-    self.methods.select{|n|n.to_s=~/^__assert_type__/}.map{|n|n.to_s.gsub(/^__assert_type__(.+)$/,'\1').to_sym}.each do |attribute|
-      self.send( "__assert_type__#{attribute}".to_sym )
+    self.class.attributes.keys.each do |attribute|
+      instance_eval( "@#{attribute} ||= self.class.__#{attribute}__default" )
+      instance_eval( "__#{attribute}__assert_type" )
     end
   end
 
   def self.init *attributes, &block
     define_method :initialize do |*args|
       raise ArgumentError.new( "wrong number of arguments (#{args.size} for #{attributes.size}" ) unless args.size == attributes.size
-      (self.methods.select{|n|n.to_s=~/^__assert_type__/}.map{|n|n.to_s.gsub(/^__assert_type__(.+)$/,'\1').to_sym}-attributes).each do |attribute|
-        self.send( "__assert_type__#{attribute}".to_sym )
-      end
+
       attributes.each do |attribute|
         value = args.shift
         self.send( "#{attribute}=".to_sym, value )
       end
+
+      # FIXME For some reason commands within this block to set attribute values
+      # require the `self.` prefix or they just don't work
       self.instance_eval( &block ) if block_given?
+
+      super()
     end
   end
 

data/lib/yaml-model/version.rb

@@ -1,3 +1,3 @@
 class YAML_Model
-  VERSION = "1.0.2"
+  VERSION = "1.2.0"
 end

data/test/init.rb

@@ -11,7 +11,14 @@ describe YAML_Model, "::init" do
   class CanSetInstanceVariables < YAML_Model
     type :name, String
     init :name do
-      @name = "Bar"
+      self.name = "Bar"
+    end
+  end
+
+  class SettingOfDefaultValues < YAML_Model
+    type :name, String
+    init do
+      self.name = "Bob"
     end
   end
 
@@ -26,9 +33,14 @@ describe YAML_Model, "::init" do
     $ran_it.should == true
   end
 
-  it "can set instance varibles inside blocks it's given" do
+  it "can set instance variables inside blocks it's given" do
     test = CanSetInstanceVariables.create( "Foo" )
     test.name.should == "Bar"
   end
 
+  it "allows setting of default values" do
+    test = SettingOfDefaultValues.create
+    test.name.should == "Bob"
+  end
+
 end

data/test/type.rb

@@ -0,0 +1,26 @@
+require 'yaml-model'
+
+describe YAML_Model, "::type" do
+
+  before( :each ) do
+    YAML_Model.reset!
+  end
+
+  class ShouldCreateClassMethodsForAttributeDefaultValues_nil < YAML_Model
+    type :name, String
+  end
+
+  class ShouldCreateClassMethodsForAttributeDefaultValues_Bob < YAML_Model
+    type :name, String, :default => 'Bob'
+  end
+
+  it "should create class methods for attribute default values" do
+    ShouldCreateClassMethodsForAttributeDefaultValues_nil.respond_to?( :__name__default ).should == true
+    ShouldCreateClassMethodsForAttributeDefaultValues_nil.__name__default.should == nil
+    lambda{ShouldCreateClassMethodsForAttributeDefaultValues_nil.create}.should raise_error YAML_Model::Error
+    ShouldCreateClassMethodsForAttributeDefaultValues_Bob.respond_to?( :__name__default ).should == true
+    ShouldCreateClassMethodsForAttributeDefaultValues_Bob.__name__default.should == 'Bob'
+    lambda{ShouldCreateClassMethodsForAttributeDefaultValues_Bob.create}.should_not raise_error YAML_Model::Error
+    ShouldCreateClassMethodsForAttributeDefaultValues_Bob.create.name.should == ShouldCreateClassMethodsForAttributeDefaultValues_Bob.__name__default
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 2
-  version: 1.0.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Clive Crous
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +02:00
+date: 2011-01-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,7 @@ files:
 - test/create.rb
 - test/has.rb
 - test/init.rb
+- test/type.rb
 - yaml-model.gemspec
 has_rdoc: true
 homepage: http://www.darkarts.co.za/yaml-model
@@ -95,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 321677229
+      hash: -869954371
       segments: 
       - 0
       version: "0"
@@ -104,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 321677229
+      hash: -869954371
       segments: 
       - 0
       version: "0"