dm-is-friendly 1.0.2 → 1.1.2

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'rake/rdoctask'
 
 begin
   require 'jeweler'
@@ -10,13 +9,10 @@ begin
     gemspec.email = "kabari@gmail.com"
     gemspec.homepage = "http://github.com/RipTheJacker/dm-is-friendly"
     gemspec.authors = ["RipTheJacker"]
-    
+
     gemspec.has_rdoc    = 'yard'
     gemspec.files = Dir['Rakefile', '{lib,spec}/**/*', 'README*', 'LICENSE*', 'VERSION'] - ['spec/log/dm.log']
-                      
-    gemspec.add_development_dependency("rspec", "~> 2.1.0")
-    gemspec.add_development_dependency("jeweler")
-    gemspec.add_dependency("dm-core", "~> 1.0.2")
+
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError => e
@@ -33,7 +29,7 @@ begin
     t.rcov = true
     t.rcov_opts =  %[-Ilib -Ispec --exclude "spec/spec_helper.rb"]
     t.rcov_opts << %[--no-html --aggregate coverage.data]
-  end  
+  end
 rescue LoadError
   task :spec do
     abort "RSpec gem is not available. In order to test use: bundle install"
@@ -45,13 +41,6 @@ end
 task :default => :spec
 
 
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "dm-is-friendly 1.0.2"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 begin
   require 'reek/adapters/rake_task'
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.2

data/lib/dm-is-friendly/is/friendly.rb

@@ -5,47 +5,49 @@ module DataMapper
       
       def is_friendly(options = {})
         options = {:require_acceptance => true, :friendship_class => "Friendship" }.merge(options)
-        @friendly_config = FriendlyConfig.new(self, options)        
-        def self.friendly_config; @friendly_config; end
-                
+        
+        list                 = self.name.split("::")
+        list.shift if DataMapper::Ext.blank?(list.first)
         reference_model      = self
-        reference_model_name = DataMapper::Inflector.demodulize(self.name).downcase.to_sym
+        reference_model_name = list.pop
+        reference_model_key  = DataMapper::Inflector.underscore(reference_model_name).to_sym
         
-        Object.full_const_set(options[:friendship_class], 
-          DataMapper::Model.new do
-            if options[:require_acceptance]
-              property :accepted_at, DateTime
-            end
+        namespace = list.empty? ? ::Object : DataMapper::Ext::Object.full_const_get(list.join('::'))
         
-            belongs_to reference_model_name, reference_model, :key => true
-            belongs_to :friend, :model => reference_model, :child_key => [:friend_id], :key => true
+        @friendly_config = FriendlyConfig.new(reference_model_name, "#{namespace}::#{options[:friendship_class]}", options[:require_acceptance])
+        def self.friendly_config; @friendly_config; end
+
+        DataMapper::Model.new(options[:friendship_class], namespace) do          
+          if options[:require_acceptance]
+            property :accepted_at, DateTime
           end
-        )
-        
-        friendship_class = Object.full_const_get(options[:friendship_class])
+          
+          belongs_to reference_model_key, reference_model, :key => true
+          belongs_to :friend, :model => reference_model, :child_key => [:friend_id], :key => true
+        end
         
         has n, :friendships, :model => options[:friendship_class]
         
-        has n, :friends_by_me, self, :through => :friendships, :via => reference_model_name
-        has n, :friended_by,   self, :through => :friendships, :via => reference_model_name
+        has n, :friends_by_me, self, :through => :friendships, :via => reference_model_key
+        has n, :friended_by,   self, :through => :friendships, :via => reference_model_key
         
         include DataMapper::Is::Friendly::InstanceMethods
       end
       
       # This class holds the configuration options for the plugin.
       class FriendlyConfig
-        attr_reader :reference_model, :friendship_foreign_key, :friend_foreign_key
+        attr_reader :reference_model_name, :friendship_foreign_key, :friend_foreign_key
         
-        def initialize(klazz, opts)
-          @reference_model        = klazz
-          @friendship_class_name  = opts[:friendship_class]
-          @friendship_foreign_key = DataMapper::Inflector.foreign_key(@reference_model.name).to_sym
+        def initialize(ref_model_name, friendship_class, require_acceptance)
+          @reference_model_name        = ref_model_name
+          @friendship_class_name  = friendship_class
+          @friendship_foreign_key = DataMapper::Inflector.foreign_key(@reference_model_name).to_sym
           @friend_foreign_key     = DataMapper::Inflector.foreign_key(@friendship_class_name).to_sym
-          @require_acceptance     = opts[:require_acceptance]
+          @require_acceptance     = require_acceptance
         end
         
         def friendship_class
-          Object.full_const_get(@friendship_class_name)
+          DataMapper::Ext::Object.full_const_get(@friendship_class_name)
         end
         
         def require_acceptance?
@@ -84,7 +86,7 @@ module DataMapper
           friend_scope_condition(conditions, friend, true)
           
           conditions[:friend_id] = self.id                      
-          friendly_config.friendship_class.all(conditions).send(friendly_config.reference_model.name.downcase)
+          friendly_config.friendship_class.all(conditions).send(friendly_config.reference_model_name.downcase)
         end
         
         # see if there is a pending friendship request from this person to another
@@ -157,4 +159,4 @@ module DataMapper
       end
     end # Friendly
   end # Is
-end # DataMapper
+end # DataMapper

data/spec/dm-is-friendly_spec.rb

@@ -20,13 +20,15 @@ describe DataMapper::Is::Friendly do
     
     module SomeModule
       class Member
-        # include DataMapper::Resource
-        # property :id, Serial
-        # property :name, String
-        # 
-        # is :friendly, :friendship_class => "Membership"
+        include DataMapper::Resource
+        property :id, Serial
+        property :name, String
+        
+        is :friendly
       end
     end
+    
+    DataMapper.finalize
   end
   
   describe "configuration" do
@@ -34,8 +36,9 @@ describe DataMapper::Is::Friendly do
     context "default" do
       it "should have proper options set" do
         Person.friendly_config.friendship_class.to_s.should == "Friendship"
-        Person.friendly_config.reference_model.to_s.should     == "Person"
+        Person.friendly_config.reference_model_name.should     == "Person"
         Person.friendly_config.friendship_foreign_key.should == :person_id
+        Person.friendly_config.friend_foreign_key.should  == :friendship_id
         Person.friendly_config.require_acceptance?.should == true
       end
     end
@@ -43,32 +46,47 @@ describe DataMapper::Is::Friendly do
     context "friendship_class and acceptance set" do
       it "should have proper options set" do
         Member.friendly_config.friendship_class.to_s.should == "Membership"
-        Member.friendly_config.reference_model.to_s.should     == "Member"
+        Member.friendly_config.reference_model_name.should     == "Member"
         Member.friendly_config.friendship_foreign_key.should == :member_id
+        Member.friendly_config.friend_foreign_key.should  == :membership_id
         Member.friendly_config.require_acceptance?.should == false
       end
     end
     
     context "with a namespace" do
-      pending "should have proper options set" do
-        SomeModule::Member.friendly_config.friendship_class.to_s.should == "Friendship"
-        SomeModule::Member.friendly_config.reference_model.to_s.should     == "Person"
-        SomeModule::Member.friendly_config.friendship_foreign_key.should == :person_id
+      it "should have proper options set" do
+        SomeModule::Member.friendly_config.friendship_class.to_s.should == "SomeModule::Friendship"
+        SomeModule::Member.friendly_config.reference_model_name.should     == "Member"
+        SomeModule::Member.friendly_config.friendship_foreign_key.should == :member_id
+        SomeModule::Member.friendly_config.friend_foreign_key.should  == :friendship_id
         SomeModule::Member.friendly_config.require_acceptance?.should == true
       end
     end
+    
+    it "should create DataMapper::Model classes for relationships" do
+      Membership.should be_kind_of(DataMapper::Model)
+      Friendship.should be_kind_of(DataMapper::Model)
+      SomeModule::Friendship.should be_kind_of(DataMapper::Model)
+    end
+
+    it "should add friendship classes to DataMapper::Model.descendants" do
+      DataMapper::Model.descendants.should include(Membership)
+      DataMapper::Model.descendants.should include(Friendship) 
+      DataMapper::Model.descendants.should include(SomeModule::Friendship)    
+    end
   end
   
   with_adapters do
   
     describe "default" do
       before(:all) do
-        DataMapper.auto_migrate!         
+        DataMapper.auto_migrate!
+        
         @quentin = Person.create(:name => "quentin")
         @aaron   = Person.create(:name => "aaron")
         @joe     = Person.create(:name => "joe")
       end
-    
+      
       it "should work" do
         lambda do
           @joe.request_friendship(@quentin)
@@ -135,12 +153,12 @@ describe DataMapper::Is::Friendly do
     describe "without requiring acceptance" do
       before(:all) do
         DataMapper.auto_migrate!
-    
+        
         @quentin = Member.create(:name => "quentin")
         @aaron   = Member.create(:name => "aaron")
         @joe     = Member.create(:name => "joe")
       end
-    
+            
       it "should work" do
         lambda do
           @joe.request_friendship(@quentin)
@@ -192,5 +210,77 @@ describe DataMapper::Is::Friendly do
       end
   
     end
+    
+    describe "nested" do
+      before(:all) do
+        DataMapper.auto_migrate!
+        
+        @quentin = SomeModule::Member.create(:name => "quentin")
+        @aaron   = SomeModule::Member.create(:name => "aaron")
+        @joe     = SomeModule::Member.create(:name => "joe")
+      end
+      
+      it "should work" do
+        lambda do
+          @joe.request_friendship(@quentin)
+        end.should change(SomeModule::Friendship, :count).by(1)
+      end
+  
+      it "should only recognize friends that are confirmed" do
+        @joe.friends.should_not include(@quentin)
+        @quentin.friends.should_not include(@joe)
+      end
+
+      it "should set the proper relationships" do
+        @quentin.friendship_requests.should_not include(@joe)
+        @joe.friendship_requests.should include(@quentin)
+        @quentin.friendships_to_accept.should include(@joe)
+        @joe.friendships_to_accept.should_not include(@quentin)
+      end
+  
+      it "should also work with convenience methods" do
+        @quentin.friendship_to_accept?(@joe).should be_true
+        @joe.friendship_requested?(@quentin).should be_true      
+      end
+  
+      it "should have to be confirmed" do
+        # confirm the request
+        @quentin.confirm_friendship_with(@joe)
+
+        # see if associations are correct
+        @quentin.friends.should include(@joe)
+        @joe.friends.should include(@quentin)
+    
+        @quentin.friendship_to_accept?(@joe).should be_false
+        @joe.friendship_requested?(@quentin).should be_false
+      end
+      
+      it "should not be added twice" do
+        lambda do
+          @joe.request_friendship(@quentin)
+          @joe.should have(1).friends
+          @quentin.should have(1).friends
+        end.should_not change(Friendship,:count)
+      end
+
+      it "should be able to have multiple friends" do
+        @joe.request_friendship(@aaron)
+        @joe.friendship_requested?(@aaron).should be_true
+        @aaron.friendship_to_accept?(@joe).should be_true
+      end
+  
+      it "should be able to delete friendships" do
+        lambda do
+          @quentin.end_friendship_with(@joe)
+        end.should change(SomeModule::Friendship,:count)
+    
+        @quentin.reload; @joe.reload
+    
+        @quentin.friends.should_not include(@joe)
+        @joe.friends.should_not include(@quentin)
+      end
+  
+    end
+    
   end
 end

data/spec/spec_helper.rb

@@ -23,16 +23,17 @@ ENV['LOG'] ||= "file"
 
 ADAPTERS = ENV["ADAPTERS"].split(' ')
 
-DRIVERS = { 
+DRIVERS = {
   :sqlite  => 'sqlite3::memory:',
-  :mysql    => 'mysql://datamapper:datamapper@localhost/dm_is_friendly_test',
-  :postgres => 'postgres://postgres:postgres@localhost/dm_is_friendly_test'
+  :mysql    => 'mysql://datamapper:datamapper@localhost/dm_plugin_test',
+  :postgres => 'postgres://datamapper:datamapper@localhost/dm_plugin_test'
 }
 
 def load_driver(name, default_uri)
   return false unless DRIVERS[name]
-  
+
   begin
+    # DataMapper::Logger.new('./spec/log/dm.log')
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] = DataMapper::Repository.adapters[name]
     true
@@ -49,16 +50,16 @@ module SpecAdapterHelper
         before(:all) do
           load_driver(adapter.to_sym, ::DRIVERS[adapter.to_sym])
         end
-        
+
         instance_eval(&block)
       end
     end
   end
-  
+
   def self.extended(base)
-    base.class_eval do      
+    base.class_eval do
       def log(msg)
-        DataMapper.logger.push("****** #{msg}")
+        DataMapper.logger.debug("****** #{msg}")
       end
     end
   end
@@ -66,10 +67,10 @@ module SpecAdapterHelper
 end
 
 RSpec.configure do |config|
-  
+
   config.extend( DataMapper::Spec::Adapters::Helpers)
   config.extend(SpecAdapterHelper)
-  
+
   config.after :all do
     DataMapper::Spec.cleanup_models
   end

metadata

@@ -1,190 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dm-is-friendly
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  version: 1.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - RipTheJacker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-07 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  name: activesupport
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  name: dm-core
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 2.12.0
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
   name: dm-aggregates
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
   name: dm-types
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :development
   prerelease: false
-  name: rspec
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: jeweler
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
   prerelease: false
-  name: dm-core
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  requirement: *id010
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: 
 email: kabari@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - LICENSE
 - README.markdown
 - Rakefile
@@ -193,40 +139,32 @@ files:
 - lib/dm-is-friendly/is/friendly.rb
 - spec/dm-is-friendly_spec.rb
 - spec/spec_helper.rb
-has_rdoc: yard
 homepage: http://github.com/RipTheJacker/dm-is-friendly
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -97200408363854928
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: DataMapper plugin that adds self-referential friendship functionality to your models.
-test_files: 
-- spec/dm-is-friendly_spec.rb
-- spec/spec_helper.rb
+summary: DataMapper plugin that adds self-referential friendship functionality to
+  your models.
+test_files: []