acts-as-joinable 0.1.4 → 0.1.5

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.4"
+  s.version           = "0.1.5"
   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/active_record_patch.rb

@@ -79,7 +79,6 @@ module ActiveRecord
       
       # Construct attributes for associate pointing to owner.
       def construct_owner_attributes(reflection)
-        puts "construct_owner_attributes #{@owner.class.name}"
         if as = reflection.options[:as]
           { "#{as}_id" => @owner.id,
             "#{as}_type" => @owner.class.name.to_s }
@@ -121,7 +120,6 @@ module ActiveRecord
           reflection_primary_key = @reflection.klass.primary_key
           source_primary_key     = @reflection.source_reflection.primary_key_name
           if @reflection.options[:source_type]
-            puts "@reflection.options[:source_type]"
             polymorphic_join = construct_polymorphic_sql(
               @reflection.through_reflection.quoted_table_name,
               "#{@reflection.source_reflection.options[:foreign_type]}",
@@ -149,8 +147,6 @@ module ActiveRecord
           polymorphic_join
         ]
         
-        puts "RESULT #{result}"
-        
         result
       end
     end
@@ -181,7 +177,6 @@ module ActiveRecord
             @finder_sql << " AND (#{polymorphic_conditions})"
             @finder_sql << " AND (#{conditions})" if conditions
           else
-            puts "PRIMARY #{@reflection.quoted_table_name}.#{@reflection.primary_key_name}"
             @finder_sql = "#{@reflection.quoted_table_name}.#{@reflection.primary_key_name} = #{owner_quoted_id}"
             @finder_sql << " AND (#{conditions})" if conditions
         end

data/lib/acts_as_joinable/core.rb

@@ -178,7 +178,7 @@ module ActsAsJoinable
           send(plural_type).last
         end
         define_method "#{singular_type}=" do |value|
-          send(relationship_with_context).delete_all
+          #send(relationship_with_context).delete_all
           send(plural_type) << value
         end
         define_method "#{singular_type}_id" do
@@ -223,6 +223,25 @@ module ActsAsJoinable
         conditions = %Q|(`relationships`.parent_type IN ("#{self.class.name}","#{self.class.base_class.name}") AND `relationships`.parent_id = #{self.id}) OR (`relationships`.child_type IN ("#{self.class.name}","#{self.class.base_class.name}") AND `relationships`.child_id = #{self.id})|
         ActsAsJoinable::Relationship.delete_all(conditions)
       end
+      
+      def relationship_matches?(relationship, conditions)
+        return false if conditions[:parent_type] && !Array(conditions[:parent_type]).include?(relationship.parent_type)
+        return false if conditions[:child_type] && !Array(conditions[:child_type]).include?(relationship.child_type)
+        return false if conditions[:context] && !Array(conditions[:context]).include?(relationship.context)
+        true
+      end
+      
+      def parent_relationships_for(conditions = {})
+        parent_relationships.select do |relationship|
+          relationship_matches?(relationship, conditions)
+        end
+      end
+      
+      def child_relationships_for(conditions = {})
+        child_relationships.select do |relationship|
+          relationship_matches?(relationship, conditions)
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -05:00
+date: 2010-09-29 00:00:00 -05:00
 default_executable: 
 dependencies: []