Associations on view WIP

lib/strokedb/document/associations.rb

@@ -7,15 +7,14 @@ def view.map(uuid, doc)
         reference_slotname = self[:reference_slotname]
         through = self[:through]
         expected_meta = self[:expected_meta]
-
-        begin
-          through.each {|t| doc = doc.send(t) }
-        rescue SlotNotFoundError
-          doc = nil
-        end
-
-        if doc.meta.name == expected_meta &&
-           reference_slotname_value = doc[reference_slotname]
+
+        if doc.meta.name == expected_meta
+          begin
+            through.each {|t| doc = doc.send(t) }
+          rescue SlotNotFoundError
+            return nil unless doc
+          end
+          if reference_slotname_value = doc[reference_slotname]
            [ 
              [
                reference_slotname_value,
@@ -24,6 +23,7 @@ def view.map(uuid, doc)
            ]
         end
       end
+      end
     end
 
     module HasManyAssociation

spec/lib/strokedb/document/associations_spec.rb

@@ -115,9 +115,11 @@
     playlist = Playlist.create!
     rock_song = Song.create!(:playlist => playlist, :genre => 'Rock')
     pop_song = Song.create!(:playlist => playlist, :genre => 'Pop')
+    pending("filtering is not ready") do
     playlist.songs.find(:genre => 'Rock').should == [rock_song]
     playlist.songs.find(:genre => 'Pop').should == [pop_song]
   end
+  end
 
   it "should be able to instantiate new document with #new" do
     playlist = Playlist.create!
@@ -195,7 +197,9 @@
     playlist = Playlist.create!
     rock_song = Song.create!(:playlist => playlist, :genre => 'Rock')
     pop_song = Song.create!(:playlist => playlist, :genre => 'Pop')
-    playlist.rock_songs.should == [rock_song]
+    pending("filtering is not done yet") do
+      playlist.rock_songs.should == [rock_song]
+    end
   end
 
 end