social_stream 0.17.0 → 0.17.1

data/README.rdoc

@@ -2,6 +2,9 @@
 Social Stream is an engine for Ruby on Rails. It provides a robust and flexible core
 with social networking features and activity streams for building websites.
 
+{<img src="https://secure.travis-ci.org/ging/social_stream.png" />}[http://travis-ci.org/ging/social_stream]
+{<img src="https://gemnasium.com/ging/social_stream.png" />}[https://gemnasium.com/ging/social_stream]
+
 == Social networking
 Social networks are a new paradigm on web application design. Social networking platforms stand 
 among the most popular websites, while many content oriented applications are supporting social
@@ -43,6 +46,10 @@ Do not forget to migrate your database
 
   rake db:migrate
 
+Since {Social Stream}[http://github.com/ging/social_stream] depends on {Devise}[https://github.com/plataformatec/devise], make sure you follow {its setup instructions}[https://github.com/plataformatec/devise/tree/master/lib/generators/templates#readme]. Specifically, make sure you set the default URL options for your environments at <tt>config/environments/*.rb</tt> with something like:
+
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+
 = Social Stream modules
 
 Social Stream is divided in modules. Developers can customize their social

data/base/app/assets/stylesheets/cheesecake.css.scss

@@ -32,24 +32,71 @@
 
 #contacts_grid {
   width: 300px;
-  height: 370px;
+  height: 336px;
   overflow: hidden;
   position: relative;
   float: left;
 }
+#contacts_grid_extra {
+  width: 270px;
+  padding: 5px;
+  height: 10px;
+  border: solid 1px $input-border-color;
+  text-align: center;
+  float: right;
+  margin-right: 20px;
+  cursor: pointer;
+}
 #contacts_grid .actor {
-  width: 64px;
-  height: 64px;
+  width: 48px;
+  height: 48px;
   float: left;
-  margin: 5px;
+  margin: 4px;
 }
 #contacts_grid .actor.focused {
-  border: 2px solid #00F;
-  background-color: #006;
-  margin: 3px;
+  border: 2px solid $main-color;
+  margin: 0px;
 }
 #contacts_grid .actor img {
-  width: 64px;
-  height: 64px;
+  width: 48px;
+  height: 48px;
+}
+#contacts_grid .actor.focused img {
+  width: 52px;
+  height: 52px;
+}
+#contacts_grid .actor.focused {
+  width: 52px;
+  height: 52px;
+  float: left;
+  margin: 0px;
+}
+#contacts_grid .actor .logo {
+  display: inline-block;
+}
+#contacts_grid .actor .link, #contacts_grid .actor .brief {
+  display: none;
+}
+.cheesecake_actor_tipsy.tipsy {
+  padding-top: 2px;
+  display: none;
+}
+.cheesecake_actor_tipsy.tipsy .tipsy-arrow {
+  display: none;
+}
+.cheesecake_actor_tipsy.tipsy .tipsy-inner {
+  background-color: $text-over-main;
+  padding: 9px;
+  border: 1px solid $main-color;
+}
+.cheesecake_actor_tipsy.tipsy .sub-block {
+  width: 100%;
+  word-wrap: break-word;
+  height: 50px;
+  overflow: hidden;
+  display: inline-block;
+  text-align: left;
+}
+.cheesecake_actor_tipsy.tipsy .logo {
+  display: none;
 }
-

data/base/app/assets/stylesheets/header.css.scss

@@ -31,7 +31,7 @@
 #representation {  display: inline;  padding-left:3px;  padding-right:3px;}
 .switch_pending_count { color: $text-over-main; text-align: right;
                         background: transparent url('btn/header_notifications.png') no-repeat center center;
-                        padding: 2px 10px 4px 11px !important; margin: 0 5px 0 5px !important; float: right; }
+                        padding: 2px 10px 4px 11px !important; margin: 2px 5px 0 5px !important; float: right; }
 .txt_config {color: $text-over-main;	vertical-align: top;	display: inline;	padding-top: 2px;	
               border-right: thin solid; padding-right: 3px;}
 .txt_config2 {color: $text-over-main;	vertical-align: top;	display: inline;	padding-top: 2px;	padding-right: 3px;}
@@ -51,7 +51,7 @@
 #header_dropdown_menu ul li a{padding: .40em 1em .70em 2.5em;}
 #header_dropdown_menu ul li a:hover{color:$main-color;}
 #header_dropdown_menu ul li ul li a{padding: .40em 1em .70em 1em;}
-#header_dropdown_menu ul li ul li ul li {width: 170px;}
+#header_dropdown_menu ul li ul li ul li {width: 170px; min-height: 25px; }
 #header_dropdown_menu ul li ul li ul li a{padding: .40em 1em .70em 2.5em; display:inline;}
 #header_dropdown_menu ul li ul li ul{position: absolute; left: -170px;}
 #header_dropdown_menu a.session_change{background: transparent url('btn/arrow_session_change.png') no-repeat 3px 6px;}

data/base/app/controllers/settings_controller.rb

@@ -27,7 +27,11 @@ class SettingsController < ApplicationController
         #Preferred language setting
         if params[:language].present?
           lang = params[:language].to_s
-          current_user.language = lang[0..1]
+          if lang == 'browser'
+            current_user.language = nil
+          else
+            current_user.language = lang[0..1]
+          end
         end
       end
 

data/base/app/models/relation/custom.rb

@@ -99,9 +99,9 @@ class Relation::Custom < Relation
 
   # JSON compatible with SocialCheesecake
   def to_cheesecake_hash(options = {})
-    { :name => name }.tap do |hash|
+    {:id => id, :name => name}.tap do |hash|
       if options[:subsector]
-        hash[:actors] = ties.map{ |t| [t.contact.receiver_id] }.uniq
+        hash[:actors] = ties.map{ |t| [t.contact.receiver_id, t.contact.receiver.name] }.uniq
       else
         hash[:subsectors] = ( weaker.present? ?
                               weaker.map{ |w| w.to_cheesecake_hash(:subsector => true) } :

data/base/app/views/actors/_actor_cheesecake.html.erb

@@ -2,3 +2,23 @@
   <%= image_tag(actor.logo.url , :size => "64x64", :alt => actor.name ) %>
 <% end %>
 
+<div id="<%= dom_id(actor)%>_details" style="display:none;">
+  <%= link_to truncate_name(actor.name), actor.subject %>
+</div>
+
+<%= javascript_tag do %>
+$(document).ready(function(){
+  $('#<%= dom_id(actor)%>').tipsy({
+    delayIn: 700,   
+    delayOut: 0, 
+    gravity: 'n', 
+    className: 'cheesecake_actor_tipsy',
+    html: true,
+    hoverable: true,
+    opacity: 0.95,
+    title: function(){      
+      return $('#<%= dom_id(actor)%>_details').html();
+    }
+  });
+});
+<% end %>

data/base/app/views/cheesecake/_index.html.erb

@@ -3,12 +3,21 @@
   <div id="contacts_filter">
     <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :contacts_filter_input %>    
   </div>
-  <div id="contacts_grid">
-    
+  <div id="contacts_grid">    
     <% @actors.each do |actor|%>
       <%= render :partial => "actors/actor_cheesecake", :locals => {:actor => actor} %>
     <% end %>
   </div>
+  <div id="contacts_grid_extra" style="display:none;">    
+    <span id="contacts_grid_extra_total"></span> <span id="contacts_grid_extra_text"></span>
+  </div>
+  <%= javascript_tag do %>
+    $("#contacts_grid_extra").click(function(){
+      $("#contacts_grid").css("overflow-y","scroll");
+      $("#contacts_grid").scrollTo("+=308px", 800, {axis:'y'});
+      $("#contacts_grid_extra").hide();
+    });
+  <% end %>
   <br class="clearfloat">
   <%= javascript_tag do %>
   $(function(){
@@ -31,8 +40,51 @@
         rMax : 200, 
         center: {x : 220, y : 220}           
       };
+      cheesecakeData.highlightedSectorCallback = function(cheesecake){
+        $("#contacts_grid").css("overflow-y","hidden");   
+        var sector = cheesecake.highlightedSector;
+        var actors = [];
+        var visibles = 0;
+        var extra_text = ["<%= t('cheesecake.hidden_contact.one')%>","<%= t('cheesecake.hidden_contact.other')%>"];
+        if(sector){
+            actors = sector.actors;           
+        }else{         
+            actors = cheesecake.grid.actors;    
+        }
+        for(var i in actors){
+          if(actors[i].isVisible()){
+            visibles++;
+          }
+        }        
+        if(visibles <= 30){
+          $("#contacts_grid_extra").hide();          
+        }else{
+          $("#contacts_grid_extra_total").html(visibles - 30);
+          if((visibles - 30) == 1){
+            $("#contacts_grid_extra_text").html(extra_text[0]);
+          }else{
+            $("#contacts_grid_extra_text").html(extra_text[1]);
+          }          
+          $("#contacts_grid_extra").show();
+          $("#contacts_grid").scrollTo(0, 0);
+        }  
+      }
       cheesecakeData.sectors = <%= raw(current_subject.cheesecake_json) %>.sectors;
       var cheese = new socialCheesecake.Cheesecake(cheesecakeData);  
+      $("#contacts_filter_input").keyup(function(){
+        cheese.searchEngine.filter($("#contacts_filter_input").val());
+        cheesecakeData.highlightedSectorCallback(cheese);
+      });
+      if(cheese.grid.actors.length > 30){    
+        var extra_text = ["<%= t('cheesecake.hidden_contact.one')%>","<%= t('cheesecake.hidden_contact.other')%>"];
+        $("#contacts_grid_extra_total").html(cheese.grid.actors.length - 30);       
+        if((cheese.grid.actors.length - 30) == 1){
+          $("#contacts_grid_extra_text").html(extra_text[0]);
+        }else{
+          $("#contacts_grid_extra_text").html(extra_text[1]);
+        }       
+        $("#contacts_grid_extra").show();     
+      }
   }      
   <% end %>
 </div>

data/base/app/views/layouts/_header_dropdown_menu_sessions.html.erb

@@ -6,7 +6,7 @@
     <% representations.each do |representation| %>
     <li>
       <%= content_tag :span do %>
-        <%= link_to truncate_name(representation.name, :length => 15), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+        <%= link_to truncate_name(representation.name, :length => 15), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat 0% 5px;margin-left:2px;" } %>
         <%  pending_total = representation.mailbox.notifications.not_trashed.unread.count %>
         <%= link_to content_tag(:span, pending_total.to_s, :class => "switch_pending_count"), notifications_path(:s => representation.slug), { :style => 'margin: 1px; padding: 0;' }  if pending_total > 0 %>
       <% end %>

data/base/app/views/settings/_language.html.erb

@@ -17,7 +17,7 @@
     <div class="form_row">
  <div class="form_label"><%= label_tag :language, t('settings.lang_change.name') %></div>
  <div class="form_field">
- <%= select_tag(:language, options_for_select(I18n.available_locales.map{|l| [ l.to_s, l.to_s ] }, current_user.language), :class => 'form_tag', :onchange => "$(\'#form_lang\').submit();" )%>
+ <%= select_tag(:language, options_for_select([[t('lang.browser'), 'browser']] + I18n.available_locales.map{|l| [ t("lang_names.#{l.to_s}") + ' (' + l.to_s + ')' , l.to_s ] }, (current_user.language.blank? ? 'browser' : current_user.language)), :class => 'form_tag', :onchange => "$(\'#form_lang\').submit();" )%>
  </div>
     </div>
             <div class="actions center">

data/base/config/locales/en.yml

@@ -90,6 +90,10 @@ en:
     create: "Create"
     save: "Save"
     update: "Update"
+  cheesecake:
+    hidden_contact:
+      one: "contact hidden"
+      other: "contacts hidden"
   comment:
     input: "Write a comment..."
     confirm_delete: "Delete comment?"
@@ -475,3 +479,6 @@ en:
     all: "All users"
     all_n: "All users (%{count})"
   welcome: "Welcome to %{site}!"
+  lang:
+    browser: "Auto-detect browser language"
+    none: "Language independent content"

data/base/config/locales/es.yml

@@ -90,6 +90,10 @@ es:
     create: "Crear"
     save: "Guardar"
     update: "Actualizar"
+  cheesecake:
+    hidden_contact:
+      one: "contacto oculto"
+      other: "contactos ocultos"
   comment:
     input: "Comentar..."
     confirm_delete: "¿Borrar commentario?"
@@ -474,4 +478,7 @@ es:
     all: "Todos los usuarios"
     all_n: "Todos los usuarios (%{count})"
   welcome: "¡Bienvenid@ a %{site}!"
+  lang:
+    browser: "Autodetectar el idioma del navegador"
+    none: "Contenido independiente del idioma"
 

data/base/db/migrate/20120111120920_remove_language_default.rb

@@ -0,0 +1,9 @@
+class RemoveLanguageDefault < ActiveRecord::Migration
+  def up
+    change_column_default('users', 'language', nil)
+  end
+
+  def down
+    change_column_default('users', 'language', 'en')
+  end
+end

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.12.0".freeze
+    VERSION = "0.12.1".freeze
   end
 end

data/base/lib/social_stream/controllers/subjects.rb

@@ -10,7 +10,7 @@ module SocialStream
       module InstanceMethods
         # Overwrite {SocialStream::Controllers::Helpers::InstanceMethods#profile_subject}
         def profile_subject
-          !resource.new? && resource || current_subject
+          !resource.new_record? && resource || current_subject
         end
       end
     end

data/base/lib/tasks/db/populate.rake

@@ -12,6 +12,7 @@ namespace :db do
       require 'forgery'
 
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
+      LOGOS_TOTAL = (ENV["LOGOS_TOTAL"] || 10).to_i if ENV["LOGOS_TOTAL"].present?
       USERS = (ENV["USERS"] || 9).to_i
       GROUPS = (ENV["GROUPS"] || 10).to_i
       CHEESECAKE = (ENV["CHEESECAKE"].present? || false)
@@ -41,8 +42,13 @@ namespace :db do
 
       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 LOGOS_TOTAL
+            logo = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ rand(LOGOS_TOTAL) + 1 }.*")].first
+            avatar = Dir[File.join(LOGOS_PATH, klass.to_s.tableize, "#{ rand(LOGOS_TOTAL) + 1 }.*")].first
+          else
+            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            
+          end
 
           if avatar.present? && File.exists?(avatar)
             Avatar.copy_to_temp_file(avatar)
@@ -120,16 +126,18 @@ namespace :db do
       available_actors.each do |a|
         actors = available_actors.dup - Array(a)
         relations = a.relation_customs + Array.wrap(a.relation_reject)
-        break if actors.size==0
-        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(Forgery::Extensions::Array.new(relations).random.id) unless a==actor
-        end
+        break if actors.size==0        
         if CHEESECAKE     
           actor = Actor.first
           unless a==actor
             puts a.name + " connecting with " + actor.name
-            a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id)
+            a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(a.relation_customs).random.id)
+            actor.contact_to!(a).relation_ids = Array(Forgery::Extensions::Array.new(actor.relation_customs).random.id)
+          end
+        else
+          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(Forgery::Extensions::Array.new(relations).random.id) unless a==actor
           end
         end
       end

data/base/social_stream-base.gemspec

@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   # Autolink text blocks
   s.add_runtime_dependency('rails_autolink', '~> 1.0.4')
   # SocialCheesecake
-  s.add_runtime_dependency('social_cheesecake','~> 0.1.0')
+  s.add_runtime_dependency('social_cheesecake','~> 0.2.0')
 
   # Development gem dependencies
   #

data/base/spec/models/actor_spec.rb

@@ -57,8 +57,8 @@ describe Actor do
     it "should build json" do
       hash = {
         :sectors => @user.relation_customs.map do |r|
-          { :name => r.name,
-            :subsectors => [ { :name => r.name, :actors => [] } ]
+          { :id => r.id, :name => r.name,
+            :subsectors => [ { :id => r.id, :name => r.name, :actors => [] } ]
           }
         end
       }

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.17.0".freeze
+  VERSION = "0.17.1".freeze
 end

data/social_stream.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.12.1')
   s.add_runtime_dependency('social_stream-documents', '~> 0.7.0')
   s.add_runtime_dependency('social_stream-events', '~> 0.4.0')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.2.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-01-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &70413200 !ruby/object:Gem::Requirement
+  requirement: &80375130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *70413200
+  version_requirements: *80375130
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &70412910 !ruby/object:Gem::Requirement
+  requirement: &81047060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70412910
+  version_requirements: *81047060
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &70412610 !ruby/object:Gem::Requirement
+  requirement: &81455940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70412610
+  version_requirements: *81455940
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &70412250 !ruby/object:Gem::Requirement
+  requirement: &81467210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70412250
+  version_requirements: *81467210
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &70411770 !ruby/object:Gem::Requirement
+  requirement: &81470040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70411770
+  version_requirements: *81470040
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70411290 !ruby/object:Gem::Requirement
+  requirement: &81471880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *70411290
+  version_requirements: *81471880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70410410 !ruby/object:Gem::Requirement
+  requirement: &81473830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70410410
+  version_requirements: *81473830
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70409910 !ruby/object:Gem::Requirement
+  requirement: &82029890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70409910
+  version_requirements: *82029890
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70409500 !ruby/object:Gem::Requirement
+  requirement: &83136780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70409500
+  version_requirements: *83136780
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70408970 !ruby/object:Gem::Requirement
+  requirement: &83519560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70408970
+  version_requirements: *83519560
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &70400070 !ruby/object:Gem::Requirement
+  requirement: &83620270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70400070
+  version_requirements: *83620270
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: 
@@ -627,6 +627,7 @@ files:
 - base/db/migrate/20111221103509_add_language_field.rb
 - base/db/migrate/20120103103125_add_channels.rb
 - base/db/migrate/20120109081509_update_notify_permissions.rb
+- base/db/migrate/20120111120920_remove_language_default.rb
 - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - base/lib/acts_as_taggable_on/social_stream.rb
 - base/lib/generators/social_stream/base/install_generator.rb