social_stream 0.0.4 → 0.0.5

data/.gitignore

@@ -0,0 +1 @@
+pkg/*gem

data/.yardopts

@@ -0,0 +1,2 @@
+lib/**/*.rb
+app/**/*.rb

data/Gemfile

@@ -8,9 +8,8 @@ if RUBY_VERSION < '1.9'
   gem "ruby-debug", ">= 0.10.3"
 end
 
-gem 'atd-ancestry', :require => 'ancestry'
-gem 'devise'
-gem 'inherited_resources'
+gemspec
+
 gem 'cancan'
 
 gem "rspec-rails", ">= 2.0.0.beta"

data/Gemfile.lock

@@ -1,3 +1,13 @@
+PATH
+  remote: .
+  specs:
+    social_stream (0.0.4)
+      atd-ancestry (~> 1.3.0)
+      devise (~> 1.1.3)
+      inherited_resources (~> 1.1.2)
+      paperclip (~> 2.3.4)
+      stringex (~> 1.2.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -67,6 +77,9 @@ GEM
       treetop (>= 1.4.5)
     mime-types (1.16)
     nokogiri (1.4.3.1)
+    paperclip (2.3.5)
+      activerecord
+      activesupport
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -112,6 +125,7 @@ GEM
       json_pure
       rubyzip
     sqlite3-ruby (1.3.1)
+    stringex (1.2.0)
     thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
@@ -123,13 +137,16 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  atd-ancestry
+  atd-ancestry (~> 1.3.0)
   cancan
   capybara (>= 0.3.9)
-  devise
+  devise (~> 1.1.3)
   factory_girl
-  inherited_resources
+  inherited_resources (~> 1.1.2)
+  paperclip (~> 2.3.4)
   rails (= 3.0.0)
   rspec-rails (>= 2.0.0.beta)
   ruby-debug (>= 0.10.3)
+  social_stream!
   sqlite3-ruby
+  stringex (~> 1.2.0)

data/README.rdoc

@@ -37,9 +37,8 @@ Then, execute:
 This will generate the following:
 * A migration providing the database schema
 * An initializer configuration file for Social Stream.
-* A database seeds file for defining Social Stream relations. You must add:
-    SocialStream.seed!
-  to your db/seeds.rb
+* A database seeds file for defining Social Stream relations, along with an entry
+in db/seeds.rb to load it.
 * A devise:install generation for authentication support
 
 == Actors and Activity Objects

data/Rakefile

@@ -1,11 +1,14 @@
 # encoding: UTF-8
 require 'rake'
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
+
+require 'rubygems'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
+require 'bundler'
+
 require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'version')
 
 
@@ -23,22 +26,16 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb', 'app/**/*.rb')
 end
 
-spec = Gem::Specification.new do |s|
-  s.name = "social_stream"
-  s.version = SocialStream::VERSION.dup
-  s.summary = "Social networking features and activity streams."
-  s.description = "Ruby on Rails plug-in supporting social networking features and activity streams."
-  s.authors = ['Antonio Tapiador', 'Diego Carrera']
-  s.files =  FileList["[A-Z]*", "{app,config,lib}/**/*"]
-  s.add_dependency('atd-ancestry', '~> 1.3.0')
-  s.add_dependency('devise', '~> 1.1.3')
-  s.add_dependency('inherited_resources', '~> 1.1.2')
+class Bundler::GemHelper
+  def install_gem
+    built_gem_path = build_gem
+    out, err, code = sh_with_code("sudo gem install #{built_gem_path} --no-rdoc --no-ri")
+    if err[/ERROR/]
+      Bundler.ui.error err
+    else
+      Bundler.ui.confirm "#{name} (#{version}) installed"
+    end
+  end
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
-end
-
-desc "Install the gem #{spec.name}-#{spec.version}.gem"
-task :install => :gem do
-  system("sudo gem install pkg/#{spec.name}-#{spec.version}.gem --no-ri --no-rdoc")
-end
+Bundler::GemHelper.install_tasks

data/app/controllers/groups_controller.rb

@@ -0,0 +1,9 @@
+class GroupsController < InheritedResources::Base
+  protected
+
+  # Overwrite resource method to support permalink
+  # See InheritedResources::BaseHelpers#resource
+  def resource
+    @group ||= end_of_association_chain.find_by_permalink!(params[:id])
+  end
+end

data/app/controllers/likes_controller.rb

@@ -0,0 +1,47 @@
+class LikesController < ApplicationController
+  # Ensure the suitable tie exists
+  before_filter :tie!, :only => :create
+
+  # POST /activities/1/like.js
+  def create
+    @like = activity!.children.new :verb => "like"
+		
+    respond_to do |format|
+      if @like.save
+        tie!.activities << @like
+        format.js
+      else
+        format.js
+      end
+    end
+  end
+
+  def destroy
+    if (@like = activity!.liked_by(current_user).first)
+      @like.destroy
+    end
+
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  private
+
+  def activity
+    @activity ||= Activity.find(params[:activity_id])
+  end
+
+  def activity!
+    activity || raise(ActiveRecord::RecordNotFound)
+  end
+
+  def tie
+    @tie ||= current_user.sent_ties(:receiver => activity!.receiver,
+                                    :relation => activity!.relation).first
+  end
+
+  def tie!
+    tie || raise(ActiveRecord::RecordNotFound)
+  end
+end

data/app/controllers/ties_controller.rb

@@ -1,73 +1,3 @@
-class TiesController < ApplicationController
-  before_filter :actor!
-
-  # GET /ties
-  # GET /ties.xml
-  def index
-    @ties = actor.sent_ties.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @ties }
-    end
-  end
-
-  # GET /ties/1
-  # GET /ties/1.xml
-  def show
-    @tie = actor.sent_ties.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.xml  { render :xml => @tie }
-    end
-  end
-
-  # GET /ties/new
-  # GET /ties/new.xml
-  def new
-    @tie = actor!.sent_ties.build(params[:tie])
-
-    respond_to do |format|
-      format.html {render :layout => false  }
-      #format.xml  { render :xml => @tie }
-      format.js {render :partial => "ties/new"}
-    end
-  end
-
-  # POST /ties
-  # POST /ties.xml
-  def create
-    @tie = Tie.new(params[:tie])
-
-    respond_to do |format|
-      if @tie.save
-        format.html { redirect_to(@tie, :notice => 'Tie was successfully created.') }
-        format.xml  { render :xml => @tie, :status => :created, :location => @tie }
-        format.js
-      else
-        format.html { render :partial => "new" }
-        format.xml  { render :xml => @tie.errors, :status => :unprocessable_entity }
-        format.js
-      end
-    end
-  end
-
-  # DELETE /ties/1
-  # DELETE /ties/1.xml
-  def destroy
-    @tie = Tie.find(params[:id])
-    @tie.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(ties_url) }
-      format.xml  { head :ok }
-    end
-  end
-
-  private
-  
-  def actor!
-    current_user
-  end
+class TiesController < InheritedResources::Base
+  respond_to :html, :xml, :js
 end

data/app/helpers/activities_helper.rb

@@ -1,6 +1,10 @@
 module ActivitiesHelper
 
-  def like_activity(activity)
+  # Link to 'like' or 'unlike' depending on the like status of the activity to current_user
+  # 
+  # @param [Activity]
+  # @return [String]
+  def link_like(activity)
     if (activity.liked_by?(current_user))
       link_to t('activity.unlike'), activity_like_path(activity), :method => :delete, :remote => true
     else

data/app/helpers/ties_helper.rb

@@ -1,18 +1,29 @@
 module TiesHelper
-  def suggestion_brief(subject)
+  def tie_brief(tie)
     "18 contacts in common"
   end
 
-  def suggestion_link(subject, relations)
-    relation = relations[subject.class.to_s.underscore.to_sym] # relation = relations[:user]
+  def tie_link(tie)
+    # FIXME: tie name
+    if tie.relation.granted
+      # There is granted relation, so another user must confirmate it
+      # We need to render ties#new with a message
+      link_to t("#{ tie.relation.name }.new"),
+              new_tie_path("tie[sender_id]" => tie.sender.id,
+                           "tie[receiver_id]" => tie.receiver.id,
+                           "tie[relation_name]" => tie.relation.name),
+              :title => t("#{ tie.relation.name }.confirm_new",
+                          :name => tie.receiver_subject.name),
+              :remote => true
 
-    raise "Relation not provided for #{ subject.class.to_s.underscore }" if relation.blank?
+    else
+      # Tie can be established at once.
+      render :partial => 'ties/form',
+                         :locals => { :tie => tie }
+    end
+  end
 
-    link_to t("tie.suggestion.#{ relation }.new"),
-            new_tie_path("tie[sender_id]" => current_user.actor.id,
-                         "tie[receiver_id]" => subject.actor.id,
-                         "tie[relation_name]" => relation),
-            :class => 'boxy',
-            :title => t("tie.suggestion.#{ relation }.confirm_new", :name => subject.name)
+  def link_follow_state
+      link_to("unfollow", home_path)
   end
 end

data/app/models/actor.rb

@@ -2,16 +2,32 @@
 class Actor < ActiveRecord::Base
   include SocialStream::Models::Supertype
 
+  validates_presence_of :name, :subject_type
+
+  acts_as_url :name, :url_attribute => :permalink
+
+  has_attached_file :logo,
+                    :styles => { :small => "30x30" },
+                    :default_url => "/:attachment/:style/:subtype_class.png"
+
   has_many :sent_ties,
            :class_name => "Tie",
            :foreign_key => 'sender_id',
            :dependent => :destroy
 
+  has_many :senders,
+           :through => :received_ties,
+           :uniq => true
+
   has_many :received_ties,
            :class_name => "Tie",
            :foreign_key => 'receiver_id',
            :dependent => :destroy
 
+  has_many :receivers,
+           :through => :sent_ties,
+           :uniq => true
+
   # The subject instance for this actor
   def subject
     subtype_instance ||
@@ -81,20 +97,39 @@ class Actor < ActiveRecord::Base
 
   # This is an scaffold for a recomendations engine
   #
-  # By now, it returns another subject without any current relation
+  SuggestedRelations = {
+    'User'  => 'friend_request',
+    'Group' => 'follower'
+  }
+
+  # Make n suggestions
+  # TODO: make more
+  def suggestions(n)
+    n.times.map{ |m| suggestion }
+  end
+
+  # By now, it returns a tie suggesting a relation from SuggestedRelations
+  # to another subject without any current relation
   #
   # Options::
   # * type: the class of the recommended subject
+  #
+  # @return [Tie]
   def suggestion(options = {})
-    type = options[:type]
+    type = options[:type].present? ?
+      options[:type].to_s.classify :
+      SuggestedRelations.keys[rand(SuggestedRelations.size)]
 
-    type = type.present? ?
-      type.to_s.classify.constantize :
-      random_receiving_subject_type
+    type_class = type.constantize
     
-    candidates = type.all - receiver_subjects(type)
+    # Candidates are all the instance of "type" minus all the subjects
+    # that are receiving any tie from this actor
+    candidates = type_class.all - receiver_subjects(type)
+
+    candidate = candidates[rand(candidates.size)]
 
-    candidates[rand(candidates.size)]
+    sent_ties.build :receiver_id => candidate.actor_id,
+                    :relation => Relation.mode(subject_type, type).find_by_name(SuggestedRelations[type])
   end
 
   # All the ties this actor has with subject that support activities
@@ -102,17 +137,21 @@ class Actor < ActiveRecord::Base
     sent_ties.received_by(subject).active
   end
 
+  def pending_ties
+    #TODO: optimize by SQL
+    @pending_ties ||=
+      received_ties.pending.
+        select{ |t| ! receivers.include?(t.sender) }.
+        map{ |u| Tie.new :sender_id => u.receiver_id,
+                         :receiver_id => u.sender_id,
+                         :relation_id => u.relation.granted_id
+        }
+  end
+
   # The set of activities in the wall of this actor
   # TODO: authorization
   def wall
     Activity.wall ties
   end
-
-  private
-
-  def random_receiving_subject_type
-    type_candidates = subject.class.receiving_subject_classes
-    type_candidates[rand(type_candidates.size)]
-  end
 end
 

data/app/models/group.rb

@@ -0,0 +1,13 @@
+class Group < ActiveRecord::Base
+  validates_presence_of :name
+
+  scope :alphabetic, includes(:actor).order('actors.name')
+
+  def logo
+    "group.png"
+  end
+
+  def followers
+    sender_subjects(:user, :relations => 'follower')
+  end
+end