social_connections 0.0.17 → 0.0.18

data/lib/app/models/social_activity.rb

@@ -25,10 +25,12 @@ class SocialActivity < ActiveRecord::Base
                                          target.id, target.class.base_class.name)}
 
   def self.create_activities(subject, verb, object, options = {})
-    # TODO: we may want to delay this
     activities = []
     owners = [ subject, object ]
     owners.concat(options[:additional_recipients]) if options[:additional_recipients]
+    owners.concat(subject.incoming_social_connections.collect {|i| i.source })
+    owners.concat(object.incoming_social_connections.collect {|i| i.source })
+
     owners.uniq.each do |owner|
       activities << SocialActivity.create(:owner => owner,
                                           :subject => subject,
@@ -36,18 +38,6 @@ class SocialActivity < ActiveRecord::Base
                                           :target => object,
                                           :options_as_json => options.to_json)
     end
-    # TODO: ugly and hard to read code below, refactor!
-    who = []
-    [subject, object].uniq.each do |w|
-      who.concat(w.incoming_social_connections)
-    end
-    who.collect{|w| w.source}.uniq.each do |connection|
-      activities << SocialActivity.create(:owner => connection, # ... an activity for each one connected
-                                          :subject => subject,
-                                          :verb => verb,
-                                          :target => object,
-                                          :options_as_json => options.to_json)
-    end
     activities
   end
 

data/lib/social_connections/version.rb

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

data/spec/social_activities_spec.rb

@@ -106,6 +106,12 @@ describe "Social Activities" do
       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 "ensures that only one activity is created for an 'owner' (?), even if contained in social connections *and* additional recipients list" do
+      @c1.determine_additional_recipients[0].connect_to(@c2)
+      @c1.determine_additional_recipients[0].connect_to(@c1)
+      activities = @c1.likes(@c2)
+      activities.select{|a| a.owner == @c1.determine_additional_recipients[0] }.count.should eq(1)
+    end
   end
 
   it "create activities for those connected to the subject" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_connections
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70142545995920 !ruby/object:Gem::Requirement
+  requirement: &70183012366480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545995920
+  version_requirements: *70183012366480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70142545995420 !ruby/object:Gem::Requirement
+  requirement: &70183012365980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545995420
+  version_requirements: *70183012365980
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70142545994700 !ruby/object:Gem::Requirement
+  requirement: &70183012365260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545994700
+  version_requirements: *70183012365260
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70142545993900 !ruby/object:Gem::Requirement
+  requirement: &70183012364460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545993900
+  version_requirements: *70183012364460
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70142545992860 !ruby/object:Gem::Requirement
+  requirement: &70183012363420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545992860
+  version_requirements: *70183012363420
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70142545992260 !ruby/object:Gem::Requirement
+  requirement: &70183012362820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545992260
+  version_requirements: *70183012362820
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70142545991720 !ruby/object:Gem::Requirement
+  requirement: &70183012362280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545991720
+  version_requirements: *70183012362280
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70142545991100 !ruby/object:Gem::Requirement
+  requirement: &70183012361660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545991100
+  version_requirements: *70183012361660
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70142545990320 !ruby/object:Gem::Requirement
+  requirement: &70183012360880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545990320
+  version_requirements: *70183012360880
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70142545989700 !ruby/object:Gem::Requirement
+  requirement: &70183012360260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545989700
+  version_requirements: *70183012360260
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70142545989120 !ruby/object:Gem::Requirement
+  requirement: &70183012359680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142545989120
+  version_requirements: *70183012359680
 description: The idea is to provide pluggable social connections, activities and a
   method to digest those activities (e.g. in daily emails).
 email: