social_stream 0.0.2 → 0.0.3

data/Gemfile

@@ -10,6 +10,7 @@ end
 
 gem 'atd-ancestry', :require => 'ancestry'
 gem 'devise'
+gem 'inherited_resources'
 gem 'cancan'
 
 gem "rspec-rails", ">= 2.0.0.beta"

data/Gemfile.lock

@@ -54,7 +54,11 @@ GEM
     factory_girl (1.3.2)
     ffi (0.6.3)
       rake (>= 0.8.7)
+    has_scope (0.5.0)
     i18n (0.4.1)
+    inherited_resources (1.1.2)
+      has_scope (~> 0.5.0)
+      responders (~> 0.6.0)
     json_pure (1.4.6)
     linecache (0.43)
     mail (2.2.7)
@@ -83,16 +87,17 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
+    responders (0.6.2)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
     rspec-rails (2.0.1)
       rspec (~> 2.0.0)
     ruby-debug (0.10.3)
@@ -123,6 +128,7 @@ DEPENDENCIES
   capybara (>= 0.3.9)
   devise
   factory_girl
+  inherited_resources
   rails (= 3.0.0)
   rspec-rails (>= 2.0.0.beta)
   ruby-debug (>= 0.10.3)

data/Rakefile

@@ -32,6 +32,7 @@ spec = Gem::Specification.new do |s|
   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')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/app/controllers/activities_controller.rb

@@ -0,0 +1,2 @@
+class ActivitiesController < ApplicationController
+end

data/app/controllers/posts_controller.rb

@@ -0,0 +1,9 @@
+class PostsController < InheritedResources::Base
+  respond_to :html, :xml, :js
+
+  def destroy
+    @post_activity = resource.post_activity
+
+    destroy!
+  end
+end

data/app/controllers/ties_controller.rb

@@ -0,0 +1,73 @@
+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
+end

data/app/helpers/ties_helper.rb

@@ -0,0 +1,18 @@
+module TiesHelper
+  def suggestion_brief(subject)
+    "18 contacts in common"
+  end
+
+  def suggestion_link(subject, relations)
+    relation = relations[subject.class.to_s.underscore.to_sym] # relation = relations[:user]
+
+    raise "Relation not provided for #{ subject.class.to_s.underscore }" if relation.blank?
+
+    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)
+  end
+end

data/app/models/activity_verb.rb

@@ -6,9 +6,13 @@ class ActivityVerb < ActiveRecord::Base
 
   has_many :activities
 
+  scope :verb_name, lambda{ |n|
+    where(:name => n)
+  }
+
   class << self
     def [] name
-      find_by_name(name)
+      verb_name(name).first
     end
   end
 end

data/app/models/actor.rb

@@ -23,22 +23,57 @@ class Actor < ActiveRecord::Base
     Tie.sent_or_received_by(self)
   end
 
-  # All the subject actors of class type that have at least one tie
-  # with this actor
+  # All the subject actors of class subject_type that send at least one tie
+  # to this actor
   #
   # Options::
   # * relations: Restrict the relations of considered ties
-  def contacts(type, options = {})
-    type_class = type.to_s.classify.constantize
+  # * include_self: False by default, don't include this actor as subject even they
+  # have ties with themselves.
+  def sender_subjects(subject_type, options = {})
+    # FIXME: DRY!
+    subject_class = subject_type.to_s.classify.constantize
 
-    cs = type_class.
-           select("DISTINCT #{ type_class.quoted_table_name }.*").
+    cs = subject_class.
+           select("DISTINCT #{ subject_class.quoted_table_name }.*").
+           with_sent_ties &
+           Tie.received_by(self)
+
+    if options[:include_self].blank?
+      cs = cs.where("#{ self.class.quoted_table_name }.id != ?", self.id)
+    end
+
+    if options[:relations].present?
+      cs &=
+        Tie.related_by(Tie.Relation(options[:relations], :mode => [ subject_class, self.subject.class ]))
+    end
+
+    cs
+  end
+
+  # All the subject actors of class subject_type that receive at least one tie
+  # from this actor
+  #
+  # Options::
+  # * relations: Restrict the relations of considered ties
+  # * include_self: False by default, don't include this actor as subject even they
+  # have ties with themselves.
+  def receiver_subjects(subject_type, options = {})
+    # FIXME: DRY!
+    subject_class = subject_type.to_s.classify.constantize
+
+    cs = subject_class.
+           select("DISTINCT #{ subject_class.quoted_table_name }.*").
            with_received_ties &
            Tie.sent_by(self)
 
+    if options[:include_self].blank?
+      cs = cs.where("#{ self.class.quoted_table_name }.id != ?", self.id)
+    end
+
     if options[:relations].present?
       cs &=
-        Tie.related_by(Tie.Relation(options[:relations], :mode => [ subject.class, type_class ]))
+        Tie.related_by(Tie.Relation(options[:relations], :mode => [ subject.class, subject_class ]))
     end
 
     cs
@@ -46,9 +81,18 @@ class Actor < ActiveRecord::Base
 
   # This is an scaffold for a recomendations engine
   #
-  # By now, it returns another actor without any current relation
-  def suggestion(type = subject.class)
-    candidates = type.to_s.classify.constantize.all - contacts(type)
+  # By now, it returns another subject without any current relation
+  #
+  # Options::
+  # * type: the class of the recommended subject
+  def suggestion(options = {})
+    type = options[:type]
+
+    type = type.present? ?
+      type.to_s.classify.constantize :
+      random_receiving_subject_type
+    
+    candidates = type.all - receiver_subjects(type)
 
     candidates[rand(candidates.size)]
   end
@@ -58,5 +102,12 @@ class Actor < ActiveRecord::Base
   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/post.rb

@@ -0,0 +1,3 @@
+class Post < ActiveRecord::Base
+  validates_presence_of :text
+end

data/app/models/tie.rb

@@ -43,6 +43,8 @@ class Tie < ActiveRecord::Base
 
   has_many :activities
 
+  scope :recent, order("#{ quoted_table_name }.created_at DESC")
+
   scope :sent_by, lambda { |a|
     where(:sender_id => Actor_id(a))
   }

data/app/views/activities/_jquery.html.erb

@@ -50,3 +50,5 @@ $(".to_comment").livequery("blur", function(){
   $(this).parents(".activity_content").find(".input_new_comments").blur();
 	return false;
 });
+
+$(".boxy").boxy();

data/app/views/posts/_post.html.erb

@@ -0,0 +1,3 @@
+<%= div_for post, :class => 'content_size' do %>
+  <%= post.text %>
+<% end %>

data/app/views/posts/create.js.erb

@@ -0,0 +1,5 @@
+//set a new value to input field with javascript
+$("#input_activities").val("<%= t('activity.input') %>");
+//Display the new post
+$("#wall").prepend("<%= escape_javascript(render @post.post_activity) %>");
+$("#activities_share_btn").hide();

data/app/views/posts/destroy.js.erb

@@ -0,0 +1,2 @@
+$("#<%= dom_id(@post_activity) %>").hide();
+

data/app/views/ties/_pending.html.erb

@@ -1,13 +1,13 @@
-<% if actor.ties.pending.any? %>
+<% if current_user.received_ties.pending.any? %>
 <div class="middle_box">
   <div class="middle_box_header">
     <%= image_tag('notifications.png', :class => "middle_box_picture_icon") %>
     <div class="middle_box_text_header"><%= t 'tie.pending.other' %></div>
     <div class="title_righ">
-      <a href="#"><%= t 'tie.pending.see_all' %></a>
+      <a href="#"><%= t 'tie.pending.all' %></a>
     </div>
   </div>
-  <% actor.ties.pending.each do |tie| %>
+  <% current_user.received_ties.pending.each do |tie| %>
     <div class="middle_box_content">
       <div class="actor_logo">
         <%= link_to(image_tag(tie.sender_subject.logo, :size => "55x40"),

data/app/views/ties/_suggestion.html.erb

@@ -0,0 +1,20 @@
+<% if (subject = current_user.suggestion).present? %>
+  <div id="suggestion_<%= dom_id(subject) %>" class="suggestion">
+    <div class="suggestion_actor_logo">
+      <%= link_to(image_tag(subject.logo, :size =>"30x30"), subject) %>
+    </div>
+    <div class="suggestion_content">
+        <div class="suggestion_name">
+          <%= link_to(subject.name, subject) %>
+        </div>
+        <div class="suggestion_brief">
+            <%= suggestion_brief(subject) %>
+        </div>
+        <div class="suggestion_link">
+          <%= suggestion_link(subject, :user  => 'friend_request',
+                                       :space => 'follower') %>
+        </div>
+    </div>
+  </div>
+  <% end %>
+

data/app/views/ties/_suggestions.html.erb

@@ -0,0 +1,12 @@
+<div class="suggestions_header">
+    <%= image_tag('notifications.png', :class => "suggestion_icon") %>
+    <div class="suggestion_text_header">
+        <%=t('tie.suggestion.one') %>
+    </div>
+</div>
+<div class="suggestions">
+  <% 2.times do %>
+    <%= render :partial => 'ties/suggestion' %>      
+  <% end %>
+</div>
+

data/config/locales/en.yml

@@ -14,16 +14,25 @@ en:
     one: "Home"
   location:
     message: "You are here > %{location}"
+  message: "Message"
   tie:
     pending:
       other: Pending requests
-      see_all: See all
+      all: "All"
+    suggestion:
+      one: Suggestion
+      other: Suggestions
+      friend_request:
+        new: "+ Add as friend"
+        confirm_new: "Do you want to add %{name} as friend?"
+      follower:
+        new: "+ Follow"
+        confirm_new: "Do you want to follow %{name}?"
+      all: All
   time:
     ago: "%{time} ago"
   days: Days
   delete:
     confirm: Delete %{element}}?
   socialstream: "SocialStream"
-  ask:
-    add_friend: "¿Add %{name} as friend?"
   all_rights_reserved: All rights reserved

data/lib/generators/social_stream/templates/initializer.rb

@@ -8,10 +8,10 @@ SocialStream.setup do |config|
   # Others available are:
   # :token_authenticatable, :confirmable, :lockable, :timeoutable, :validatable
   # config.devise_modules :database_authenticatable, :registerable,
-                        :recoverable, :rememberable, :trackable
+  #                       :recoverable, :rememberable, :trackable
 
   # Type of activities managed by actors
   # Remember you must add an "activity_object_id" foreign key column to your migration!
   #
-  # config.activity_objects = []
+  # config.activity_objects = [ :post ]
 end

data/lib/generators/social_stream/templates/migration.rb

@@ -56,6 +56,15 @@ class CreateSocialStream < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
+    create_table "posts", :force => true do |t|
+      t.integer  "activity_object_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.text     "text"
+    end
+
+    add_index "posts", ["activity_object_id"], :name => "fk_post_object"
+
     create_table "relation_permissions", :force => true do |t|
       t.integer  "relation_id"
       t.integer  "permission_id"
@@ -101,6 +110,7 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer  "relation_id"
       t.datetime "created_at"
       t.datetime "updated_at"
+      t.text     "message"
     end
 
     add_index "ties", ["receiver_id"], :name => "fk_tie_receiver"

data/lib/social_stream.rb

@@ -16,7 +16,7 @@ module SocialStream
                        :rememberable, :trackable ]
 
   mattr_accessor :activity_objects
-  @@activity_objects = []
+  @@activity_objects = [ :post ]
 
   class << self
     def setup

data/lib/social_stream/models/activity_object.rb

@@ -25,8 +25,18 @@ module SocialStream
       end
 
       module InstanceMethods
+        # All the activities with this object
         def activities
-          activity_object_activities.includes(:activity).map(&:activity).uniq
+          Activity.
+            includes(:activity_objects => self.class.to_s.underscore).
+            where("#{ self.class.quoted_table_name }.id" => self.id)
+        end
+
+        # The activity in which this object was posted
+        #
+        # FIXME: Currently it only supports direct objects
+        def post_activity
+          (activities.includes(:activity_verb) & ActivityVerb.verb_name('post')).first
         end
 
         # Create corresponding ActivityObject including this class type

data/lib/social_stream/models/actor.rb

@@ -2,7 +2,7 @@ require 'active_support/concern'
 
 module SocialStream
   module Models
-    # Additional features for models that are actors
+    # Additional features for models that are subtypes of actors
     module Actor
       extend ActiveSupport::Concern
 
@@ -16,10 +16,14 @@ module SocialStream
                  :permalink, :permalink=,
                  :disabled, :disabled=,
                  :ties, :sent_ties, :received_ties,
-                 :contacts, :suggestion,
+                 :sender_subjects, :receiver_subjects, :suggestion,
                  :wall,
                  :to => :actor!
 
+
+        scope :with_sent_ties,     joins(:actor => :sent_ties)
+        scope :with_received_ties, joins(:actor => :received_ties)
+
         after_create :initialize_default_ties
       end
 
@@ -45,8 +49,12 @@ module SocialStream
           Relation.mode(to_s, to)
         end
 
-        def with_received_ties
-          joins(:actor => :received_ties)
+        # Actor subtypes that may receive a tie from an instance of this class
+        def receiving_subject_classes
+          Relation.select("DISTINCT #{ Relation.quoted_table_name }.receiver_type").
+            where(:sender_type => to_s).
+            map(&:receiver_type).
+            map(&:constantize)
         end
       end
     end

data/lib/social_stream/models/supertype.rb

@@ -24,7 +24,7 @@ module SocialStream #:nodoc:
               s = s.to_s.classify.constantize
               s.__send__(:include, features) unless s.ancestors.include?(features)
             rescue
-              puts "Warning: could not load #{ s }"
+              puts "Warning: could not load #{ s.to_s.classify }"
             end
           end
         end

data/lib/social_stream/rails.rb

@@ -1,6 +1,8 @@
 # Load Devise constant
 require 'ancestry'
 require 'devise'
+require 'inherited_resources'
+
 require 'social_stream/rails/common'
 File.expand_path(__FILE__) =~ /#{ File.join('vendor', 'plugins') }/ ?
   require('social_stream/rails/railtie') :

data/lib/social_stream/rails/common.rb

@@ -20,6 +20,7 @@ module SocialStream
 
             # https://rails.lighthouseapp.com/projects/8994/tickets/1905-apphelpers-within-plugin-not-being-mixed-in
               ApplicationController.helper ActivitiesHelper
+              ApplicationController.helper TiesHelper
             end
 
             initializer "social_stream.inflections" do

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Antonio Tapiador
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,22 @@ dependencies:
         version: 1.1.3
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: inherited_resources
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :runtime
+  version_requirements: *id003
 description: Ruby on Rails plug-in supporting social networking features and activity streams.
 email: 
 executables: []
@@ -65,10 +81,12 @@ files:
 - Rakefile
 - Gemfile
 - README.rdoc
+- app/helpers/ties_helper.rb
 - app/helpers/activities_helper.rb
 - app/models/activity_object.rb
 - app/models/relation_permission.rb
 - app/models/tie.rb
+- app/models/post.rb
 - app/models/user.rb
 - app/models/permission.rb
 - app/models/actor.rb
@@ -76,9 +94,17 @@ files:
 - app/models/activity.rb
 - app/models/relation.rb
 - app/models/activity_verb.rb
+- app/controllers/ties_controller.rb
+- app/controllers/activities_controller.rb
 - app/controllers/home_controller.rb
+- app/controllers/posts_controller.rb
+- app/views/ties/_suggestions.html.erb
+- app/views/ties/_suggestion.html.erb
 - app/views/ties/_pending.html.erb
 - app/views/devise/registrations/new.html.erb
+- app/views/posts/_post.html.erb
+- app/views/posts/create.js.erb
+- app/views/posts/destroy.js.erb
 - app/views/activities/_activity.html.erb
 - app/views/activities/_activity_options.html.erb
 - app/views/activities/_subactivity_options.html.erb