acts-as-joinable 0.2.2 → 0.2.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.2.2"
+  s.version           = "0.2.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

@@ -1,5 +1,6 @@
 # http://github.com/pluginaweek/preferences/blob/master/lib/preferences.rb
 # add changes so you can track when the join model changes
+
 module ActsAsJoinable
   module Core
     def self.included(base)
@@ -66,8 +67,9 @@ module ActsAsJoinable
           relationships      = [opts[:as] || :parent].flatten.map(&:to_sym)
         end
         
-        before_add = opts[:before_add]
-        after_add  = opts[:after_add]
+        before_add  = opts[:before_add]
+        after_add   = opts[:after_add]
+        extension   = opts[:extend]
         
         opts[:class_name] ||= opts[:source].to_s.camelize if opts[:source]
         
@@ -127,6 +129,7 @@ module ActsAsJoinable
             :source_type          => class_name,
             :conditions           => sql
           }
+          options[:extend] = extension if extension
           
           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)
@@ -244,7 +247,8 @@ module ActsAsJoinable
       def action_from_joined(action, model, conditions)
         join_conditions(model, conditions.delete(:relationship) || {}) do |kind, source_type, relationship_conditions|
           ids = Relationship.select_attributes("#{kind}_id", relationship_conditions).uniq.compact.map(&:to_i)
-          send(action, :conditions => {:id => ids}.merge(conditions))
+          conditions.reverse_merge!(:id => ids)
+          send(action, :conditions => conditions)
         end
       end
       
@@ -259,13 +263,13 @@ module ActsAsJoinable
         else
           options = {:source => "parent", :source_type => model.to_s.camelize}
         end
-        kind         = conditions[:as] || options[:source].to_s
+        kind         = conditions.delete(:as) || options[:source].to_s
         source_type  = options[:source_type].constantize
-                
+        
         result = conditions.reverse_merge(
           "#{opposite_for(kind)}_type" => related_classes.map(&:name),
           "#{kind}_type" => source_type.related_classes.map(&:name)
-        )
+        ).stringify_keys
         
         if block_given?
           yield(opposite_for(kind), source_type, result) 
@@ -296,7 +300,7 @@ module ActsAsJoinable
           send(plural_type)[-1]#.last
         end
         define_method "#{singular_type}=" do |value|
-          return value if send(plural_type).map(&:id).include?(value.id)
+          return value if value && value.respond_to?(:id) && send(plural_type).map(&:id).include?(value.id)
           
           send(plural_type) << value unless value.blank?
           

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
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Lance Pollard