riot-datamapper 0.0.2 → 0.0.3

data/README.md

@@ -42,7 +42,7 @@ class User
   property :monkey, Boolean, :default => false
   property :name,   String,  :default => 'monkey', :required => true
 
-  has n, :comments
+  has n, :comments, :through => :posts
   has 1, :address
 end
 
@@ -58,8 +58,18 @@ class Comment
   property :title, String
   property :body,  Text
 
+  belongs_to :post
   belongs_to :user
 end
+
+
+class Post
+
+  property :title, String
+  property :body,  Text
+
+  has n, :comments
+end
 ```
 
 You can test this like so:
@@ -75,15 +85,15 @@ context "User Model" do
   asserts_topic.has_property :monkey, 'Boolean', :default => false
   asserts_topic.has_property :name,   'String',  :default => 'monkey', :required => true
 
-  asserts_topic.has_association :has_n, :comments
+  asserts_topic.has_association :has_n, :comments, :through => :posts
   asserts_topic.has_association :has 1, :address
 end
 
 context "Address Model" do
   setup { Address }
 
-  asserts_topic.has_property :street, String
-  asserts_topic.has_property :city,   String
+  asserts_topic.has_property :street, 'String'
+  asserts_topic.has_property :city,   'String'
 
   asserts_topic.has_association :belongs_to, :user
 end
@@ -91,11 +101,22 @@ end
 context "Comment Model" do
   setup { Comment }
 
-  asserts_topic.has_property :title, String
-  asserts_topic.has_property :body,  Text
+  asserts_topic.has_property :title, 'String'
+  asserts_topic.has_property :body,  'Text'
 
+  asserts_topic.has_association :belongs_to, :post
   asserts_topic.has_association :belongs_to, :user
 end
+
+context "Post Model" do
+  setup { Post }
+
+  asserts_topic.has_property :title, 'String'
+  asserts_topic.has_property :body,  'Text'
+
+
+  asserts_topic.has_association :has_n, :comments
+end
 ```
 
 ## TODO ##

data/lib/riot-datamapper/has_association.rb

@@ -18,7 +18,16 @@ module Riot
 
         return fail(fail_msg) if relationship.nil?
 
-        if relationship.class.to_s.include? MAPPINGS[type]
+        if options[:through]
+          through_type = 'ManyToMany'
+          if relationship.through.name == options[:through]
+            pass_msg << options_msg
+          else
+            return fail(fail_msg + options_msg)
+          end
+        end
+
+        if relationship.class.to_s.include?(through_type || MAPPINGS[type])
           pass_msg << type_msg
         else
           return fail(fail_msg + type_msg)

data/lib/riot-datamapper/version.rb

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

data/test/has_association_test.rb

@@ -37,15 +37,23 @@ context "has_association macro" do
     Riot::DataMapper::HasAssociation.new.evaluate(Post,:has_n, :comments).first
   end.equals :pass
 
-  asserts "that it fails when the model has n :foos" do
+  asserts "that it fails when the model does not has n :foos" do
     Riot::DataMapper::HasAssociation.new.evaluate(Post,:has_n, :foos).first
   end.equals :fail
 
+  asserts "that it passes when the model has n :users, :through => :comments" do
+    Riot::DataMapper::HasAssociation.new.evaluate(Post,:has_n, :users, :through => :comments).first
+  end.equals :pass
+
+  asserts "that it fails when the model does not has n :users, :through => :bubbles" 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 belongs_to :foo" do
+  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
 
@@ -53,7 +61,7 @@ context "has_association macro" do
     Riot::DataMapper::HasAssociation.new.evaluate(User, :has_1, :comment).first
   end.equals :pass
 
-  asserts "that it passes when the model has 1 :foo" do
+  asserts "that it passes when the model does not has 1 :foo" do
     Riot::DataMapper::HasAssociation.new.evaluate(User, :has_1, :foo).first
   end.equals :fail
 

metadata

@@ -2,7 +2,7 @@
 name: riot-datamapper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Arthur Chiu