acts-as-joinable 0.1.6.8 → 0.1.7

data/README.markdown

@@ -98,4 +98,6 @@ You can always add columns to the relationship table, but the foundation is set.
 
 <cite>copyright @viatropos 2010</cite>
 
-http://rors.org/2008/10/26/dont-escape-in-strings
+http://rors.org/2008/10/26/dont-escape-in-strings
+
+- Handle case where one side has_one and the other has_many

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

@@ -61,6 +61,7 @@ module ActsAsJoinable
         # class name of the model we're joining to self
         # otherwise it's retrieved from joins.each...
         class_name  = opts[:class_name] || nil
+        sti         = (opts[:subclasses] || []).map { |i| i.to_s.camelize.constantize }
         # contexts defining the relationship between self and target
         contexts    = [opts[:context] || []].flatten
         context     = contexts.first
@@ -79,7 +80,7 @@ module ActsAsJoinable
         
         after_destroy :destroy_relationships unless after_destroy.map(&:method).include?(:destroy_relationships)
         
-        related_classes = (ancestors.reverse - included_modules + send(:subclasses)).uniq
+        related_classes = (ancestors.reverse - included_modules + send(:subclasses) + sti).uniq
         wanted_classes = []
         while wanted_classes.push(related_classes.pop)
           break if wanted_classes.last == base_class.superclass
@@ -265,7 +266,7 @@ module ActsAsJoinable
             send(plural_type) << value
           end
           send(plural_type).each do |object|
-            send(plural_type).delete(object) unless object.id == value.id
+            send(plural_type).delete(object) unless (value && object.id == value.id)
           end
         end
         define_method "#{singular_type}_id" do
@@ -319,17 +320,17 @@ 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)
-        end
+        end.uniq_by(&:parent_id)
       end
       
       def child_relationships_for(conditions = {})
         child_relationships.select do |relationship|
           relationship_matches?(relationship, conditions)
-        end
+        end.uniq_by(&:child_id)
       end
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  - 8
-  version: 0.1.6.8
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -05:00
+date: 2010-10-06 00:00:00 -05:00
 default_executable: 
 dependencies: []