social_connections 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,14 +1,96 @@
 PATH
   remote: .
   specs:
-    social_connections (0.0.6)
+    social_connections (0.0.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.5)
+    ansi (1.3.0)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    factory_girl (2.0.5)
+    factory_girl_rails (1.1.0)
+      factory_girl (~> 2.0.0)
+      railties (>= 3.0.0)
+    i18n (0.6.0)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.2)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
+    sqlite3 (1.3.4)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    turn (0.8.2)
+      ansi (>= 1.2.2)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionmailer
+  activerecord
+  factory_girl_rails
+  i18n
+  rspec
+  rspec-rails
   social_connections!
+  sqlite3
+  turn

data/README.md

@@ -60,8 +60,16 @@ and
 
 	u.comments(b, :comment => 'awesome book!')
 
-. This creates activities for the user and the book. These activities can be
-queried:
+. This creates activities for the user and the book. Activities are _only_ created for
+those connected to the subject and/or object of the activity--in the example, user `u`
+is the subject and book `b` is the object. A user `v` can connect to user `u` by saying
+
+	v.connect_to(u)
+
+. If this is issued before invoking `likes` and `comments` as above, user `v` 
+receives 2 activities.
+
+These activities can be queried:
 
 	b.likes_by_count
 
@@ -72,7 +80,8 @@ Gives the number of users (or other 'connectables') that liked this book. Same f
 . For more examples, see the spec files.
 
 
-=== Controllers for Activities
+Controllers for Activities
+--------------------------
 
 Assuming that `current_user` gives you the currently logged in user, a controller
 responding to a 'like' button could look as follows:
@@ -93,7 +102,8 @@ The view (e.g. `app/views/books/show.html.erb`) may then contain the following '
 	<%= link_to('I like this', current_user_likes_book_path(@book) %>
 
 
-== How to run the Tests (in the gem itself, not in your Rails app)
+How to run the Tests (in the gem itself, not in your Rails app)
+--------------------
 
 Run test in ./test:
 

data/lib/app/models/mute_and_curious_guest.rb

@@ -0,0 +1,17 @@
+class MuteAndCuriousGuest < ActiveRecord::Base
+
+  acts_as_connectable :verbs => []
+
+  def self.activities
+    SocialConnections.aggregate(self.instance).activities
+  end
+
+  def self.instance
+    if MuteAndCuriousGuest.count == 0
+      MuteAndCuriousGuest.create
+    else
+      MuteAndCuriousGuest.first
+    end
+  end
+
+end

data/lib/app/models/social_activity.rb

@@ -20,21 +20,24 @@ class SocialActivity < ActiveRecord::Base
   def self.create_activities(subject, verb, object, options = {})
     # TODO: we may want to delay this
     activities = []
-    [ subject, object ].each do |owner| # one activity for the subject, and one for the object
+    [ subject, object ].uniq.each do |owner| # one activity for the subject, and one for the object
       activities << SocialActivity.create(:owner => owner,
                                           :subject => subject,
                                           :verb => verb,
                                           :target => object,
                                           :options_as_json => options.to_json)
     end
-    [ subject, object ].each do |who| # for both subject and object...
-      who.incoming_social_connections.each do |connection|
-        activities << SocialActivity.create(:owner => connection.source, # ... an activity for each one connected
-                                            :subject => subject,
-                                            :verb => verb,
-                                            :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/generators/social_connections/install/install_generator.rb

@@ -1,7 +1,9 @@
 require 'rails/generators/migration'
 
 module SocialConnections
+
   module Generators
+    puts "in 'Generators' module"
     class InstallGenerator < ::Rails::Generators::Base
       include Rails::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
@@ -18,6 +20,7 @@ module SocialConnections
 
       def copy_migrations
         migration_template "create_social_connections_tables.rb", "db/migrate/create_social_connections.rb"
+        migration_template "create_mute_and_curious_guests.rb", "db/migrate/create_mute_and_curious_guests.rb"
       end
 
     end

data/lib/generators/social_connections/install/templates/create_mute_and_curious_guests.rb

@@ -0,0 +1,11 @@
+class CreateMuteAndCuriousGuests < ActiveRecord::Migration
+  def self.up
+    create_table :mute_and_curious_guests do |t|
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :mute_and_curious_guests
+  end
+end

data/lib/social_connections/version.rb

@@ -1,3 +1,3 @@
 module SocialConnections
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/tasks/social_connections.rake

@@ -6,7 +6,7 @@ namespace :db do
     task :social_connections => :environment do
       ActiveRecord::Migration.verbose = true
       ActiveRecord::Migrator.migrate(File.join(File.dirname(__FILE__), '../db/migrate/'), ENV['VERSION'] ? ENV['VERSION'].to_i : nil)
-      ActiveSupport::Deprecation.warn "Migration via rake is deprecated, use 'rails generate social_connections:install' instead." # mhm, this doesn't display when migrating...
+      warn "Migration via rake is deprecated, use 'rails generate social_connections:install' instead."
       Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
   end

data/social_connections.gemspec

@@ -19,4 +19,8 @@ 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|
+    s.add_development_dependency d
+  end
 end

data/spec/activities_aggregator_spec.rb

@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/../test/test_helper'
 describe "Aggregation" do
 
   before(:each) do
-    load_schema
     @tim = Connectable.create(:name => 'Tim', :email => 'tim@test.com')
     @tom = Connectable.create(:name => 'Tom', :email => 'tom@test.com')
   end
@@ -17,6 +16,16 @@ describe "Aggregation" do
     feed_tom.activities.count.should be_>(1)
   end
 
+  it "aggregates activities for 'passive' users" do
+    stalker = Connectable.create(:name => 'Tony', :email => 'tony@test.com')
+    stalker.connect_to(@tom)
+    aggregate = SocialConnections.aggregate(stalker)
+    aggregate.activities.count.should eq(0)
+    @tim.comments(@tom, :comment => 'Tony is listening...')
+    aggregate = SocialConnections.aggregate(stalker)
+    aggregate.activities.count.should eq(1)
+  end
+
   describe "When Tim and Tom interacted" do
 
     before(:each) do

data/spec/mute_and_curious_guest_spec.rb

@@ -0,0 +1,17 @@
+
+describe MuteAndCuriousGuest do
+  it "has a single instance" do
+    MuteAndCuriousGuest.instance.should_not be(nil)
+  end
+  it "can connect to things" do
+    tim = Connectable.new(:name => 'Tim')
+    MuteAndCuriousGuest.instance.connect_to(tim)
+  end
+  it "receives activities when something happens with a connected thing" do
+    tim = Connectable.new(:name => 'Tim')
+    tom = Connectable.new(:name => 'Tom')
+    MuteAndCuriousGuest.instance.connect_to(tim)
+    tim.comments(tom)
+    SocialConnections.aggregate(MuteAndCuriousGuest.instance).activities.count.should be(1)
+  end
+end

data/spec/social_activities_spec.rb

@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/../test/test_helper'
 describe "Social Activities" do
 
   before(:each) do
-    load_schema
     @sub = Connectable.create(:name => 'Tim')
     @obj = Connectable.create(:name => 'Tom')
   end
@@ -39,6 +38,25 @@ describe "Social Activities" do
 
   end
 
+  describe "when connected to both object and subject" do
+    before(:each) do
+      @stalker = Connectable.create(:name => 'Steve, the Stalker')
+      @stalker.connect_to(@sub)
+      @stalker.connect_to(@obj)
+    end
+    it "creates one activity, not two" do
+      activities = @sub.likes @obj
+      activities.select { |a| a.owner == @stalker }.count.should eql(1)
+    end
+    describe "when subject and object are identical" do
+      it "creates one activity, not two" do
+        activities = @sub.likes @sub
+        activities.select {|a| a.owner == @stalker}.count.should eql(1)
+      end
+    end
+  end
+
+
   it "allow options on activities (e.g. a comment)" do
     activities = @sub.comments(@obj, :comment => 'This is a silly comment on Tom')
     activities[0].options['comment'].should eql('This is a silly comment on Tom')

data/test/schema.rb

@@ -1,4 +1,11 @@
 ActiveRecord::Schema.define(:version => 0) do
+
+  # TODO: very ugly and messy: Maybe at the beginning of a spec run
+  # drop the database and migrate-up via the template files?
+  require File.dirname(__FILE__) + '/../lib/generators/social_connections/install/templates/create_mute_and_curious_guests.rb'
+  CreateMuteAndCuriousGuests.migrate(:down)
+  CreateMuteAndCuriousGuests.migrate(:up)
+
   # TODO: not DRY: Same in lib/generators/social_connections/install/templates/
   create_table :social_connections, :force => true do |t|
     t.integer :source_id

data/test/test_helper.rb

@@ -12,7 +12,7 @@ require 'action_mailer'
 require File.dirname(__FILE__) + '/../init'
 
 class Connectable < ActiveRecord::Base
-  acts_as_connectable :verbs => [ :likes, :recommends, :comments ]
+  acts_as_connectable :verbs => [ :likes, :recommends, :comments, :follows ]
   def to_s
     "Connectable '#{self.name}'"
   end
@@ -58,6 +58,8 @@ def load_schema
 
 end
 
+load_schema
+
 ActionMailer::Base.delivery_method = :file
 ActionMailer::Base.file_settings = { :location => 'tmp/mails' }
 ActionMailer::Base.raise_delivery_errors = true

metadata

@@ -1,28 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: social_connections
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease: 
-  version: 0.0.7
 platform: ruby
-authors: 
+authors:
 - Chris
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-16 00:00:00 Z
-dependencies: []
-
-description: The idea is to provide pluggable social connections, activities and a method to digest those activities (e.g. in daily emails).
-email: 
+date: 2011-08-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2157760460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157760460
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2157759880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157759880
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &2152015320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152015320
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: &2152014920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152014920
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: &2152014520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152014520
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2152014120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152014120
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: &2152013720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152013720
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2152013320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152013320
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &2152012920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152012920
+description: The idea is to provide pluggable social connections, activities and a
+  method to digest those activities (e.g. in daily emails).
+email:
 - christian.oloff+gem@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .yardopts
 - Gemfile
@@ -34,11 +129,13 @@ files:
 - init.rb
 - install.rb
 - lib/app/mailers/digest_mailer.rb
+- lib/app/models/mute_and_curious_guest.rb
 - lib/app/models/social_activity.rb
 - lib/app/models/social_connection.rb
 - lib/app/views/digest_mailer/digest.html.erb
 - lib/db/migrate/20110516181115_create_social_connections.rb
 - lib/generators/social_connections/install/install_generator.rb
+- lib/generators/social_connections/install/templates/create_mute_and_curious_guests.rb
 - lib/generators/social_connections/install/templates/create_social_connections_tables.rb
 - lib/social_connections.rb
 - lib/social_connections/acts_as_connectable.rb
@@ -48,6 +145,7 @@ files:
 - run-tests.sh
 - social_connections.gemspec
 - spec/activities_aggregator_spec.rb
+- spec/mute_and_curious_guest_spec.rb
 - spec/social_activities_spec.rb
 - test/activities_test.rb
 - test/acts_as_connectable_test.rb
@@ -58,33 +156,31 @@ files:
 - uninstall.rb
 homepage: https://sites.google.com/site/socialconnections7/
 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 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: social_connections
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Social connections for ActiveRecord.
-test_files: 
+test_files:
 - spec/activities_aggregator_spec.rb
+- spec/mute_and_curious_guest_spec.rb
 - spec/social_activities_spec.rb
 - test/activities_test.rb
 - test/acts_as_connectable_test.rb