yaml-model 1.0.1 → 1.0.2

data/lib/yaml-model.rb

@@ -33,21 +33,35 @@ class YAML_Model
     assert( [types].flatten.inject(false){|result,type|result||=(type===variable)}, "Invalid type: `#{variable.class.name}`" )
   end
 
-  def self.type attribute, types, &block
-    define_method attribute do
-      instance_eval "@#{attribute}"
+  def self.type attr, types, &block
+    define_method attr do
+      instance_eval "@#{attr}"
     end
-    define_method "#{attribute}=".to_sym do |value|
+    define_method "#{attr}=".to_sym do |value|
       assert_type value, types
       instance_exec( value, &block ) if block_given?
-      instance_eval "@#{attribute} = value"
+      instance_eval "@#{attr} = value"
+    end
+    define_method "__assert_type__#{attr}" do
+      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 )
     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|
-        self.send( "#{attribute}=".to_sym, args.shift )
+        value = args.shift
+        self.send( "#{attribute}=".to_sym, value )
       end
       self.instance_eval( &block ) if block_given?
     end
@@ -133,14 +147,13 @@ class YAML_Model
       this_attribute_singular = this_class_name.downcase.to_sym
       that_attribute_singular = that_class_name.downcase.to_sym
       via_class_name = [ this_class_name, that_class_name ].sort.map{|n|n.capitalize}.join('')
-      via_class = eval( "#{via_class_name}||=Class.new(YAML_Model)" )
+      via_class = eval( "#{via_class_name}||=Class.new(YAML_Model) do
+  type :#{this_attribute_singular}, #{this_class}
+  type :#{that_attribute_singular}, #{that_class}
+  init #{[this_attribute_singular,that_attribute_singular].sort.map{|n|":#{n}"}.join(',')}
+end" )
       via_attribute_plural = ( via_class_name.downcase + "s" ).to_sym
 
-      if via_class.instance_variables.empty?
-        via_class.type this_attribute_singular, this_class
-        via_class.type that_attribute_singular, that_class
-      end
-
       this_class.has via_attribute_plural, via_class
 
       define_method that_attribute_plural do
@@ -150,7 +163,7 @@ class YAML_Model
       end
 
       define_method "add_#{that_attribute_singular}".to_sym do |that_instance|
-        via_instance = via_class.create
+        via_instance = ( ( this_attribute_singular < that_attribute_singular ) ? via_class.create( self, that_instance ) : via_class.create( that_instance, self ) )
         via_instance.send( "#{this_attribute_singular}=".to_sym, self )
         via_instance.send( "#{that_attribute_singular}=".to_sym, that_instance )
       end

data/lib/yaml-model/version.rb

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

data/test/create.rb

@@ -0,0 +1,32 @@
+require 'yaml-model'
+
+describe YAML_Model, "::create" do
+
+  class BadPerson < YAML_Model
+    type :name, String
+  end
+
+  class Person < YAML_Model
+    type :name, String
+    init :name
+  end
+
+  before( :each ) do
+    YAML_Model.reset!
+  end
+
+  it "ensures attribute types on creation" do
+    lambda{ BadPerson.create }.should raise_error( YAML_Model::Error )
+    lambda{ Person.create( "Bob" ) }.should_not raise_error( YAML_Model::Error )
+  end
+
+  it "ensures correct amount of arguments given" do
+    lambda{ BadPerson.create( "Bob" ) }.should raise_error( ArgumentError )
+    lambda{ Person.create( "Bob" ) }.should_not raise_error( ArgumentError )
+    lambda{ BadPerson.create }.should_not raise_error( ArgumentError )
+    lambda{ Person.create }.should raise_error( ArgumentError )
+    lambda{ Person.create( "Bob", "Smith" ) }.should raise_error( ArgumentError )
+  end
+
+end
+

data/test/has.rb

@@ -2,29 +2,33 @@ require 'yaml-model'
 
 describe YAML_Model, "::has" do
 
+  User = Class.new( YAML_Model )
+  Post = Class.new( YAML_Model )
+  Tag = Class.new( YAML_Model )
+
+  class Post < YAML_Model
+    type :user, User
+    init :user
+    has :tags, Tag, :many_to_many
+  end
+
+  class User < YAML_Model
+    has :posts, Post
+  end
+
+  class Tag < YAML_Model
+    has :posts, Post, :many_to_many
+  end
+
   before( :each ) do
     YAML_Model.reset!
   end
 
   it "creates a method of the correct attribute name" do
-    User = Class.new( YAML_Model )
-    class User < YAML_Model
-      has :posts, Class.new( YAML_Model )
-    end
     User.instance_methods.index( :posts ).should_not == nil
   end
 
   it "correctly references items that belong to it" do
-    User = Class.new( YAML_Model )
-    Post = Class.new( YAML_Model )
-    class Post < YAML_Model
-      type :user, User
-      init :user
-    end
-    class User < YAML_Model
-      has :posts, Post
-    end
-
     user_a = User.create
     user_b = User.create
     user_c = User.create
@@ -38,24 +42,16 @@ describe YAML_Model, "::has" do
   end
 
   it "adds an add_ method when the relationship is many_to_many" do
-    Tag = Class.new( YAML_Model )
-    Post = Class.new( YAML_Model )
-    class Post < YAML_Model
-      has :tags, Tag, :many_to_many
-    end
     Post.instance_methods.index( :add_tag ).should_not == nil
-    Tag.instance_methods.index( :add_post ).should == nil
+    Tag.instance_methods.index( :add_post ).should_not == nil
   end
 
   it "handles many to many relationships seamlessly" do
-    Tag = Class.new( YAML_Model )
-    Post = Class.new( YAML_Model )
-    Post.has :tags, Tag, :many_to_many
-    Tag.has :posts, Post, :many_to_many
-
-    post_a = Post.create
-    post_b = Post.create
-    post_c = Post.create
+    dummy_user = User.create
+
+    post_a = Post.create( dummy_user )
+    post_b = Post.create( dummy_user )
+    post_c = Post.create( dummy_user )
 
     tag_a = Tag.create
     tag_b = Tag.create

data/test/init.rb

@@ -2,32 +2,32 @@ require 'yaml-model'
 
 describe YAML_Model, "::init" do
 
+  class RunsTheBlockItsGiven < YAML_Model
+    init do
+      $ran_it = true
+    end
+  end
+
+  class CanSetInstanceVariables < YAML_Model
+    type :name, String
+    init :name do
+      @name = "Bar"
+    end
+  end
+
   before( :each ) do
     YAML_Model.reset!
   end
 
   it "runs the block it's given" do
     $ran_it = false
-    Test = Class.new( YAML_Model )
-    class Test < YAML_Model
-      init do
-        $ran_it = true
-      end
-    end
     $ran_it.should == false
-    Test.create
+    RunsTheBlockItsGiven.create
     $ran_it.should == true
   end
 
   it "can set instance varibles inside blocks it's given" do
-    Test = Class.new( YAML_Model )
-    class Test < YAML_Model
-      type :name, String
-      init :name do
-        @name = "Bar"
-      end
-    end
-    test = Test.create( "Foo" )
+    test = CanSetInstanceVariables.create( "Foo" )
     test.name.should == "Bar"
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Clive Crous
@@ -77,6 +77,7 @@ files:
 - Rakefile
 - lib/yaml-model.rb
 - lib/yaml-model/version.rb
+- test/create.rb
 - test/has.rb
 - test/init.rb
 - yaml-model.gemspec
@@ -94,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -961508909
+      hash: 321677229
       segments: 
       - 0
       version: "0"
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -961508909
+      hash: 321677229
       segments: 
       - 0
       version: "0"