acts-as-joinable 0.1.7.5 → 0.1.7.6

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.7.5"
+  s.version           = "0.1.7.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

@@ -325,7 +325,10 @@ module ActsAsJoinable
     
     module InstanceMethods
       def destroy_relationships
-        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})|
+        #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})|
+        classes = [self.class.name, self.class.base_class.name].compact.uniq.map {|i| %Q|"#{i}"|}.join(",")
+        relationship_table_name = ActsAsJoinable::Relationship.quoted_table_name
+        conditions = %Q|(#{relationship_table_name}.parent_type IN (#{classes}) AND #{relationship_table_name}.parent_id = #{self.id}) OR (#{relationship_table_name}.child_type IN (#{classes}) AND #{relationship_table_name}.child_id = #{self.id})|
         ActsAsJoinable::Relationship.delete_all(conditions)
       end
       
@@ -335,7 +338,7 @@ module ActsAsJoinable
         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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 87
   prerelease: false
   segments: 
   - 0
   - 1
   - 7
-  - 5
-  version: 0.1.7.5
+  - 6
+  version: 0.1.7.6
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -05:00
+date: 2010-10-20 00:00:00 -05:00
 default_executable: 
 dependencies: []