party_boy 0.2.0 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.3

data/lib/party_boy.rb

@@ -48,11 +48,7 @@ module Party
 				end
 				
 				obj = (obj.class == Class && obj || obj.class == String && obj.classify.constantize || obj.class)
-				if obj.superclass != ActiveRecord::Base
-					super_class_name(obj.superclass)
-				else
-					obj.name
-				end
+				obj.base_class.name
 			end
 			
 			def get_relationship_to(requestee)
@@ -103,10 +99,10 @@ module Party
 				follows.unblocked.to_type(type).size
 			end
 			
-			def followers(type = nil)
+			def followers(type = nil, includes = {})
 				super_class = super_class_name(type)
 				exact_class = type && type.to_s.classify
-				results = relationships_from(super_class)
+				results = relationships_from(super_class, includes)
 				if super_class && exact_class && super_class != exact_class
 					results.collect{|relationship| requestor = relationship.requestor; requestor.class.name == exact_class && requestor || nil}.compact
 				else
@@ -115,10 +111,10 @@ module Party
 					
 			end
 			
-			def following(type = nil)
+			def following(type = nil, includes = {})
 				super_class = super_class_name(type)
 				exact_class = type && type.to_s.classify
-				results = relationships_to(super_class)
+				results = relationships_to(super_class, includes)
 				if super_class && exact_class && super_class != exact_class
 					results.collect{|relationship| requestee = relationship.requestee; requestee.class.name == exact_class && requestee || nil}.compact
 				else
@@ -135,13 +131,14 @@ module Party
 			end
 			
 			def method_missing(method, *args)
+				includes = args[0] || {}
 				case method.id2name
 				when /^(.+)ss_followers$/
-					followers("#{$1}ss".classify)
+					followers("#{$1}ss".classify, includes)
 				when /^(.+)s_followers$/, /^(.+)_followers$/
-					followers($1.classify)
+					followers($1.classify, includes)
 				when /^following_(.+)$/
-					following($1.classify)
+					following($1.classify, includes)
 				else
 					super
 				end
@@ -166,12 +163,12 @@ module Party
 			
 		private
 			
-			def relationships_to(type)
-				self.follows.unblocked.to_type(type).all(:include => [:requestee])
+			def relationships_to(type, includes = {})
+				self.follows.unblocked.to_type(type).all(:include => [:requestee => includes])
 			end
 			
-			def relationships_from(type)
-				self.followings.unblocked.from_type(type).all(:include => [:requestor])
+			def relationships_from(type, includes = {})
+				self.followings.unblocked.from_type(type).all(:include => [:requestor => includes])
 			end
 			
 		end

data/party_boy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{party_boy}
-  s.version = "0.2.0"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Nelson"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-05-04}
   s.description = %q{Models relationships between AR models. Allows you to follow, friend, and block other AR's. Consists of two mixins: acts_as_followable and acts_as_friend. These options allow an AR to inherit either a twitter-like follower system or a facebook-like friend system.}
   s.email = %q{mdnelson30@gmail.com}
   s.extra_rdoc_files = [

data/spec/party_boy_spec.rb

@@ -127,7 +127,9 @@ describe "party_boy -- follower" do
 	
 	
 	class User < FollowerClass; end
-	class Business < FollowerClass; end
+	class Business < FollowerClass; 
+		has_many :programs
+	end
 	class Program < FollowerClass; end
 	
 	it "should handle STI properly" do 
@@ -186,6 +188,29 @@ describe "party_boy -- follower" do
 		
 	end
 	
+	it "should handle includes properly" do 
+		u = User.create
+		b = Business.create
+		b2 = Business.create
+		b3 = Business.create
+		
+		[b,b2,b3].each{|biz| biz.programs.create}
+		
+		u.follow(b)
+		u.follow(b2)
+		u.follow(b3)
+		
+		bizs = u.following_businesses(:programs)
+		bizs.each do |biz|
+			biz.programs.loaded?.should be_true
+		end
+		
+		bizs = u.following_businesses
+		bizs.each do |biz|
+			biz.programs.loaded?.should be_false
+		end
+	end
+	
 end
 
 

data/spec/schema.rb

@@ -13,6 +13,7 @@ ActiveRecord::Schema.define :version => 0 do
   
 	create_table :follower_classes, :force => true do |t|
 		t.string :type
+		t.integer :business_id # whatever - it works
 		t.timestamps
 	end
 	

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mike Nelson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -04:00
+date: 2010-05-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency