acts-as-joinable 0.1.6.2 → 0.1.6.3

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.2"
+  s.version           = "0.1.6.3"
   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

@@ -181,12 +181,13 @@ module ActsAsJoinable
           #send(relationship_with_context).delete_all
           
           #send(relationship_with_context).delete_all
-          #send(plural_type).each do |object|
-          #  send(plural_type).delete(object)
-          #end
+          
           unless value.blank?
             send(plural_type) << value
           end
+          send(plural_type).each do |object|
+            send(plural_type).delete(object) unless object.id == value.id
+          end
         end
         define_method "#{singular_type}_id" do
           send(singular_type).id rescue nil
@@ -198,7 +199,9 @@ module ActsAsJoinable
       end
       
       def add_association(relationship, plural_type, options, join_context, join_value, nestable, &block)
-        eval_options = {:context => join_context}
+        eval_options = {}
+        eval_options[:context] = join_context unless join_context.to_s == options[:class_name].to_s.underscore.singularize
+
         eval_options[:value] = join_value unless join_value.blank?
         # has_many :users, :through => :child_relationships
         plural_relationship = "#{relationship}_#{plural_type}".to_sym

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 89
   prerelease: false
   segments: 
   - 0
   - 1
   - 6
-  - 2
-  version: 0.1.6.2
+  - 3
+  version: 0.1.6.3
 platform: ruby
 authors: 
 - Lance Pollard