social_stream-base 0.7.11 → 0.8.0

data/.gitignore

@@ -11,3 +11,4 @@ nbproject
 lib/generators/social_stream/base/templates/public/images/tmp/
 **.*swp
 .code_swarm
+.rvmrc

data/app/assets/javascripts/ties.js

@@ -0,0 +1,67 @@
+//= require d3
+//= require d3.layout
+//= require d3.geom
+
+(function( $ ){
+	$.fn.tiesGraph = function( data ) {
+		//TODO: better handling of width and height
+		var w = 860,
+                    h = 500,
+                    fill = d3.scale.category20();
+
+                var vis = d3.select(this.selector)
+                            .append("svg:svg")
+                            .attr("width", w)
+                            .attr("height", h);
+
+                var force = d3.layout.force()
+                              .charge(-120)
+                              .linkDistance(40)
+                              .nodes(data.nodes)
+                              .links(data.links)
+                              .size([w, h])
+                              .start();
+
+                var link = vis.selectAll("line.link")
+                              .data(data.links)
+                              .enter().append("svg:line")
+                              .attr("class", "link")
+                              .style("stroke-width", function(d) { return Math.sqrt(d.value); })
+                              .attr("x1", function(d) { return d.source.x; })
+                              .attr("y1", function(d) { return d.source.y; })
+                              .attr("x2", function(d) { return d.target.x; })
+                              .attr("y2", function(d) { return d.target.y; });
+
+                var node = vis.selectAll("g.node")
+                              .data(data.nodes)
+                              .enter().append("svg:g")
+                              .attr("class", "node")
+                              .call(force.drag);
+
+		node.append("svg:image")
+                    .attr("class", "circle")
+		    .attr("xlink:href", function(d) { return d.logo; })
+                    .attr("x", "-10px")
+                    .attr("y", "-10px")
+                    .attr("width", "20px")
+                    .attr("height", "20px");
+
+                node.append("svg:title")
+                    .text(function(d) { return d.name; });
+
+                vis.style("opacity", 1e-6)
+                   .transition()
+                   .duration(1000)
+                   .style("opacity", 1);
+
+                force.on("tick", function() {
+                       link.attr("x1", function(d) { return d.source.x; })
+                           .attr("y1", function(d) { return d.source.y; })
+                           .attr("x2", function(d) { return d.target.x; })
+                           .attr("y2", function(d) { return d.target.y; });
+
+                       node.attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")"; });
+                });
+        };
+})( jQuery );
+

data/app/assets/stylesheets/activities.css

@@ -23,7 +23,7 @@
 .activity {	text-align:left;	display: block;	vertical-align: top;	padding: 10px 0px 5px 0px;
 	display: inline-block;	color: #000; font-size: 13px;  color: #2A3890;border-bottom:1px solid #E9E9E9;}
 .actor_logo {	width: 38px;	padding: 8px 0px 5px 5px;	display: inline-block;	vertical-align: top;}
-.activity_content {	padding: 8px 0px 0px 0px;	display: inline-block;	color: #000;	width: 90%;}
+.activity_content {	padding: 8px 0px 0px 0px;	display: inline-block;	color: #000;	width: 89%;}
 .actor_name {font-size: 13px;}
 .actor_name a{font-weight: bold;}
 .post a {	color: #2A3890;}

data/app/assets/stylesheets/base.css

@@ -1,6 +1,6 @@
 /*************Basic SECTION ********************/
 * {	margin: 0;	padding: 0;	font-family: Arial; }
-html, body {height: 100%;}
+html, body {height: auto;}
 .p {	margin: 0px;	padding: 0px;	font-size: inherit;	font-family: inherit;	font-weight: inherit;
       text-align: inherit;	color: inherit;	line-height: inherit;	vertical-align: top;}
 p {	padding-top: 0px;	margin-top: 0px;}
@@ -15,7 +15,7 @@ h2{padding-left:10px;}
 
 
 /******* Main Structure SECTION***************************/
-body{font-size:1.0em;  color:#2A3890;  background-color:#ffffff; }
+body{font-size:1.0em;  color:#2A3890;  background-color:#ffffff; overflow-y: scroll;}
 #wrapper { 	background-color: #f5f5f5;	width: 100%; margin: 0px auto;	  }
 #wrapper_body{min-height: 552px; width: 960px; margin:0px auto;	margin-left: auto;	margin-right: auto;
 margin-top: auto; margin-bottom:auto;}
@@ -102,6 +102,7 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .block .header_icon{ margin-top: 2px;  width:14px;  height:14px; }
 .block .header_icon_right {	float: right;	padding-right: 5px;	padding-top: 3px;}
 .block .header_text {	margin-top: 3px;	display: inline-block;}
+.block .header_title {	margin-top: 3px;	display: inline-block; font-weight: bold}
 .block .logo{ 	display: inline-block; vertical-align:top;}
 .block .right{padding-right:20px; float:right;}
 .block .row {	display: block;}

data/app/assets/stylesheets/ties.css

@@ -0,0 +1,10 @@
+circle.node {
+	stroke: #fff;
+	stroke-width: 1.5px;
+}
+
+line.link {
+	stroke: #999;
+	stroke-opacity: .6;
+}
+

data/app/controllers/ties_controller.rb

@@ -0,0 +1,8 @@
+class TiesController < ApplicationController
+  respond_to :html
+
+  before_filter :authenticate_user!
+
+  def index
+  end
+end

data/app/helpers/subjects_helper.rb

@@ -1,15 +1,15 @@
 module SubjectsHelper
-  
-  NAME_MAX_LENGHT = 30
-  
+
+  NAME_MAX_LENGTH = 30
+
   # Return a link to this subject with the name
   def link_name(subject, options = {})
     link_to subject.name, subject, options
   end
-  
+
   # Return the truncated name
   def truncate_name(name, options={})
-    options = {:length => NAME_MAX_LENGHT, :separator => ' '}.merge options
+    options = {:length => NAME_MAX_LENGTH, :separator => ' '}.merge options
     truncate(name,options)
   end
 end

data/app/models/actor.rb

@@ -280,6 +280,13 @@ class Actor < ActiveRecord::Base
     ties_to(subject).present?
   end
 
+  # The {Tie ties} sent by this actor, plus the second grade ties
+  def egocentric_ties
+    @egocentric_ties ||=
+      load_egocentric_ties
+  end
+
+
   # Can this actor be represented by subject. Does she has permissions for it?
   def represented_by?(subject)
     return false if subject.blank?
@@ -444,4 +451,18 @@ class Actor < ActiveRecord::Base
       create_profile
     end
   end
+
+  # Calculate {#egocentric_ties}
+  def load_egocentric_ties
+    ties = sent_ties.includes(:contact).to_a
+
+    contact_ids = ties.map{ |t| t.contact.receiver_id }
+
+    second_grade_ties =
+      contact_ids.
+        map{ |i| Tie.sent_by(i) }.
+        flatten
+
+    ties + second_grade_ties
+  end
 end

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

@@ -0,0 +1,8 @@
+<% toolbar :option => :contacts %>
+
+<div id="ties"></div>
+
+<%= javascript_tag do %>
+  var tiesData = <%= raw SocialStream::D3::Force.new(current_subject.egocentric_ties, self).to_json %>;
+  $('#ties').tiesGraph(tiesData);
+<% end %>

data/config/locales/en.yml

@@ -307,7 +307,7 @@ en:
     title: "Privacy & context"
   relation_public:
     name: "Public"
-  required: "* These fields are required"
+  required: "(*) These fields are required"
   settings:
     error: "Some errors raised when saving your changes"
     for: "Settings for"

data/config/routes.rb

@@ -65,6 +65,7 @@ Rails.application.routes.draw do
     resource :like
   end
   
+  match 'ties' => 'ties#index', :as => :ties
   
   # Social Stream objects configured in config/initializers/social_stream.rb
   (SocialStream.objects - [ :actor ]).each do |object|

data/lib/mailboxer/notification_decoder.rb

@@ -4,11 +4,11 @@ module Mailboxer
     def decode_notification notification_text, activity
       return if activity.nil?
       notification_text = notification_text.gsub(/\%\{sender\}/, link_to(truncate_name(activity.sender.name),
-                                                                      url_for(:controller=> activity.sender.subject.class.to_s.downcase.pluralize,
+                                                                      url_for(:controller=> activity.sender.subject.class.to_s.underscore.pluralize,
                                                                               :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
       notification_text = notification_text.gsub(/\%\{confirm\}/,link_to(t('notification.confirm'),edit_contact_url(activity.receiver.contact_to!(activity.sender), :s => activity.sender.slug)))
       notification_text = notification_text.gsub(/\%\{look\}/,link_to(t('notification.look'),
-                                                                      url_for(:controller=> activity.sender.subject.class.to_s.downcase.pluralize,
+                                                                      url_for(:controller=> activity.sender.subject.class.to_s.underscore.pluralize,
                                                                               :action=> :show, :id=> activity.sender.subject.slug, :only_path => false)))
       notification_text = notification_text.gsub(/\%\{sender.name\}/,truncate_name(activity.sender.name))
 
@@ -23,12 +23,12 @@ module Mailboxer
       if activity.direct_object.present?
         object = activity.direct_object
         object = object.subject if object.is_a? Actor
-        notification_text=notification_text.gsub(/\%\{object\}/,link_to(object.class.to_s.downcase,
-                                                                      url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show, 
+        notification_text=notification_text.gsub(/\%\{object\}/,link_to(object.class.to_s.underscore,
+                                                                      url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show, 
                                                                               :id=> object.id, :only_path => false)))
-        notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.downcase)
+        notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.underscore)
         notification_text=notification_text.gsub(/\%\{object.text\}/,link_to(object.text.truncate(100, :separator =>' '), 
-                                                                          url_for(:controller=> object.class.to_s.downcase.pluralize, :action=> :show, 
+                                                                          url_for(:controller=> object.class.to_s.underscore.pluralize, :action=> :show, 
                                                                                   :id=> object.id, :only_path => false))) if object.respond_to? :text
       
         #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document
@@ -59,8 +59,8 @@ module Mailboxer
       if activity.direct_object.present?
         object = activity.direct_object
         object = object.subject if object.is_a? Actor
-        notification_text=notification_text.gsub(/\%\{object\}/,object.class.to_s.downcase)
-        notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.downcase)
+        notification_text=notification_text.gsub(/\%\{object\}/,object.class.to_s.underscore)
+        notification_text=notification_text.gsub(/\%\{object.name\}/,object.class.to_s.underscore)
         notification_text=notification_text.gsub(/\%\{object.text\}/,object.text.truncate(100, :separator =>' ')) if object.respond_to? :text
       
         #notification_text=notification_text.gsub(/\%\{object.image\}/,thumb_for(object)) if SocialStream.activity_forms.include? :document and object.is_a? Document

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.7.11".freeze
+    VERSION = "0.8.0".freeze
   end
 end

data/lib/social_stream/controllers/helpers.rb

@@ -57,9 +57,8 @@ module SocialStream
         # Requirements: the controller must inherit from +InheritedResources::Base+ and the method
         # {ClassMethods#belongs_to_subjects} must be called
         #
-        #
         #   class PostsController < InheritedResources::Base
-        #     belongs_to_subjects
+        #     belongs_to_subjects :optional => true
         #   end
         #
         #   # /users/demo/posts
@@ -100,10 +99,9 @@ module SocialStream
 
           subject = Actor.find_by_slug!(params[:s]).subject
 
-          # remove security to control allow "slug" until tapiador fix it
-          #unless subject.represented_by?(current_user)
-          #  raise CanCan::AccessDenied.new("Not authorized!", :represent, subject.name)
-          #end
+          unless subject.represented_by?(current_user)
+            raise CanCan::AccessDenied.new("Not authorized!", :represent, subject.name)
+          end
 
           self.current_subject = subject
         end

data/lib/social_stream/d3.rb

@@ -0,0 +1,53 @@
+module SocialStream
+  # Methods for d3.js library
+  # http://mbostock.github.com/d3/
+  module D3
+    class Force
+      def initialize(ties, view)
+        @view = view
+
+        @force =
+          ties.inject({ :nodes => [], :links => [] }) { |result, t|
+            add_node(result[:nodes], t.sender)
+            add_node(result[:nodes], t.receiver)
+
+            add_link(result[:links], t, result[:nodes])
+
+            result
+          }
+      end
+
+      def to_json
+        @force.to_json
+      end
+
+      private
+
+      def node(actor)
+        { 
+          :name     => actor.name,
+          :logo     => @view.image_path(actor.logo.url(:representation)),
+          :group    => SocialStream.subjects.index(actor.subject_type.underscore.to_sym) + 1
+        }
+      end
+
+      def add_node(nodes, actor)
+        return if nodes_actor_index(nodes, actor)
+
+        nodes << node(actor)
+      end
+
+      def add_link(links, tie, nodes)
+        links << {
+          :source => nodes_actor_index(nodes, tie.sender),
+          :target => nodes_actor_index(nodes, tie.receiver),
+          :value  => 1
+        }
+      end
+
+      def nodes_actor_index(nodes, actor)
+        nodes.index(nodes.find{ |n| n[:name] == actor.name })
+      end
+    end
+  end
+end

data/lib/social_stream/toolbar_config.rb

@@ -43,6 +43,7 @@ module SocialStream
         :options => {:link => {:id => "contacts_menu"}},
         :items => [
           {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.current'), :url => contacts_path},
+          {:key => :contacts_graph, :name => image_tag("btn/btn_friend.png")+t('contact.graph'), :url => ties_path},
           {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)},
           {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
         ]}

data/lib/social_stream-base.rb

@@ -39,6 +39,7 @@ require 'modernizr-rails'
 # Provides your Rails application with social network and activity stream support
 module SocialStream
   autoload :Ability,   'social_stream/ability'
+  autoload :D3,        'social_stream/d3'
   autoload :Populate,  'social_stream/populate'
   autoload :Relations, 'social_stream/relations'
   autoload :TestHelpers, 'social_stream/test_helpers'
@@ -95,11 +96,16 @@ module SocialStream
     #
     # Maybe Rails provides some method to do this, in this case, please tell!!
     def require_model(m)
-      path = $:.find{ |f| f =~ Regexp.new(File.join('social_stream.*', 'app', 'models')) }
+      paths = $:.find_all{ |f| f =~ Regexp.new(File.join('social_stream.*', 'app', 'models')) }
 
-      raise "Can't find social_stream path" if path.blank?
+      raise "Can't find social_stream path" if paths.blank?
+
+      paths.each do |path|
+        if File.exists?(File.join(path, "#{m}.rb"))
+          require_dependency File.join(path, m)
+        end
+      end
 
-      require_dependency File.join(path, m)
     end
   end
 end

data/lib/tasks/db/populate.rake

@@ -1,26 +1,26 @@
 namespace :db do
   desc 'Populate database with fake data for development'
   task :populate => [ 'db:seed', 'db:populate:create' ]
-  
+
   namespace :populate do
-    
+
     desc "Reload populate data"
     task :reload => [ 'db:reset', :create ]
-    
+
     desc "Create populate data"
     task :create => :environment do
-      
+
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
-      
+
       Mailboxer.setup do |config|
         config.uses_emails = false
       end
-      
+
       def set_logos(klass)
         klass.all.each do |i|
           logo = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first
           avatar = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ i.id }.*")].first
-        
+
           if avatar.present? && File.exists?(avatar)
             Avatar.copy_to_temp_file(avatar)
             dimensions = Avatar.get_image_dimensions(avatar)
@@ -30,7 +30,7 @@ namespace :db do
           end
         end
       end
-      
+
       def set_tags(klass)
         klass.all.each do |el|
           el.tag_list = Forgery::LoremIpsum.words(1,:random => true)+", "+
@@ -39,12 +39,12 @@ namespace :db do
           el.save!
         end
       end
-      
+
       puts 'User population'
       users_start = Time.now
-      
+
       # = Users
-      
+
       # Create demo user if not present
       if User.find_by_name('demo').blank?
         User.create! :name => 'Demo',
@@ -52,100 +52,98 @@ namespace :db do
                      :password => 'demonstration',
                      :password_confirmation => 'demonstration'
       end
-      
+
       require 'forgery'
-      
+
       9.times do
         User.create! :name => Forgery::Name.full_name,
                      :email => Forgery::Internet.email_address,
                      :password => 'demonstration',
                      :password_confirmation => 'demonstration'
       end
-      
-      set_logos(User)
-      
-      users_end = Time.now 
+
+
+      users_end = Time.now
       puts '   -> ' + (users_end - users_start).round(4).to_s + 's'
-      
+
       puts 'Groups population'
       groups_start = Time.now
-      
+
       # = Groups
       available_actors = Actor.all
 
       10.times do
         founder = available_actors[rand(available_actors.size)]
-        
+
         Group.create! :name  => Forgery::Name.company_name,
                       :email => Forgery::Internet.email_address,
                       :_founder => founder.slug
       end
-      
-      set_logos(Group)
+
       set_tags(Group)
-      
-      groups_end = Time.now 
+
+      groups_end = Time.now
       puts '   -> ' +  (groups_end - groups_start).round(4).to_s + 's'
-      
-      
+
+
       puts 'Ties population'
       ties_start = Time.now
-      
+
       # Reload actors to include groups
-      available_actors = Actor.all      
-      
+      available_actors = Actor.all
+
       # = Ties
       available_actors.each do |a|
         actors = available_actors.dup - Array(a)
         relations = a.relations
-        
+
         Forgery::Basic.number(:at_most => actors.size).times do
           actor = actors.delete_at((rand * actors.size).to_i)
-          a.contact_to!(actor).relation_ids = Array(relations.random.id)
+          a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id)
         end
       end
-      
+
       ties_end = Time.now
       puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
-      
+
       # = Posts
-      
+
       puts 'Post population'
       posts_start = Time.now
-      
+
       SocialStream::Populate.power_law(Tie.all) do |t|
         updated = Time.at(rand(Time.now.to_i))
-        
+
         p = Post.create :text =>
                       "This post should be for #{ t.relation.name } of #{ t.sender.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }",
                         :created_at => Time.at(rand(updated.to_i)),
                         :updated_at => updated,
                         :_contact_id => t.contact_id,
                         :_relation_ids => Array(t.relation_id)
-        
+
         p.post_activity.update_attributes(:created_at => p.created_at,
                                           :updated_at => p.updated_at)
       end
-      
-      posts_end = Time.now 
+
+      posts_end = Time.now
       puts '   -> ' +  (posts_end - posts_start).round(4).to_s + 's'
-      
+
       puts 'Mailboxer population'
       mailboxer_start = Time.now
-      
+
       # = Mailboxer
       available_actors = Actor.all
-          
+
       available_actors.each do |a|
         actors = available_actors.dup - Array(a)
-        
+
         mult_recp = actors.uniq
         if (demo = User.find_by_name('demo')) and !mult_recp.include? Actor.normalize(demo)
           mult_recp << Actor.normalize(demo)
         end
         actor = mult_recp[(rand * mult_recp.size).to_i]
         mult_recp.delete(actor)
-        mail = actor.send_message(mult_recp, "Hello all, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))       
+        mail = actor.send_message(mult_recp, "Hello all, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
         actor = mult_recp[(rand * mult_recp.size).to_i]
         mail = actor.reply_to_all(mail, "Well, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
         actor = mult_recp[(rand * mult_recp.size).to_i]
@@ -153,11 +151,11 @@ namespace :db do
         actor = mult_recp[(rand * mult_recp.size).to_i]
         mail = actor.reply_to_all(mail, "Pretty well, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
         actor = mult_recp[(rand * mult_recp.size).to_i]
-        actor.reply_to_all(mail, "Finally, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")      
-        
-        
+        actor.reply_to_all(mail, "Finally, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+
+
         if (demo = User.find_by_name('demo'))
-          next if Actor.normalize(demo)==Actor.normalize(a) 
+          next if Actor.normalize(demo)==Actor.normalize(a)
           mail = a.send_message(demo, "Hello, #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
           if rand > 0.5
             mail = demo.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
@@ -168,11 +166,11 @@ namespace :db do
           if rand > 0.75
             mail.conversation.move_to_trash(demo)
           end
-        end            
-        
+        end
+
         Forgery::Basic.number(:at_most => actors.size).times do
           actor = actors.delete_at((rand * actors.size).to_i)
-          next if Actor.normalize(actor)==Actor.normalize(a) 
+          next if Actor.normalize(actor)==Actor.normalize(a)
           mail = a.send_message(actor, "Hello, #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
           if rand > 0.5
             mail = actor.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
@@ -182,13 +180,21 @@ namespace :db do
           end
           if rand > 0.75
             mail.conversation.move_to_trash(actor)
-          end          
+          end
         end
       end
-      
+
       mailboxer_end = Time.now
       puts '   -> ' +  (mailboxer_end - mailboxer_start).round(4).to_s + 's'
-      
+
+
+
+      puts 'Avatar population'
+      avatar_start = Time.now
+      SocialStream.subjects.each {|a| set_logos(Kernel.const_get(a.to_s.classify)) }
+      avatar_end = Time.now
+      puts '   -> ' +  (avatar_end - avatar_start).round(4).to_s + 's'
+
     end
   end
 end