acts-as-joinable 0.1.7 → 0.1.7.2

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"
+  s.version           = "0.1.7.2"
   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/app/models/relationship.rb

@@ -1,3 +1,3 @@
 class ActsAsJoinable::Relationship < ActiveRecord::Base
   acts_as_relationship
-end
+end

data/lib/acts_as_joinable/core.rb

@@ -114,7 +114,7 @@ module ActsAsJoinable
             # relationship_table   = `relationships`
             relationship          = opposite_for(relationship)
             through_relationship  = "#{relationship.to_s}_#{singular_type}_relationships".to_sym
-            relationship_table    = ActsAsJoinable::Relationship.quoted_table_name
+            relationship_table    = ActsAsJoinable::Relationship.quoted_table_name rescue nil
             
             options.merge!(:through => through_relationship, :source => relationship, :uniq => true)
             
@@ -125,7 +125,7 @@ module ActsAsJoinable
             #if join_context == class_name.underscore
               
 #            condition_string      << "(#{relationship_table}.#{relationship}_type IN (?))"
-            if join_context == class_name.underscore
+            if join_context == class_name.underscore# && opposite_for(relationship).to_sym != :child
               #conditions            = [condition_string, [class_name]]
             else
               condition_string      << "(#{relationship_table}.context IN (?))"
@@ -139,6 +139,7 @@ module ActsAsJoinable
               :class_name => "ActsAsJoinable::Relationship",
               :conditions => conditions,
               :as => opposite_for(relationship).to_sym
+              # :select => "#{relationship}_id, #{relationship}_type, id, #{opposite_for(relationship)}_id"
             }
             
             if association_type == :has_one
@@ -265,8 +266,12 @@ module ActsAsJoinable
           unless value.blank?
             send(plural_type) << value
           end
-          send(plural_type).each do |object|
-            send(plural_type).delete(object) unless (value && object.id == value.id)
+          if value.blank?
+            send(plural_type).delete_all
+          else
+            send(plural_type).each do |object|
+              send(plural_type).delete(object) unless (value && object.id == value.id)
+            end
           end
         end
         define_method "#{singular_type}_id" do

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 95
   prerelease: false
   segments: 
   - 0
   - 1
   - 7
-  version: 0.1.7
+  - 2
+  version: 0.1.7.2
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -05:00
+date: 2010-10-13 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -48,7 +49,7 @@ files:
 - test/test_acts_as_joinable.rb
 - test/test_helper.rb
 - app/models/relationship.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/viatropos/acts-as-joinable
 licenses: []