somehow_has_relation 0.0.4 → 0.0.6

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 if ENV["RAILS_VER"] == "3"
   gem "rails", "~> 3.0"
 else
-  gem "rails", "~> 2.3"
+  gem "rails", "~> 2.3.11"
 end
 
 group :test do

data/lib/somehow_has_relation/version.rb

@@ -1,3 +1,3 @@
 module SomehowHasRelation
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/lib/somehow_has_relation.rb

@@ -25,7 +25,12 @@ module SomehowHasRelation
 
       # Dynamic Instance Method related_%{relation_name}
       define_method(related) do
-        somehow_found_or_recur relation, current_options[:if], current_options
+        found = somehow_found_or_recur relation, current_options[:if], current_options
+        if current_options.has_key?(:one)
+          found.flatten.compact.first rescue found
+        elsif current_options.has_key?(:many)
+          found.flatten.compact rescue []
+        end
       end
     end
   end
@@ -42,24 +47,28 @@ module SomehowHasRelation
     end
 
     def somehow_found_or_recur(relation, condition=nil, opts=nil)
-      opts ||= self.class.send(:class_variable_get, :@@somehow_has_relation_options)
-      opts = [opts] unless opts.is_a? Array
-
-      found = []
-
-      opts.each do |opt|
-        begin
-          if opt.has_key?(:through)
-            found << somehow_recur(relation, opt[:through], opt[:if])
-          else
-            return send_and_filter(relation, condition)
+      if self.class.send(:class_variable_defined?, :@@somehow_has_relation_options)
+        opts ||= self.class.send(:class_variable_get, :@@somehow_has_relation_options)
+        opts = [opts] unless opts.is_a? Array
+
+        found = []
+
+        opts.each do |opt|
+          begin
+            if opt.has_key?(:through)
+              found << somehow_recur(relation, opt[:through], opt[:if])
+            else
+              return send_and_filter(relation, condition)
+            end
+          rescue
+            found << []
           end
-        rescue
-          found << (opt.has_key?(:many) ? [] : nil)
         end
-      end
 
-      found.all?{|elem| elem.nil? || (elem.is_a?(Array) && elem.empty?)} ? nil : found.compact.flatten
+        found
+      else
+        send_and_filter(relation, condition)
+      end
     end
 
     private

data/test/somehow_has_relation_test.rb

@@ -26,10 +26,13 @@ class SomehowHasRelationTest < ActiveSupport::TestCase
   end
 
   test "relations should work even when somehow_has has not been defined for first step" do
-    @post = Post.create(:author => Author.create, :comments => [Comment.create, Comment.create])
+    destroy_somehow_has
+    comments = [Comment.create, Comment.create]
+    post = Post.create(:comments => comments)
+    @author = Author.create(:posts => [post])
 
-    assert_equal @post.author, @post.related_author
-    assert_equal @post.comments, @post.related_comments
+    Author.somehow_has :many => :comments, :through => :posts
+    assert_equal post.comments, @author.related_comments
   end
 
   test "1-step relation defines a method prefixed with related_ for standard associations methods" do
@@ -151,7 +154,7 @@ class SomehowHasRelationTest < ActiveSupport::TestCase
 
   def destroy_somehow_has
     models.each do |model|
-      model.send(:remove_class_variable, :@@somehow_has_relation_options)
+      model.send(:remove_class_variable, :@@somehow_has_relation_options) rescue next
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: somehow_has_relation
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Matteo Latini