acts-as-joinable 0.2.3 → 0.2.6

data/README.markdown

@@ -100,4 +100,5 @@ You can always add columns to the relationship table, but the foundation is set.
 
 http://rors.org/2008/10/26/dont-escape-in-strings
 
-- Handle case where one side has_one and the other has_many
+- Handle case where one side has_one and the other has_many
+

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.2.3"
+  s.version           = "0.2.6"
   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

@@ -2,6 +2,7 @@
 # add changes so you can track when the join model changes
 
 module ActsAsJoinable
+  
   module Core
     def self.included(base)
       base.send :include, ActsAsJoinable::Core::InstanceMethods
@@ -91,6 +92,7 @@ module ActsAsJoinable
         # possible values of the context
         values      = [opts[:values] || opts[:value] || []].flatten.compact
         value       = values.first
+        status      = opts[:status]
         
         sql         = opts[:conditions]
         
@@ -119,6 +121,7 @@ module ActsAsJoinable
             plural_type   = type.to_s.to_sym
           end
           class_name    = opts[:class_name] || type.to_s.classify
+          source_type   = opts[:source_type] || class_name
           
           join_context = (context.blank? ? [singular_type] : Array(context)).map(&:to_s)
           
@@ -126,7 +129,7 @@ module ActsAsJoinable
             :through              => :relationships,
             :class_name           => class_name,
             :source               => :child,
-            :source_type          => class_name,
+            :source_type          => source_type,
             :conditions           => sql
           }
           options[:extend] = extension if extension
@@ -134,6 +137,7 @@ module ActsAsJoinable
           add_around_filters_for_join(options, "#{singular_type.to_s}_id".to_sym, before_add, :before_add)
           add_around_filters_for_join(options, "#{singular_type.to_s}_id".to_sym, after_add, :after_add)
           
+          relationship_table    = Relationship.quoted_table_name rescue nil
           # relationships == [:parent, :child]
           relationships.each do |relationship|
             # Post.joins :tags, :as => :parent
@@ -141,26 +145,29 @@ module ActsAsJoinable
             # relationship_table   = `relationships`
             relationship          = opposite_for(relationship)
             through_relationship  = "#{relationship.to_s}_#{singular_type}_relationships".to_sym
-            relationship_table    = Relationship.quoted_table_name rescue nil
             
             options.merge!(:through => through_relationship, :source => relationship, :uniq => true)
             
             join_value            = value
             
-            # conditions for the join model
-            condition_string      = ""
-            #if join_context == class_name.underscore
-              
-#            condition_string      << "(#{relationship_table}.#{relationship}_type IN (?))"
+            through_conditions = {
+              "#{relationship}_type".to_sym => source_type
+            }
+            
             if join_context.include?(class_name.underscore)# && opposite_for(relationship).to_sym != :child
               #conditions            = [condition_string, [class_name]]
 #              if join_value
 #                condition_string      << "(#{relationship_table}.value = ?)"
 #                conditions            = [condition_string, join_value.to_s]
 #              end
+              if status
+                through_conditions = {:status => status}
+              end
             else
-              conditions = {:context => join_context.dup}
-              conditions[:value] = join_value unless join_value.blank?
+              #through_conditions = {}
+              through_conditions[:context] = join_context.dup
+              through_conditions[:value] = join_value unless join_value.blank?
+              through_conditions[:status] = status unless status.blank?
 #              condition_string      << "(#{relationship_table}.context IN (?))"
 #              condition_string      << " AND (#{relationship_table}.value = ?)" if join_value
 #              join_contexts         = join_context.dup#[join_context, class_name.underscore].uniq
@@ -170,11 +177,11 @@ module ActsAsJoinable
             
             through_options = {
               :class_name => "Relationship",
-              :conditions => conditions,
+              :conditions => through_conditions,
               :as => opposite_for(relationship).to_sym
               # :select => "#{relationship}_id, #{relationship}_type, id, #{opposite_for(relationship)}_id"
             }
-            
+
             if association_type == :has_one
               #options.delete(:after_add) 
               options.delete(:uniq)
@@ -194,7 +201,7 @@ module ActsAsJoinable
               has_many through_relationship, through_options
             end
                           
-            add_association(relationship.to_s, plural_type, options, join_context, join_value, &block)
+            add_association(relationship.to_s, plural_type, singular_type, options, join_context, join_value, status, &block)
             
             if association_type == :has_one
               add_has_one(singular_type, plural_type, through_relationship, class_name, join_context, join_value, options)
@@ -325,19 +332,36 @@ module ActsAsJoinable
         end
       end
       
-      def add_association(relationship, plural_type, options, join_context, join_value, &block)
+      def add_association(relationship, plural_type, singular_type, options, join_context, join_value, status, &block)
         eval_options = {}
+        
         eval_options[:context] = join_context.to_s unless join_context.to_s == options[:class_name].to_s.underscore.singularize
-
         eval_options[:value] = join_value unless join_value.blank?
+        eval_options[:status] = status unless status.blank?
+        the_opposite = opposite_for(relationship.to_s)
         # has_many :users, :through => :child_relationships
         plural_relationship = "#{relationship}_#{plural_type}".to_sym
+        
+        define_method "#{singular_type}_relationships" do |*args|
+          args      = args.flatten.compact
+          options   = args.extract_options!
+          ids       = args.flatten.compact.map do |item|
+            item.respond_to?(:id) ? item.id : item
+          end
+          options["#{relationship}_id"] = ids
+          send("#{relationship}_#{singular_type}_relationships").all(:conditions => options)
+        end
+        
         unless has_association?(plural_relationship)
           send(:has_many, plural_relationship, options) do
             class_eval <<-EOF
               def construct_join_attributes(associate)
                 super.merge(#{eval_options.inspect})
               end
+              
+              def relationships_for(*args)
+                @owner.send("#{singular_type}_relationships", *args)
+              end
             EOF
           end
         end
@@ -348,6 +372,10 @@ module ActsAsJoinable
               def construct_join_attributes(associate)
                 super.merge(#{eval_options.inspect})
               end
+              
+              def relationships_for(*args)
+                @owner.send("#{singular_type}_relationships", *args)
+              end
             EOF
           end
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -05:00
+date: 2010-11-01 00:00:00 -05:00
 default_executable: 
 dependencies: []