riot-datamapper 0.0.3 → 0.0.4

data/README.md

@@ -59,7 +59,7 @@ class Comment
   property :body,  Text
 
   belongs_to :post
-  belongs_to :user
+  belongs_to :user, :required => false
 end
 
 
@@ -105,7 +105,7 @@ context "Comment Model" do
   asserts_topic.has_property :body,  'Text'
 
   asserts_topic.has_association :belongs_to, :post
-  asserts_topic.has_association :belongs_to, :user
+  asserts_topic.has_association :belongs_to, :user, :required => false
 end
 
 context "Post Model" do

data/lib/riot-datamapper/has_association.rb

@@ -27,6 +27,14 @@ module Riot
           end
         end
 
+        if options[:required]
+          if relationship.instance_variable_get("@required") == options[:required]
+            pass_msg << options_msg unless options[:through]
+          else
+            return fail(fail_msg + options_msg)
+          end
+        end
+
         if relationship.class.to_s.include?(through_type || MAPPINGS[type])
           pass_msg << type_msg
         else

data/lib/riot-datamapper/version.rb

@@ -1,5 +1,5 @@
 module Riot
   module Datamapper
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/has_association_test.rb

@@ -28,7 +28,7 @@ context "has_association macro" do
       property :id,  Serial
 
       belongs_to :user
-      belongs_to :post
+      belongs_to :post, :required => false
     end
     DataMapper.finalize
   end
@@ -49,10 +49,6 @@ context "has_association macro" do
     Riot::DataMapper::HasAssociation.new.evaluate(Post,:has_n, :users, :through => :bubbles).first
   end.equals :fail
 
-  asserts "that it passes when the model belongs_to :post" do
-    Riot::DataMapper::HasAssociation.new.evaluate(Comment, :belongs_to, :post).first
-  end.equals :pass
-
   asserts "that it fails when the model does not belongs_to :foo" do
     Riot::DataMapper::HasAssociation.new.evaluate(Comment, :belongs_to, :foo).first
   end.equals :fail
@@ -69,4 +65,20 @@ context "has_association macro" do
     Riot::DataMapper::HasAssociation.new.evaluate(Comment, :belongs_to, :user).first
   end.equals :pass
 
+  asserts "that it passes when the model belongs_to :user" do
+    Riot::DataMapper::HasAssociation.new.evaluate(Comment, :belongs_to, :user).first
+  end.equals :pass
+
+  asserts "that it fails when the model belongs_to :wah" do
+    Riot::DataMapper::HasAssociation.new.evaluate(Comment, :belongs_to, :wah).first
+  end.equals :fail
+
+  asserts "that it passes when the model belongs_to :post, :required => false" do
+    Riot::DataMapper::HasAssociation.new.evaluate(Comment, :belongs_to, :post, :required => false).first
+  end.equals :pass
+
+  asserts "that it fails when the model belongs_to :post, :required => true" do
+    Riot::DataMapper::HasAssociation.new.evaluate(Comment, :belongs_to, :post, :required => true).first
+  end.equals :fail
+
 end

metadata

@@ -2,7 +2,7 @@
 name: riot-datamapper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Arthur Chiu
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 Z
+date: 2011-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: riot