social_connections 0.0.16 → 0.0.17

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    social_connections (0.0.13)
+    social_connections (0.0.17)
 
 GEM
   remote: http://rubygems.org/
@@ -41,7 +41,17 @@ GEM
     factory_girl_rails (1.1.0)
       factory_girl (~> 2.0.0)
       railties (>= 3.0.0)
+    ffi (1.0.11)
+    guard (1.1.1)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rspec (1.0.0)
+      guard (>= 1.1)
     i18n (0.6.0)
+    listen (0.4.3)
+      rb-fchange (~> 0.0.5)
+      rb-fsevent (~> 0.9.1)
+      rb-inotify (~> 0.8.8)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -65,6 +75,11 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.9.2)
+    rb-fchange (0.0.5)
+      ffi
+    rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -95,6 +110,8 @@ DEPENDENCIES
   actionmailer
   activerecord
   factory_girl_rails
+  guard
+  guard-rspec
   i18n
   pry
   rspec

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', :cli => "--color", :version => 2, :all_on_start => true, :all_after_pass => true do
+  watch %r{^spec/.+_spec\.rb$}
+  watch(%r{^lib/.+\.rb$}) { "spec" }
+
+end

data/lib/social_connections/acts_as_connectable.rb

@@ -10,10 +10,12 @@ module SocialConnections
     # * :verbs - specify a list of constants recognized as verbs.
     #   If none given, :likes is the only default verb.
     def acts_as_connectable(options = {})
-      cattr_accessor :acts_as_connectable_options
-      send :acts_as_connectable_options=, options
+      @options = options
       send :include, InstanceMethods
     end
+    def acts_as_connectable_options
+      @options
+    end
   end
 
   module InstanceMethods
@@ -47,6 +49,10 @@ module SocialConnections
                              self.id, self.class.base_class.name, other.id, other.class.base_class.name).exists?
     end
 
+    def acts_as_connectable_options
+      self.class.acts_as_connectable_options
+    end
+
     def acts_as_connectable_verbs
       acts_as_connectable_options[:verbs] || [ :likes ]
     end
@@ -57,9 +63,17 @@ module SocialConnections
 
     def method_missing(name, *args)
       if acts_as_connectable_verbs.include? name
+
         verb = name
         object = args[0]
         options = args[1] || {}
+
+        # both the subject (us) and the object may have additional recipients,
+        # we add them here
+        options[:additional_recipients] ||= []
+        options[:additional_recipients].concat(additional_recipients)
+        options[:additional_recipients].concat(object.send(:additional_recipients)) if object.respond_to?( :additional_recipients, true )
+
         create_activity(verb, object, options)
       elsif acts_as_connectable_verb_questions.include? name
         verb = name[0..-2]
@@ -81,6 +95,13 @@ module SocialConnections
       SocialActivity.create_activities(self, verb, object, options)
     end
 
+    def additional_recipients
+      additional_recipients = acts_as_connectable_options[:additional_recipients]
+      return [] unless additional_recipients
+      return self.send(additional_recipients) if self.respond_to?(additional_recipients)
+      return additional_recipients
+    end
+
     def verbs
       acts_as_connectable_verbs
     end

data/lib/social_connections/version.rb

@@ -1,3 +1,3 @@
 module SocialConnections
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/run-tests.sh

@@ -1,6 +1,4 @@
 #!/bin/bash -ex
 
-# Idea is to run all automated tests from a single script
-
-rake test
-rspec spec -f d
+echo "Rather use 'bundle exec guard' instead of this script..."
+rspec spec --color

data/social_connections.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |s|
 #  s.test_files.reject! { |fn| fn.include? ".swp" }
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_development_dependency('rspec')
-  [ 'sqlite3', 'rspec-rails', 'turn', 'factory_girl_rails', 'activerecord', 'actionmailer', 'i18n', 'pry' ].each do |d|
+  [ 'rspec', 'sqlite3', 'rspec-rails', 'turn', 'factory_girl_rails', 'activerecord', 'actionmailer', 'i18n', 'pry', 'guard', 'guard-rspec' ].each do |d|
     s.add_development_dependency d
   end
 end

data/spec/social_activities_spec.rb

@@ -74,6 +74,40 @@ describe "Social Activities" do
     activities.select {|a| a.owner == @obj}.should_not be_empty # ... and one owned by the object
   end
 
+  describe "additional recipients" do
+
+    class ConnectableWithAdditionalRecipients < ActiveRecord::Base
+      acts_as_connectable :additional_recipients => :determine_additional_recipients
+
+      def initialize(params = {})
+        super(params)
+        @ar1 = Connectable.create(:name => "additional recipient 1")
+        @ar2 = Connectable.create(:name => "additional recipient 2")
+      end
+
+      def determine_additional_recipients
+        [ @ar1, @ar2 ]
+      end
+
+    end
+    before(:each) do
+      @c1 = ConnectableWithAdditionalRecipients.create(:name => "Anne")
+      @c2 = Connectable.create(:name => "Bob")
+    end
+    it "queries additional_recipients of the subject and sends them activities" do
+      activities = @c1.likes(@c2)
+      # both 'additional recipients' get an activity
+      activities.select{|a| a.owner == @c1.determine_additional_recipients[0] }.count.should eq(1)
+      activities.select{|a| a.owner == @c1.determine_additional_recipients[1] }.count.should eq(1)
+    end
+    it "queries additional_recipients of the object and sends activities" do
+      activities = @c2.likes(@c1)
+      # both 'additional recipients' get an activity
+      activities.select{|a| a.owner == @c1.determine_additional_recipients[0] }.count.should eq(1)
+      activities.select{|a| a.owner == @c1.determine_additional_recipients[1] }.count.should eq(1)
+    end
+  end
+
   it "create activities for those connected to the subject" do
     mary = Connectable.create(:name => 'Mary')
     mary.connect_to(@sub) # mary is now connected to Tim

data/test/schema.rb

@@ -32,4 +32,8 @@ ActiveRecord::Schema.define(:version => 0) do
     t.string :name
     t.string :email
   end
+  create_table :connectable_with_additional_recipients, :force => true do |t|
+    t.string :name
+    t.string :email
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_connections
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70190868020460 !ruby/object:Gem::Requirement
+  requirement: &70142545995920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190868020460
+  version_requirements: *70142545995920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70190868019140 !ruby/object:Gem::Requirement
+  requirement: &70142545995420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190868019140
+  version_requirements: *70142545995420
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70190868015740 !ruby/object:Gem::Requirement
+  requirement: &70142545994700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190868015740
+  version_requirements: *70142545994700
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70190868014500 !ruby/object:Gem::Requirement
+  requirement: &70142545993900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190868014500
+  version_requirements: *70142545993900
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70190859703320 !ruby/object:Gem::Requirement
+  requirement: &70142545992860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190859703320
+  version_requirements: *70142545992860
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70190859701520 !ruby/object:Gem::Requirement
+  requirement: &70142545992260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190859701520
+  version_requirements: *70142545992260
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70190859700520 !ruby/object:Gem::Requirement
+  requirement: &70142545991720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190859700520
+  version_requirements: *70142545991720
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70190859698900 !ruby/object:Gem::Requirement
+  requirement: &70142545991100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190859698900
+  version_requirements: *70142545991100
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70190859698160 !ruby/object:Gem::Requirement
+  requirement: &70142545990320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190859698160
+  version_requirements: *70142545990320
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70142545989700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70142545989700
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70142545989120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70142545989120
 description: The idea is to provide pluggable social connections, activities and a
   method to digest those activities (e.g. in daily emails).
 email:
@@ -122,6 +144,7 @@ files:
 - .yardopts
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - MIT-LICENSE
 - README.md
 - Rakefile