yaml-model 1.2.1 → 1.3.1

data/lib/yaml-model.rb

@@ -22,6 +22,10 @@ class YAML_Model
     }
   end
 
+  def self.next_oid
+    @@database[ :next_oid ]
+  end
+
   reset!
 
   attr_reader :id
@@ -155,8 +159,11 @@ class YAML_Model
 
   sort_by :id
 
-  def self.has( that_attribute_plural, that_class, many_to_many = false )
-    if many_to_many
+  def self.has( that_attribute_plural, that_class, opts = {} )
+    options = {
+      :many_to_many => false
+    }.merge( opts )
+    if options[ :many_to_many ]
       this_class = self
       this_class_name, that_class_name = [this_class,that_class].map{|n|n.name.split(':')[-1]}
       this_attribute_singular = this_class_name.downcase.to_sym
@@ -187,8 +194,12 @@ end" )
 
       define_method that_attribute_plural do
         that_class.select do |that_instance|
-          that_instance.instance_variables.inject( false ) do |result,variable|
-            result ||= that_instance.instance_eval(variable.to_s).class == self.class && that_instance.instance_eval(variable.to_s).id == self.id
+          if options[ that_class ]
+            that_instance.instance_eval( options[ that_class ].to_s ).id == self.id
+          else
+            that_instance.instance_variables.inject( false ) do |result,variable|
+              result ||= that_instance.instance_eval(variable.to_s).class == self.class && that_instance.instance_eval(variable.to_s).id == self.id
+            end
           end
         end
       end

data/lib/yaml-model/version.rb

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

data/test/create.rb

@@ -28,5 +28,11 @@ describe YAML_Model, "::create" do
     lambda{ Person.create( "Bob", "Smith" ) }.should raise_error( ArgumentError )
   end
 
+  it "increments the next_oid" do
+    next_oid = YAML_Model.next_oid
+    Person.create( "Bob" )
+    ( next_oid + 1 ).should == YAML_Model.next_oid
+  end
+
 end
 

data/test/has.rb

@@ -5,11 +5,13 @@ describe YAML_Model, "::has" do
   User = Class.new( YAML_Model )
   Post = Class.new( YAML_Model )
   Tag = Class.new( YAML_Model )
+  MultiUserUser = Class.new( YAML_Model )
+  MultiUserPost = Class.new( YAML_Model )
 
   class Post < YAML_Model
     type :user, User
     init :user
-    has :tags, Tag, :many_to_many
+    has :tags, Tag, :many_to_many => true
   end
 
   class User < YAML_Model
@@ -17,7 +19,19 @@ describe YAML_Model, "::has" do
   end
 
   class Tag < YAML_Model
-    has :posts, Post, :many_to_many
+    has :posts, Post, :many_to_many => true
+  end
+
+  class MultiUserUser < YAML_Model
+    has :posts_confirmed, MultiUserPost, MultiUserPost => :confirmed_by
+    has :posts_created, MultiUserPost, MultiUserPost => :created_by
+    has :posts, MultiUserPost
+  end
+
+  class MultiUserPost < YAML_Model
+    type :created_by, MultiUserUser
+    type :confirmed_by, MultiUserUser
+    init :created_by, :confirmed_by
   end
 
   before( :each ) do
@@ -28,6 +42,56 @@ describe YAML_Model, "::has" do
     User.instance_methods.index( :posts ).should_not == nil
   end
 
+  it "caters for multiple links to a single model" do
+    creator_1 = MultiUserUser.create
+    creator_2 = MultiUserUser.create
+    confirmer_1 = MultiUserUser.create
+    confirmer_2 = MultiUserUser.create
+
+    post_1 = MultiUserPost.create( creator_1, confirmer_1 )
+    post_2 = MultiUserPost.create( creator_1, confirmer_2 )
+    post_3 = MultiUserPost.create( creator_2, confirmer_1 )
+    post_4 = MultiUserPost.create( creator_1, creator_2 )
+
+    post_1.created_by.id.should == creator_1.id
+    post_2.created_by.id.should == creator_1.id
+    post_3.created_by.id.should == creator_2.id
+    post_4.created_by.id.should == creator_1.id
+
+    post_1.confirmed_by.id.should == confirmer_1.id
+    post_2.confirmed_by.id.should == confirmer_2.id
+    post_3.confirmed_by.id.should == confirmer_1.id
+    post_4.confirmed_by.id.should == creator_2.id
+
+    creator_1.posts_created.size.should == 3
+    creator_1.posts_created.map{|n|n.id}.sort.should == [ post_1.id, post_2.id, post_4.id ]
+    creator_1.posts_confirmed.size.should == 0
+    creator_1.posts_confirmed.map{|n|n.id}.sort.should == []
+    creator_1.posts.size.should == 3
+    creator_1.posts.map{|n|n.id}.sort.should == [ post_1.id, post_2.id, post_4.id ]
+
+    creator_2.posts_created.size.should == 1
+    creator_2.posts_created.map{|n|n.id}.sort.should == [ post_3.id ]
+    creator_2.posts_confirmed.size.should == 1
+    creator_2.posts_confirmed.map{|n|n.id}.sort.should == [ post_4.id ]
+    creator_2.posts.size.should == 2
+    creator_2.posts.map{|n|n.id}.sort.should == [ post_3.id, post_4.id ]
+
+    confirmer_1.posts_created.size.should == 0
+    confirmer_1.posts_created.map{|n|n.id}.sort.should == []
+    confirmer_1.posts_confirmed.size.should == 2
+    confirmer_1.posts_confirmed.map{|n|n.id}.sort.should == [ post_1.id, post_3.id ]
+    confirmer_1.posts.size.should == 2
+    confirmer_1.posts.map{|n|n.id}.sort.should == [ post_1.id, post_3.id ]
+
+    confirmer_2.posts_created.size.should == 0
+    confirmer_2.posts_created.map{|n|n.id}.sort.should == []
+    confirmer_2.posts_confirmed.size.should == 1
+    confirmer_2.posts_confirmed.map{|n|n.id}.sort.should == [ post_2.id]
+    confirmer_2.posts.size.should == 1
+    confirmer_2.posts.map{|n|n.id}.sort.should == [ post_2.id ]
+  end
+
   it "correctly references items that belong to it" do
     user_a = User.create
     user_b = User.create

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 1
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Clive Crous
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +02:00
+date: 2011-02-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 257227219
+      hash: -582286063
       segments: 
       - 0
       version: "0"
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 257227219
+      hash: -582286063
       segments: 
       - 0
       version: "0"