party_boy 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/party_boy.rb

@@ -3,6 +3,7 @@ module Party
 		
 		class IdentityTheftError < StandardError; end
 		class StalkerError < StandardError; end
+		class TryingTooHardError < StandardError; end 
 		
 		def self.included(klazz)
 			klazz.extend(Party::Boy::ClassMethods)
@@ -14,6 +15,7 @@ module Party
 		module ClassMethods
 			
 			def acts_as_followable
+				raise(Party::Boy::TryingTooHardError, "Can't implement both acts_as_followable and acts_as_friendly in the same class.") if self.included_modules.include?(Party::Boy::FriendlyInstanceMethods)
 				with_options :class_name => 'Relationship', :dependent => :destroy do |klazz|
 				 klazz.has_many :followings, :as => :requestee
 				 klazz.has_many :follows, :as => :requestor
@@ -23,12 +25,12 @@ module Party
 			end
 			
 			def acts_as_friend
+				raise(Party::Boy::TryingTooHardError, "Can't implement both acts_as_followable and acts_as_friendly in the same class.") if self.included_modules.include?(Party::Boy::FollowableInstanceMethods)
 				with_options :class_name => 'Relationship', :dependent => :destroy do |klazz|
 					klazz.has_many :outgoing_friendships, :as => :requestor, :include => :requestee
 					klazz.has_many :incoming_friendships, :as => :requestee, :include => :requestor
 				end
 				
-				include Party::Boy::RelateableInstanceMethods
 				include Party::Boy::FriendlyInstanceMethods
 			end
 			

data/party_boy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{party_boy}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Nelson"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/party_boy.rb",
      "party_boy.gemspec",
      "social_lite.gemspec",
+     "spec/models/both_class.rb",
      "spec/models/follower_class.rb",
      "spec/models/friend_class.rb",
      "spec/party_boy_spec.rb",
@@ -42,7 +43,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Models relationships between AR models. Allows you to follow, friend, and block other AR's.}
   s.test_files = [
-    "spec/models/follower_class.rb",
+    "spec/models/both_class.rb",
+     "spec/models/follower_class.rb",
      "spec/models/friend_class.rb",
      "spec/party_boy_spec.rb",
      "spec/schema.rb",

data/spec/models/both_class.rb

@@ -0,0 +1,7 @@
+class BothClass < ActiveRecord::Base
+	include Party::Boy
+	
+	acts_as_friend
+	acts_as_followable
+	
+end

data/spec/party_boy_spec.rb

@@ -30,6 +30,13 @@ describe "PartyBoy" do
 		r3.should_not be_valid
 	end
 	
+	
+	it "should not allow multiple implementations in one model" do 
+		lambda {
+			require 'models/both_class'
+			}.should raise_error(Party::Boy::TryingTooHardError)
+	end
+	
 end
 
 describe "PartyBoy -- Follower" do

data/spec/schema.rb

@@ -16,4 +16,8 @@ ActiveRecord::Schema.define :version => 0 do
 		t.timestamps
 	end
 	
+	create_table :both_classes, :force => true do |t|
+		t.timestamps
+	end
+	
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: party_boy
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mike Nelson
@@ -44,6 +44,7 @@ files:
 - lib/party_boy.rb
 - party_boy.gemspec
 - social_lite.gemspec
+- spec/models/both_class.rb
 - spec/models/follower_class.rb
 - spec/models/friend_class.rb
 - spec/party_boy_spec.rb
@@ -79,6 +80,7 @@ signing_key:
 specification_version: 3
 summary: Models relationships between AR models. Allows you to follow, friend, and block other AR's.
 test_files: 
+- spec/models/both_class.rb
 - spec/models/follower_class.rb
 - spec/models/friend_class.rb
 - spec/party_boy_spec.rb