acts-as-joinable 0.1.7.8 → 0.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.8"
+  s.version           = "0.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,4 +1,4 @@
-class ActsAsJoinable::Relationship < ActiveRecord::Base
+class Relationship < ActiveRecord::Base
   acts_as_relationship
   
   def swap_parent_and_child

data/lib/acts-as-joinable.rb

@@ -51,7 +51,7 @@ module ActsAsJoinable
       conditions    = options[:conditions] || {}
       conditions["#{relationship.to_s}_type".to_sym] = ([self.name] + (self.send(:subclasses) - self.included_modules).map(&:name)).flatten.uniq
       group         = options[:group] || "#{relationship}_id"
-      ActsAsJoinable::Relationship.count(:conditions => conditions, :group => group)
+      Relationship.count(:conditions => conditions, :group => group)
     end
     
     def acts_as_joinable

data/lib/acts_as_joinable/core.rb

@@ -78,8 +78,8 @@ module ActsAsJoinable
         
         # parent, child, or contexts (both) for custom helper getters/setters
         
-        has_many :parent_relationships, :class_name => 'ActsAsJoinable::Relationship', :as => :child, :foreign_key => "child_id", :uniq => true
-        has_many :child_relationships,  :class_name => 'ActsAsJoinable::Relationship', :as => :parent, :foreign_key => "parent_id", :uniq => true
+        has_many :parent_relationships, :class_name => 'Relationship', :as => :child, :foreign_key => "child_id", :uniq => true
+        has_many :child_relationships,  :class_name => 'Relationship', :as => :parent, :foreign_key => "parent_id", :uniq => true
         
         after_destroy :destroy_relationships unless after_destroy.map(&:method).include?(:destroy_relationships)
         
@@ -120,7 +120,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 rescue nil
+            relationship_table    = Relationship.quoted_table_name rescue nil
             
             options.merge!(:through => through_relationship, :source => relationship, :uniq => true)
             
@@ -148,7 +148,7 @@ module ActsAsJoinable
             end
             
             through_options = {
-              :class_name => "ActsAsJoinable::Relationship",
+              :class_name => "Relationship",
               :conditions => conditions,
               :as => opposite_for(relationship).to_sym
               # :select => "#{relationship}_id, #{relationship}_type, id, #{opposite_for(relationship)}_id"
@@ -210,7 +210,7 @@ module ActsAsJoinable
       
       def find_joined(model, conditions = {})
         join_conditions(model, conditions.delete(:relationship) || {}) do |kind, source_type, relationship_conditions|
-          ids = ActsAsJoinable::Relationship.select_attributes("#{opposite_for(kind)}_id", relationship_conditions).uniq
+          ids = Relationship.select_attributes("#{opposite_for(kind)}_id", relationship_conditions).uniq
           source_type.all(:conditions => {:id => ids}.merge(conditions))
         end
       end
@@ -225,7 +225,7 @@ module ActsAsJoinable
       
       def action_from_joined(action, model, conditions)
         join_conditions(model, conditions.delete(:relationship) || {}) do |kind, source_type, relationship_conditions|
-          ids = ActsAsJoinable::Relationship.select_attributes("#{kind}_id", relationship_conditions).uniq.compact.map(&:to_i)
+          ids = Relationship.select_attributes("#{kind}_id", relationship_conditions).uniq.compact.map(&:to_i)
           send(action, :conditions => {:id => ids}.merge(conditions))
         end
       end
@@ -294,7 +294,11 @@ module ActsAsJoinable
           end
         end
         define_method "#{singular_type}_id" do
-          send(singular_type).id rescue nil
+          if result = send(singular_type)
+            result.respond_to?(:id) ? result.id : nil
+          else
+            nil
+          end
         end
         define_method "#{singular_type}_id=" do |id|
           item = id.blank? ? nil : class_name.constantize.find_by_id(id)
@@ -336,11 +340,11 @@ module ActsAsJoinable
       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})|
         classes = [self.class.name, self.class.base_class.name].compact.uniq
-        #relationship_table_name = ActsAsJoinable::Relationship.quoted_table_name
+        #relationship_table_name = 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)
-        ActsAsJoinable::Relationship.delete_all(:parent_type => classes, :parent_id => self.id)
-        ActsAsJoinable::Relationship.delete_all(:child_type => classes, :child_id => self.id)
+        #Relationship.delete_all(conditions)
+        Relationship.delete_all(:parent_type => classes, :parent_id => self.id)
+        Relationship.delete_all(:child_type => classes, :child_id => self.id)
       end
       
       def relationship_matches?(relationship, conditions)

data/test/test_acts_as_joinable.rb

@@ -18,7 +18,7 @@ class ActsAsJoinableTest < ActiveRecord::TestCase
         @sub_class.reload
         @grandparent.reload
         
-        association = ActsAsJoinable::Relationship.first
+        association = Relationship.first
         
         assert @sub_class.valid?
         assert_equal "SubGroup", association.child_type
@@ -67,7 +67,7 @@ class ActsAsJoinableTest < ActiveRecord::TestCase
       end
       
       should "have optimized sql calls" do
-        ActsAsJoinable::Relationship.delete_all
+        Relationship.delete_all
         group = Group.create!
         group.posts << Post.create!
         group.posts << Post.create!
@@ -82,7 +82,7 @@ class ActsAsJoinableTest < ActiveRecord::TestCase
           group.destroy
         end
         
-        assert_equal 0, ActsAsJoinable::Relationship.count
+        assert_equal 0, Relationship.count
       end
       
       context "follow validation conventions" do

data/test/test_helper.rb

@@ -52,7 +52,7 @@ ActiveSupport::TestCase.class_eval do
     Tag.detonate
     Asset.detonate
     Page.detonate
-    ActsAsJoinable::Relationship.detonate
+    Relationship.detonate
     Group.detonate
     Asset.detonate
   end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 7
-  - 8
-  version: 0.1.7.8
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -05:00
+date: 2010-10-22 00:00:00 -05:00
 default_executable: 
 dependencies: []