somehow_has_relation 0.0.3 → 0.0.4

data/lib/somehow_has_relation/version.rb

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

data/lib/somehow_has_relation.rb

@@ -8,51 +8,58 @@ module SomehowHasRelation
 
   module ClassMethods
     def somehow_has(params={})
-      remove_const('SOMEHOW_HAS_RELATION') if const_defined?('SOMEHOW_HAS_RELATION')
-      const_set('SOMEHOW_HAS_RELATION', params)
+      if class_variable_defined? :@@somehow_has_relation_options
+        class_variable_set(:@@somehow_has_relation_options, class_variable_get(:@@somehow_has_relation_options) << params)
+      else
+        class_variable_set(:@@somehow_has_relation_options, [params])
+      end
+
+      somehow_has_relation_options = class_variable_get(:@@somehow_has_relation_options)
+      times_defined = somehow_has_relation_options.count
+      current_options = somehow_has_relation_options[times_defined-1]
 
-      prefix = "related"
-      filter = params[:if]
-      relation = params[:one] || params[:many]
-      related = params[:as] || "#{prefix}_#{relation}"
-      to_flatten = params[:through] && params[:many]
+      relation = current_options[:one] || current_options[:many]
+      default_method_name = "related_#{relation}"
+
+      related = current_options[:as] || default_method_name
 
       # Dynamic Instance Method related_%{relation_name}
       define_method(related) do
-        begin
-          somehow_got = params[:through] ? somehow_look_for(relation, params[:through]) : send_and_filter(relation, filter)
-          to_flatten ? somehow_got.flatten : somehow_got
-        rescue
-          [] if params[:many]
-        end
-      end
-    end
-
-    def somehow_has_options(key=nil)
-      if const_defined?('SOMEHOW_HAS_RELATION')
-        key ? const_get('SOMEHOW_HAS_RELATION')[key] : const_get('SOMEHOW_HAS_RELATION')
+        somehow_found_or_recur relation, current_options[:if], current_options
       end
     end
   end
 
   module InstanceMethods
-    def somehow_look_for(relation, through)
+    def somehow_recur(relation, through, filter)
       first_step = send_and_filter(through)
-      condition = self.class.somehow_has_options(:if)
 
       if first_step.is_a? Array
-        first_step.map{|instance| instance.somehow_keep_looking_for(relation, condition)}
+        first_step.map{|instance| instance.somehow_found_or_recur(relation, filter)}
       else
-        first_step.somehow_keep_looking_for(relation, condition)
+        first_step.somehow_found_or_recur(relation, filter)
       end
     end
 
-    def somehow_keep_looking_for(relation, condition=nil)
-      if self.class.somehow_has_options :through
-        somehow_look_for(relation, self.class.somehow_has_options(:through))
-      else
-        condition.nil? ? send_and_filter(relation) : send_and_filter(relation, condition)
+    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)
+          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
     end
 
     private

data/test/somehow_has_relation_test.rb

@@ -1,9 +1,8 @@
 require 'test_helper'
 
 class SomehowHasRelationTest < ActiveSupport::TestCase
-  setup do
-    Post.somehow_has
-  end
+  setup :init_somehow_has
+  teardown :destroy_somehow_has
 
   test "somehow_has_relation is a Module" do
     assert_kind_of Module, SomehowHasRelation
@@ -13,18 +12,17 @@ class SomehowHasRelationTest < ActiveSupport::TestCase
     assert ActiveRecord::Base.methods.include? :somehow_has.to_s
   end
 
-  test "when somehow_has is called, it should define SOMEHOW_HAS_RELATION" do
-    assert Post.const_defined?('SOMEHOW_HAS_RELATION')
-  end
-
-  test "an Hash of parameters should be passed to somehow_has" do
-    assert_equal Hash, Post::SOMEHOW_HAS_RELATION.class
+  test "when somehow_has is called, it should define @@somehow_has_relation_options" do
+    assert Post.class_variable_defined?(:@@somehow_has_relation_options)
   end
 
-  test "reinitialize when somehow_has is called more than once" do
+  test "an Array of Hash of parameters should be passed to somehow_has" do
     params = {:newparam => 'newvalue'}
     Post.somehow_has params
-    assert_equal params, Post::SOMEHOW_HAS_RELATION
+
+    assert_equal Array, Post.send(:class_variable_get, :@@somehow_has_relation_options).class
+    assert_equal Hash, Post.send(:class_variable_get, :@@somehow_has_relation_options).first.class
+    assert_equal params, Post.send(:class_variable_get, :@@somehow_has_relation_options).last
   end
 
   test "relations should work even when somehow_has has not been defined for first step" do
@@ -138,4 +136,22 @@ class SomehowHasRelationTest < ActiveSupport::TestCase
 
     assert_equal [], @post.related_comments
   end
+
+  private
+
+  def models
+    [Post, Author, Bio, Comment]
+  end
+
+  def init_somehow_has
+    models.each do |model|
+      model.somehow_has
+    end
+  end
+
+  def destroy_somehow_has
+    models.each do |model|
+      model.send(:remove_class_variable, :@@somehow_has_relation_options)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: somehow_has_relation
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matteo Latini
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +01:00
+date: 2011-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: []