social_stream 0.26.2 → 0.27.0

data/base/app/models/contact.rb

@@ -164,27 +164,6 @@ class Contact < ActiveRecord::Base
     end
   end
 
-  # The related {Channel} to this {Contact}.
-  #
-  # If the sender of this {Contact} is a user, the {Channel} is defined. If it is
-  # other kind of {SocialStream::Models::Subject}, the {Channel#user_author} must
-  # be provided.
-  def channel(user = nil)
-    user_id =
-      if sender.subject_type == "User"
-        sender_id
-      elsif user.present? && Actor.normalize(user).subject_type == "User"
-        Actor.normalize_id(user)
-      else
-        raise "Invalid channel user_author: #{ user.inspect }"
-      end
-
-    Channel.
-      find_or_create_by_author_id_and_user_author_id_and_owner_id sender_id,
-                                                                  user_id,
-                                                                  receiver_id
-  end
-
   private
 
   def build_user_author

data/base/app/models/tie.rb

@@ -146,7 +146,7 @@ class Tie < ActiveRecord::Base
     Activity.create! :author        => contact.sender,
                      :user_author   => contact.user_author,
                      :owner         => contact.receiver,
-                     :relation_ids  => contact.relation_ids,
+                     :relation_ids  => contact.receiver.activity_relation_ids,
                      :activity_verb => ActivityVerb[contact.verb]
   end
 

data/base/app/views/activities/_new.html.erb

@@ -21,7 +21,7 @@
     <%= javascript_tag do %>
       var relation_public = <%= Relation::Public.instance.id %>;
       var public_selected = false;
-      var relation_options = <%= escape_javascript(current_subject.activity_relations(receiver).sort.map{ |r| r.id }.to_json) %>;
+      var relation_options = <%= escape_javascript(current_subject.activity_relations_for(receiver).sort.map{ |r| r.id }.to_json) %>;
       var relation_public_pos = 0;
       for(id in relation_options){
         if(relation_options[id]==relation_public){
@@ -32,7 +32,7 @@
       }
       //For security with check "var default_security_width = '100px';" in activities.js.erb
     <% end %>
-    <%= select_tag :relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t("activity.privacy.myself.contacts.#{ receiver.class.to_s.underscore }") %>
+    <%= select_tag :relation_ids, options_for_select(current_subject.activity_relations_for(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t("activity.privacy.myself.contacts.#{ receiver.class.to_s.underscore }") %>
   <% else %>
     <div id="security_chzn" class="chzn-container chzn-container-multi">
       <ul class="chzn-choices">

data/base/app/views/activities/_options.html.erb

@@ -8,11 +8,17 @@
 
     <% if user_signed_in? %>
       ·
-      <%= link_to activity.audience_in_words(current_subject, :details => :summary),
+      <%= link_to image_tag("btn/#{ activity.public? ? 'public' : 'restricted' }.png", :class => 'menu_icon') + activity.audience_in_words(current_subject, :details => :summary),
                   'javascript:;',
                   :class => 'activity_audience_summary' %>
       <div class="activity_audience">
         <%= activity.audience_in_words(current_subject) %>
+        <% unless activity.public? %>
+          ·
+          <%= link_to t('activity.audience.show'), audience_path(:activity_id => activity.id), :remote => true %>
+          <div class="activity-audience-list-<%= activity.id %>">
+          </div>
+        <% end %>
       </div>
     <% end %>
 

data/base/app/views/audience/_list.html.erb

@@ -0,0 +1,8 @@
+<% @activity.audience.each do |a| %>
+  <div class="audience_logo">
+    <%= link_to image_tag(a.logo.url(:contact),
+                          :alt => a.name),
+                 a.subject,
+                 :title => a.name %>
+  </div>
+<% end %>

data/base/app/views/audience/index.js.erb

@@ -0,0 +1 @@
+$('.activity-audience-list-<%= @activity.id %>').html('<%= j render(:partial => 'list') %>');

data/base/config/locales/en.yml

@@ -38,6 +38,7 @@ en:
       public:
         summary: "Public"
         full: "Shared with all the Internet"
+      show: "Mostrar"
       visible:
         summary: "Restricted"
         full: "Shared with %{audience}"

data/base/config/locales/es.yml

@@ -38,6 +38,7 @@ es:
       public:
         summary: "Público"
         full: "Accesible por toda Internet"
+      show: "Show"
       visible:
         summary: "Restringido"
         full: "Compartido con %{audience}"

data/base/config/routes.rb

@@ -86,6 +86,8 @@ Rails.application.routes.draw do
   resources :activities do
     resource :like
   end
+
+  get 'audience/index', :as => :audience
   
   match 'cheesecake' => 'cheesecake#index', :as => :cheesecake  
   match 'update_cheesecake' => 'cheesecake#update', :as => :update_cheesecake  

data/base/db/migrate/20120526171311_remove_activity_channels.rb

@@ -0,0 +1,35 @@
+class RemoveActivityChannels < ActiveRecord::Migration
+  class Channel < ActiveRecord::Base; end
+
+  def up
+    change_table :activities do |t|
+      t.references :author
+      t.references :user_author
+      t.references :owner
+    end
+
+    Activity.record_timestamps = false
+    Activity.reset_column_information
+
+    Activity.all.each do |a|
+      c = Channel.find a.channel_id
+      %w{ author_id user_author_id owner_id }.each do |m|
+        a.__send__ "#{ m }=", c.__send__(m) # a.author_id = c.author_id
+      end
+      a.save!
+    end
+
+    Activity.record_timestamps = true
+
+    remove_foreign_key :activities, :name => 'index_activities_on_channel_id'
+    remove_column :activities, :channel_id
+
+    Activity.reset_column_information
+
+    drop_table :channels
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/base/lib/social_stream-base.rb

@@ -19,7 +19,6 @@ module SocialStream
   end
 
   module Models
-    autoload :Channeled, 'social_stream/models/channeled'
     autoload :Object,    'social_stream/models/object'
     autoload :Subject,   'social_stream/models/subject'
     autoload :Subtype,   'social_stream/models/subtype'

data/base/lib/social_stream/ability/base.rb

@@ -58,7 +58,9 @@ module SocialStream
         end
 
         can :read, Activity do |a|
-          a.allow?(subject, 'read')
+          a.public? ||
+            subject.present? &&
+            a.audience.include?(subject.actor) 
         end
 
         can :update, Activity do |a|

data/base/lib/social_stream/base/engine.rb

@@ -20,7 +20,6 @@ module SocialStream
 
       initializer "social_stream-base.model.supertypes" do
         ActiveSupport.on_load(:active_record) do
-          include SocialStream::Models::Channeled::ActiveRecord
           include SocialStream::Models::Subtype::ActiveRecord
           include SocialStream::Models::Supertype::ActiveRecord
         end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.20.2".freeze
+    VERSION = "0.21.0".freeze
   end
 end

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

@@ -112,14 +112,16 @@ namespace :db do
       ties_start = Time.now
 
       @available_actors.each do |a|
-        actors = @available_actors.dup - Array(a)
-        relations = a.relation_customs + Array.wrap(Relation::Reject.instance)
-        break if actors.size==0
+        actors = @available_actors.dup
+        actors.delete(a)
+
+        relations = a.relation_customs + [ Relation::Reject.instance ]
+
         Forgery::Basic.number(:at_most => actors.size).times do
           actor = actors.delete_at((rand * actors.size).to_i)
           contact = a.contact_to!(actor)
           contact.user_author = a.user_author if a.subject_type != "User"
-          contact.relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id) unless a==actor
+          contact.relation_ids = [ Forgery::Extensions::Array.new(relations).random.id ]
         end
       end
 

data/base/spec/controllers/audience_controller_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe AudienceController do
+  include SocialStream::TestHelpers
+  include SocialStream::TestHelpers::Controllers
+
+  render_views
+
+  context "with activity" do
+    before :all do
+      @activity = Factory(:activity)
+    end
+
+    it "should not be redered to public" do
+      get :index, :activity_id => @activity.id, :format => :js
+
+      response.should redirect_to(:new_user_session)
+    end
+
+    it "should not be rendered to anyone" do
+      sign_in Factory(:user)
+
+      begin
+        get :index, :activity_id => @activity.id, :format => :js
+
+        assert false
+      rescue CanCan::AccessDenied
+        assert true
+      end
+    end
+
+    it "should not be rendered to author" do
+      sign_in @activity.author_subject
+
+      get :index, :activity_id => @activity.id, :format => :js
+
+      response.should be_success
+    end
+  end
+end

data/base/spec/controllers/comments_controller_spec.rb

@@ -13,7 +13,7 @@ describe CommentsController do
 
     describe "comment from user" do
       before do
-        activity = Factory(:self_activity, :channel => @user.self_channel)
+        activity = Factory(:self_activity, :author => @user.actor)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = @user.actor_id
@@ -38,7 +38,7 @@ describe CommentsController do
     describe "comment to friend" do
       before do
         f = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
-        activity = Factory(:self_activity, :channel => f.contact_to!(f).channel)
+        activity = Factory(:self_activity, :author => f)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = f.id
@@ -52,7 +52,7 @@ describe CommentsController do
     describe "post to acquaintance" do
       before do
         a = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
-        activity = Factory(:self_activity, :channel => a.self_channel)
+        activity = Factory(:self_activity, :author => a)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = a.id

data/base/spec/factories/activity.rb

@@ -23,9 +23,11 @@ end
 ## End of helpers
 
 Factory.define :activity do |a|
-  a.channel { Factory(:friend).contact.channel }
+  a.author        { Factory(:user).actor }
+  a.user_author   { |b| b.author }
+  a.owner         { |b| Factory(:friend, :contact => Factory(:contact, :receiver => b.author)).sender }
   a.activity_verb { ActivityVerb["post"] }
-  a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
+  a.relation_ids  { |b| [ b.owner.relation_custom('friend').id ] }
   a.activity_object_ids { |b|
     # Create post
     post = Factory(:post,
@@ -40,8 +42,10 @@ Factory.define :activity do |a|
 end
 
 Factory.define :self_activity, :parent => :activity do |a|
-  a.channel { Factory(:self_contact).channel }
-  a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
+  a.author       { Factory(:user).actor }
+  a.user_author  { |b| b.author }
+  a.owner        { |b| b.author }
+  a.relation_ids { |b| [ b.author.relation_custom('friend').id ] }
   a.activity_object_ids { |b|
     # Create post
     post = Factory(:post,
@@ -63,10 +67,12 @@ end
 
 Factory.define :like_activity, :class => 'Activity' do |a|
   a.association :parent, :factory => :activity
-  a.channel { |b| Factory(:friend, :sender => b.parent.sender).receiver.contact_to!(b.parent.sender).channel }
+  a.author        { |b| Factory(:friend, :sender => b.parent.owner).receiver }
+  a.user_author   { |b| b.author }
+  a.owner         { |b| b.parent.owner }
   a.activity_verb { ActivityVerb["like"] }
   a.relation_ids  { |b| b.parent.relation_ids }
-  a.after_build{ |b| b.activity_object_ids = b.parent.activity_object_ids }
+  a.after_build   { |b| b.activity_object_ids = b.parent.activity_object_ids }
 end
 
 

data/base/spec/models/tie_spec.rb

@@ -41,8 +41,9 @@ describe Tie do
     end
 
     it "should create activity with follow verb" do
-      @tie.contact.channel.activities.should be_present
-      @tie.contact.channel.activities.first.verb.should eq('follow')
+      activity = Activity.authored_by(@tie.sender).owned_by(@tie.receiver).first
+      activity.should be_present
+      activity.verb.should eq('follow')
     end
 
     context "reciprocal" do
@@ -51,8 +52,10 @@ describe Tie do
       end
 
       it "should create activity with make-friend verb" do
-        @reciprocal.contact.channel.activities.should be_present
-        @reciprocal.contact.channel.activities.first.verb.should eq('make-friend')
+        activity = Activity.authored_by(@reciprocal.sender).owned_by(@reciprocal.receiver).first
+
+        activity.should be_present
+        activity.verb.should eq('make-friend')
       end
     end
 

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.14.1".freeze
+    VERSION = "0.15.0".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.20.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.21.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

data/events/app/assets/stylesheets/events.css.scss

@@ -14,20 +14,15 @@
   float: left;
   font-weight: bold;
   text-align: center;
-  vertical-align: middle;
-  padding: 10px;
-  width: 40px;
+  width: 45px;
 }
 
-
 a.event_date {
   color: $details-color;
 }
 
 div.event_date {
-    margin-left: 5px;
-    margin-right: 7px;
-    width: 64px;
+  margin-top: 25px;
 }
 
 .event_day {
@@ -60,7 +55,7 @@ div.event_date {
 .event_poster {
 	width: 80px;
 	height: 113px;
-	margin-right: 10px;
+	margin-left: 5px;
 	float: left;
 	position: relative;
 }

data/events/app/views/events/_event.html.erb

@@ -1,8 +1,11 @@
 <%= div_for event do %>
 
-  <%= render :partial => "events/event_date", :locals => { :event => event } %>
+  <div class="timeline-130">
+    <%= render :partial => "events/event_date", :locals => { :event => event } %>
 
-  <%= render :partial => "events/event_poster", :locals => { :event => event } %>
+    <%= render :partial => "events/event_poster", :locals => { :event => event } %>
+
+  </div>
 
   <%= render :partial => "events/event_details", :locals => { :event => event } %>
 <% end %>

data/events/config/locales/en.yml

@@ -27,6 +27,7 @@ en:
       unfollow: "Unfollow"
     calendar: "Calendar"
     confirm_delete: "Delete event?"
+    name: "event"
     new:
       title: "New event"
     one: "an event"

data/events/config/locales/es.yml

@@ -28,6 +28,7 @@ es:
       unfollow: "Desapuntar"
     calendar: "Calendario"
     confirm_delete: "¿Borrar evento?"
+    name: "evento"
     new:
       title: "Nuevo evento"
     one: "un evento"

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.12.1".freeze
+    VERSION = "0.13.0".freeze
   end
 end