acts-as-joinable 0.1.6.5 → 0.1.6.8

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "acts-as-joinable"
   s.authors           = ["Lance Pollard"]
-  s.version           = "0.1.6.5"
+  s.version           = "0.1.6.8"
   s.summary           = "ActsAsJoinable: DRYing up Many-to-Many Relationships in ActiveRecord"
   s.homepage          = "http://github.com/viatropos/acts-as-joinable"
   s.email             = "lancejpollard@gmail.com"

data/lib/acts_as_joinable/core.rb

@@ -156,6 +156,9 @@ module ActsAsJoinable
             
             if association_type == :has_one
               add_has_one(singular_type, plural_type, through_relationship, class_name, join_context, join_value, options)
+              add_class_relationship_method(singular_type)
+            else
+              add_class_relationship_method(plural_type)
             end
             
             if nestable
@@ -177,12 +180,74 @@ module ActsAsJoinable
         super(*args)
         initialize_acts_as_joinable_on_core
       end
+    
+      def find_joined_with_join(model, conditions = {})
+        options = join_conditions(model, conditions.delete(:relationship) || {})
+        options.merge!(conditions)
+        source_type.all(options)
+      end
+      
+      def find_joined(model, conditions = {})
+        join_conditions(model, conditions.delete(:relationship) || {}) do |kind, source_type, relationship_conditions|
+          ids = ActsAsJoinable::Relationship.select_attributes("#{opposite_for(kind)}_id", relationship_conditions).uniq
+          source_type.all(:conditions => {:id => ids}.merge(conditions))
+        end
+      end
+      
+      def find_from_joined(model, conditions = {})
+        action_from_joined(:all, model, conditions)
+      end
+      
+      def count_from_joined(model, conditions)
+        action_from_joined(:count, model, conditions)
+      end
+      
+      def action_from_joined(action, model, conditions)
+        join_conditions(model, conditions.delete(:relationship) || {}) do |kind, source_type, relationship_conditions|
+          ids = ActsAsJoinable::Relationship.select_attributes("#{kind}_id", relationship_conditions).uniq
+          send(action, :conditions => {:id => ids}.merge(conditions))
+        end
+      end
+      
+#      def join_scope(name, conditions = {}, &block)
+        #add_class_relationship_method(method)
+#      end
+
+      def join_conditions(model, conditions = {}, &block)
+        relationship = self.reflect_on_all_associations.detect {|a| a.name == model.to_sym}
+        if relationship
+          options = relationship.options
+        else
+          options = {:source => "parent", :source_type => model.to_s.camelize}
+        end
+        kind         = conditions[:as] || options[:source].to_s
+        source_type  = options[:source_type].constantize
+                
+        result = conditions.reverse_merge(
+          "#{opposite_for(kind)}_type" => related_classes.map(&:name),
+          "#{kind}_type" => source_type.related_classes.map(&:name)
+        )
+        
+        if block_given?
+          yield(kind, source_type, result) 
+        else
+          result
+        end
+      end
       
       private
       def opposite_for(role)
         role.to_s == "parent" ? "child" : "parent"
       end
       
+      def add_class_relationship_method(method)
+        class_eval <<-EOF
+          def self.#{method}(options = {})
+            find_joined(:#{method.to_s}, options)
+          end
+        EOF
+      end
+      
       def has_association?(name)
         self.reflect_on_all_associations.map(&:name).include?(name.to_sym)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 79
   prerelease: false
   segments: 
   - 0
   - 1
   - 6
-  - 5
-  version: 0.1.6.5
+  - 8
+  version: 0.1.6.8
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -05:00
+date: 2010-10-05 00:00:00 -05:00
 default_executable: 
 dependencies: []