yaml-model 1.3.1 → 1.3.2

data/lib/yaml-model.rb

@@ -151,6 +151,10 @@ class YAML_Model
     @@database[ :data ][ self.class.name ].delete( self )
   end
 
+  def to_s
+    "#{self.class.name}[#{id}]"
+  end
+
   def self.sort_by( *attributes )
     define_method '<=>'.to_sym do |other|
       attributes.map{|a|self.send(a)} <=> attributes.map{|a|other.send(a)}
@@ -190,6 +194,11 @@ end" )
         via_instance.send( "#{that_attribute_singular}=".to_sym, that_instance )
       end
 
+      define_method "remove_#{that_attribute_singular}".to_sym do |that_instance|
+        via_instance = via_class.select{|n| n.send(this_attribute_singular).id == self.id && n.send(that_attribute_singular).id == that_instance.id }.first
+        via_instance.send( :delete )
+      end
+
     else
 
       define_method that_attribute_plural do

data/lib/yaml-model/version.rb

@@ -1,3 +1,3 @@
 class YAML_Model
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/test/delete.rb

@@ -0,0 +1,47 @@
+require 'yaml-model'
+
+describe YAML_Model, ".delete" do
+
+  DeleteModelInstance = Class.new( YAML_Model )
+
+  DeleteModelInstanceOne = Class.new( YAML_Model )
+  DeleteModelInstanceMany = Class.new( YAML_Model )
+
+  class DeleteModelInstanceOne < YAML_Model
+    has :many, DeleteModelInstanceMany
+  end
+
+  class DeleteModelInstanceMany < YAML_Model
+    type :one, DeleteModelInstanceOne
+    init :one
+  end
+
+  before( :each ) do
+    YAML_Model.reset!
+  end
+
+  it "Deletes model instances from self" do
+    a = DeleteModelInstance.create
+    b = DeleteModelInstance.create
+    c = DeleteModelInstance.create
+    DeleteModelInstance.all.should == [ a, b, c ]
+    b.delete
+    DeleteModelInstance.all.should == [ a, c ]
+    a.delete
+    DeleteModelInstance.all.should == [ c ]
+    c.delete
+    DeleteModelInstance.all.should == [ ]
+  end
+
+  it "Deletes model instances when referenced" do
+    one = DeleteModelInstanceOne.create
+    many_a = DeleteModelInstanceMany.create( one )
+    many_b = DeleteModelInstanceMany.create( one )
+
+    many_a.delete
+
+    DeleteModelInstanceMany.all.should == [ many_b ]
+    one.many.should == [ many_b ]
+  end
+
+end

data/test/has.rb

@@ -110,6 +110,41 @@ describe YAML_Model, "::has" do
     Tag.instance_methods.index( :add_post ).should_not == nil
   end
 
+  it "adds instances in many_to_many relationships" do
+    dummy_user = User.create
+    post = Post.create( dummy_user )
+    tag_a = Tag.create
+    tag_b = Tag.create
+    post.tags.should == []
+    post.add_tag( tag_b )
+    post.tags.should == [ tag_b ]
+    tag_b.posts.should == [ post ]
+    post.add_tag( tag_a )
+    post.tags.sort{|a,b|a.id<=>b.id}.should == [ tag_a, tag_b ]
+    tag_a.posts.should == [ post ]
+  end
+
+  it "adds a remove_ method when the relationship is many_to_many" do
+    Post.instance_methods.index( :remove_tag ).should_not == nil
+    Tag.instance_methods.index( :remove_post ).should_not == nil
+  end
+
+  it "removes instances in many_to_many relationships" do
+    dummy_user = User.create
+    post = Post.create( dummy_user )
+    tag_a = Tag.create
+    tag_b = Tag.create
+    post.add_tag( tag_a )
+    post.add_tag( tag_b )
+    post.tags.sort{|a,b|a.id<=>b.id}.should == [ tag_a, tag_b ]
+    post.remove_tag( tag_a )
+    post.tags.should == [ tag_b ]
+    tag_a.posts.should == []
+    post.remove_tag( tag_b )
+    post.tags.should == []
+    tag_b.posts.should == []
+  end
+
   it "handles many to many relationships seamlessly" do
     dummy_user = User.create
 

data/test/to_s.rb

@@ -0,0 +1,16 @@
+require 'yaml-model'
+
+describe YAML_Model, ".to_s" do
+
+  AModel = Class.new( YAML_Model )
+
+  before( :each ) do
+    YAML_Model.reset!
+  end
+
+  it "Stringifies with the correct id" do
+    next_oid = YAML_Model.next_oid
+    AModel.create.to_s.should == "AModel[#{next_oid}]"
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Clive Crous
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 +02:00
+date: 2011-02-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,8 +78,10 @@ files:
 - lib/yaml-model.rb
 - lib/yaml-model/version.rb
 - test/create.rb
+- test/delete.rb
 - test/has.rb
 - test/init.rb
+- test/to_s.rb
 - test/type.rb
 - yaml-model.gemspec
 has_rdoc: true
@@ -96,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -582286063
+      hash: -230929969
       segments: 
       - 0
       version: "0"
@@ -105,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -582286063
+      hash: -230929969
       segments: 
       - 0
       version: "0"