social_stream-base 0.5.1 → 0.5.2

data/app/controllers/api_controller.rb

@@ -20,13 +20,11 @@ class ApiController < ApplicationController
   end
   
   def activity_atom_feed
-    @user = current_user
-    if params[:id] != nil
-      @user = User.find_by_slug!(params[:id])
-    end
-    
-    @page = params[:page]
-    @activities = @user.wall(:home).paginate(:page => params[:page], :per_page => 10)
+    @subject = Actor.find_by_slug!(params[:id])
+    # FIXME: why? check with Victor
+    @subject ||= current_user
+
+    @activities = @subject.wall(:home).paginate(:page => params[:page], :per_page => 10)
      
     respond_to do |format|
       format.atom

data/app/views/api/activity_atom_feed.atom.builder

@@ -1,8 +1,8 @@
 atom_feed({'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/'}) do |feed|
-  feed.title(@user.name + ' public stream') 
+  feed.title(@subject.name + ' public stream') 
   feed.updated(@activities.first.updated_at)
   feed.author do
-    feed.name(@user.name)
+    feed.name(@subject.name)
   end
     
   for activity in @activities
@@ -37,4 +37,4 @@ atom_feed({'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/'}) do |feed|
   if params[:page].to_i != 1
     feed.link :rel => 'previous', :href=>api_my_home_url+'?page='+(params[:page].to_i-1).to_s
   end 
-end
+end

data/app/views/contacts/_contact.html.erb

@@ -1,4 +1,4 @@
-<div id="contact_<%=dom_id(contact.receiver_subject)%>" class="row">
+<div id="contact_<%=dom_id(contact.receiver_subject)%>" class="row contact">
   <div class="logo">
     <%= link_to(image_tag(contact.receiver.logo.url(:contact)),
                 contact.receiver_subject) %>

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

@@ -1,7 +1,7 @@
 <% if current_subject.suggestion.present? %>
   <% content_for :javascript do %>
 
-    $(".suggestions .contact_close").livequery("click",function(){
+    $(".suggestions .close").livequery("click",function(){
     temp = $(this);
     $.get("<%=suggestion_contacts_path%>", function(data) {
     temp.parents(".contact").replaceWith(data);
@@ -19,9 +19,11 @@
       </div>
     </div>
     <div class="content">
-      <% if (sgs = current_subject.suggestions(2)).present? %>
-        <%= render :partial => 'contacts/contact', :collection => sgs %>
-      <%end%>
+      <div class="suggestions">
+        <% if (sgs = current_subject.suggestions(2)).present? %>
+          <%= render :partial => 'contacts/contact', :collection => sgs %>
+        <%end%>
+      </div>
     </div>
   </div>
 <%end%>

data/app/views/permissions/_index.html.erb

@@ -7,7 +7,7 @@
     <div class="privacy_add_element"></div>
 
     <table class="tableCheckBoxOptions">
-      <% default_permissions.each do |p| %>
+      <% default_permissions.each_with_index do |p, i| %>
       <tr>
         <td>
           <div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
@@ -15,6 +15,9 @@
             <label for=<%= dom_id p %>><%= p.description(:brief) %></label>
           </div>
         </td>
+      <% if i == 0 %>
+        <td rowspan="<%= default_permissions.size %>" id="privacy-rule-arrow"><%= t 'privacy.rule.add' %></td>
+      <% end %>
       </tr>
       <% end %>
     </table>

data/config/locales/en.yml

@@ -308,6 +308,7 @@ en:
   privacy:
     intro: "Contacts at <strong>%{relation}</strong> level are only allowed to:"
     rule:
+      add: "Add"
       title: "Privacy rules"
       saved: "Privacy rules saved"
   products:

data/config/routes.rb

@@ -9,7 +9,7 @@ Rails.application.routes.draw do
   match 'api/user/:id' => 'api#users'
   match 'api/me' => 'api#users'
   match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
-  match 'api/user/:id/home' => 'api#activity_atom_feed', :format => 'atom'
+  match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom'
   ##/API##
   
   # Webfinger

data/lib/generators/social_stream/base/templates/public/stylesheets/default/spheres.css

@@ -191,18 +191,25 @@ span.privacy_span_new {
 		margin:0 auto;
 }
 
-.privacy_rules_list{
+#relation_custom_permissions_input {
+	list-style-type: none;
+}
+
+#relation_custom_permissions_input ol{
 	text-decoration: none;
-	margin: 20px 10px 20px 50px;
+	margin: 0 10px 0 30px;
 	text-align: left;
-  list-style-type: square;
 }
 
-.privacy_rules_list li{
+#relation_custom_permissions_input ol li{
 	font-family: sans-serif;
 	padding: 5px 0px 5px 0px;
 }
 
+#relation_custom_permissions_input label {
+	margin-left: 0px;
+}
+
 #relation_custom_permissions_input fieldset{
 	border: 0px;
 	text-align: left;
@@ -224,3 +231,8 @@ span.privacy_span_new {
 	cursor: wait;
 }
 
+#privacy-rule-arrow {
+	background: url('images/add-policy.png') no-repeat center center;
+	color: #FFFFFF;
+}
+

data/lib/generators/social_stream/base/templates/relations.yml

@@ -23,6 +23,11 @@ user:
     permissions:
       - [ read,    activity, weak_star_ties ]
     sphere: personal
+  partner:
+    name: partner
+    permissions:
+      - [ read, activity, weak_star_ties ]
+    sphere: work
 
 group:
   member:
@@ -41,3 +46,4 @@ group:
     permissions:
       - [ read,    activity, weak_star_ties ]
     sphere: external_relations
+

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.5.1".freeze
+    VERSION = "0.5.2".freeze
   end
 end

data/lib/tasks/db/populate.rake

@@ -97,7 +97,7 @@ namespace :db do
       # = Ties
       available_actors.each do |a|
         actors = available_actors.dup - Array(a)
-        relations = a.relation_customs
+        relations = a.relations
         
         Forgery::Basic.number(:at_most => actors.size).times do
           actor = actors.delete_at((rand * actors.size).to_i)

data/social_stream-base.gemspec

@@ -46,8 +46,10 @@ Gem::Specification.new do |s|
   # HTML Forms
   s.add_runtime_dependency('formtastic','~> 1.2.3')
  
+  # Freeze Rails to 3.0.7 until Mailboxer bug is fixed
+  s.add_runtime_dependency('rails', '3.0.7')
+
   # Development Gem dependencies
-  s.add_development_dependency('rails', '~> 3.0.7')
   # Integration testing
   s.add_development_dependency('capybara', '~> 0.3.9')
   # Testing database

data/spec/dummy/config/relations.yml

@@ -23,6 +23,11 @@ user:
     permissions:
       - [ read,    activity, weak_star_ties ]
     sphere: personal
+  partner:
+    name: partner
+    permissions:
+      - [ read, activity, weak_star_ties ]
+    sphere: work
 
 group:
   member:
@@ -41,3 +46,4 @@ group:
     permissions:
       - [ read,    activity, weak_star_ties ]
     sphere: external_relations
+

data/spec/integration/navigation_spec.rb

@@ -6,4 +6,28 @@ describe "Navigation" do
   it "should be a valid app" do
     ::Rails.application.should be_a(Dummy::Application)
   end
+
+  context "logged in" do
+    before(:all) do
+      @user = Factory(:user)
+
+      visit root_path
+      fill_in 'user_email', :with => @user.email
+      fill_in 'user_password', :with => 'testing'
+
+      click 'user_submit'
+    end
+
+    context "with other user" do
+      before do
+        Factory(:user)
+      end
+
+      it "should close tab" do
+        visit home_path
+        click_link "X"
+
+      end
+    end
+  end
 end

data/spec/models/tie_spec.rb

@@ -23,9 +23,15 @@ describe Tie do
 
       count = receiver.follower_count
 
+      follower_relation = sender.
+                          relation_customs.
+                          joins(:permissions).
+                          merge(Permission.follow).
+                          first
+
       Tie.create :sender_id => sender.actor_id,
                  :receiver_id => receiver.actor_id,
-                 :relation_id => sender.relation_customs.sort.first.id
+                 :relation_id => follower_relation.id
 
       receiver.reload.follower_count.should eq(count + 1)
     end

data/spec/support/migrations.rb

@@ -1,24 +1,23 @@
-# Social Stream migration template
-social_stream_migration =
-  File.join(File.dirname(__FILE__), '..', '..', 'lib', 'generators', 'social_stream', 'base', 'templates', 'migration')
+class MigrationFinder
+  def initialize gem, path
+    finder = Gem::GemPathSearcher.new
+    taggable_spec = finder.find(gem)
+    taggable_migration = finder.matching_files(taggable_spec,
+                                               File.join(*path)).first
 
-require social_stream_migration
+    require taggable_migration
+  end
+end
 
-# Adding acts_as_taggable_on
-finder = Gem::GemPathSearcher.new
-taggable_spec = finder.find('acts-as-taggable-on')
-taggable_migration = finder.matching_files(taggable_spec,
-                                           File.join("generators","acts_as_taggable_on","migration","templates","active_record","migration")).first
+# Social Stream Base
+MigrationFinder.new 'social_stream-base',
+                    ['generators', 'social_stream', 'base', 'templates', 'migration']
 
-require taggable_migration
-
-# Mailboxer migration template
-finder = Gem::GemPathSearcher.new
-mailboxer_spec = finder.find('mailboxer')
-mailboxer_migration =
-  finder.matching_files(mailboxer_spec,
-                        File.join('generators', 'mailboxer', 'templates', 'migration')).first
-
-require mailboxer_migration
+# acts-as-taggable-on
+MigrationFinder.new 'acts-as-taggable-on',
+                   ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
 
+# Mailboxer
+MigrationFinder.new 'mailboxer',
+                    ['generators', 'mailboxer', 'templates', 'migration']
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 +02:00
+date: 2011-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -300,7 +300,7 @@ dependencies:
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 9
         segments: 
@@ -308,7 +308,7 @@ dependencies:
         - 0
         - 7
         version: 3.0.7
-  type: :development
+  type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: capybara
@@ -537,6 +537,8 @@ files:
 - app/views/contacts/index.html.erb
 - app/views/contacts/index.js.erb
 - app/views/contacts/new.html.erb
+- app/views/contacts/suggestion.html.erb
+- app/views/contacts/suggestion.js.erb
 - app/views/conversations/_conversation.html.erb
 - app/views/conversations/_conversation_full.html.erb
 - app/views/conversations/_conversations.html.erb
@@ -634,12 +636,6 @@ files:
 - app/views/spheres/index.html.erb
 - app/views/subjects/_contacts.html.erb
 - app/views/subjects/_tabs.html.erb
-- app/views/ties/_edit.html.erb
-- app/views/ties/_form.html.erb
-- app/views/ties/create.js.erb
-- app/views/ties/edit.html.erb
-- app/views/ties/suggestion.html.erb
-- app/views/ties/suggestion.js.erb
 - app/views/toolbar/_home.html.erb
 - app/views/toolbar/_home_menu.html.erb
 - app/views/toolbar/_home_menu_options.html.erb
@@ -1054,6 +1050,7 @@ files:
 - lib/generators/social_stream/base/templates/public/stylesheets/default/frontpage.css
 - lib/generators/social_stream/base/templates/public/stylesheets/default/header.css
 - lib/generators/social_stream/base/templates/public/stylesheets/default/home.css
+- lib/generators/social_stream/base/templates/public/stylesheets/default/images/add-policy.png
 - lib/generators/social_stream/base/templates/public/stylesheets/default/images/fcbkcomplete/close.gif
 - lib/generators/social_stream/base/templates/public/stylesheets/default/images/loading.gif
 - lib/generators/social_stream/base/templates/public/stylesheets/default/images/ui-bg_flat_0_aaaaaa_40x100.png

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

@@ -1,70 +0,0 @@
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "addContact.css", :media => "screen, projection" %>
-	<%= javascript_include_tag 'addContact'%>
-<% end %> 
-
-<% toolbar :profile => @tie.receiver_subject, :option => 'contacts' %>
-
-<% content_for :javascript do %>
-  $(document).ready(function() { 
-    defaultRelations = ["friend","acquaintance","public"]
-    
-		relation_name = "<%=@tie.relation.name%>";
-		$(".dropdown dt a span").html(relation_name);   
-    $('input[name$="tie[relation_name]"]').val(relation_name);
-		
-	});
-<% end %>
-
-<div class="dialog_add_tie" id="new_tie">
-  <div class="content_add_user" >
-    <div class="activity_add_ties">
-      
-
-      <%= location(
-        link_to(image_tag("btn/btn_friend.png", :class => "menu_icon")+t('tie.edit.title'), edit_tie_path,:remote => true)
-      ) %>
-      
-      <%= form_for @tie do |f| %>  
-        <%= f.hidden_field :receiver_id %>
-        <%= f.hidden_field :sender_id %>
-        <%= f.hidden_field :relation_name %>
-             
-      <div class="block">
-                  
-        <div class="form_row center">
-         <h2> <%= t('tie.edit.title') %> </h2>
-        </div>  
-        <div class="two_columns_container">
-          <div class="form_column_left">
-           <p class="colum_field_title"><%= t('message.one') %></p>
-            <%= f.text_area :message,   :class =>"new_tie_text_area" %>
-          </div>
-          
-          <div class="form_column_right">
-            <div class="select_relations">  
-              <div id="relationsSelect" class="dropdown">
-              <dt><a href="#"><span><%= t('tie.relation.one') %></span></a></dt>
-              <dd>                
-                <ul>
-                <% (@tie.sender.relations.sort.map{ |r| [ r.name] }).each do |relationArray| %>
-                  <li><a href="#" class="option"><%=relationArray[0]%><span class="value"><%=relationArray[0]%></span></a></li>
-                <% end %>
-                  <li><a href="#" class="input_link">
-                   <span class="value"></span>
-                   <input type="text" class="input_select"/>
-                    </a></li>
-                </ul>
-              </dd>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="form_bottom">
-            <%= submit_tag t('contact.edit.submit'), :class => "button" %>
-          </div>
-        </div>
-      <% end %>
-      </div>
-  </div>
-</div>

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

@@ -1,6 +0,0 @@
-<%= form_for(tie, :remote => true) do |f| %>
-  <%= f.hidden_field :receiver_id %>
-  <%= f.hidden_field :sender_id %>
-  <%= f.hidden_field :relation_name %>
-  <%= f.submit t('submit', :scope => tie.relation.name), :class => "follow_btn"%>
-<% end %>

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

@@ -1,26 +0,0 @@
-<% if @tie.new_record? %>
-    $("#tie_<%=dom_id(@tie.receiver_subject)%>").html(<%= @tie.errors.to_xml %>);
-<% else %>
-  var old_tie = $("#tie_<%= dom_id(@tie.receiver_subject) %>");
-  var link_tie = $("#tie_link<%= dom_id(@tie.receiver_subject) %>");
-  <% if @tie.receiver_subject.is_a?(Group) #group tie %>
-      // add to group list
-      if ($('#carousel_ul').length) { // element found
-        $("#carousel_ul").prepend("<%= escape_javascript(render @tie.receiver_subject) %>");
-      }else{ // no element found
-        $("#my_groups").html("<%= escape_javascript(render(:partial => 'users/groups', :locals => { :user => current_subject } ))%>");
-      }
-      $("#group_count").html("<%=current_subject.recent_groups.count%>");
-      link_tie.replaceWith("<%= escape_javascript(link_follow_state) %>");
-      link_tie.slideUp(300).delay(800).fadeIn(400);
-  <% else %>
-    if (old_tie.parent().hasClass('suggestions')) {
-      //replace with new suggestion
-      old_tie.replaceWith("<%= escape_javascript(render(@tie.sender.suggestion))%>");
-      } else {
-      old_tie.hide();
-    }
-  <% end %>
-
-  $(".boxy-inner .close").click();
-<% end %>

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

@@ -1 +0,0 @@
-<%= render :partial => 'ties/edit' %>