social_stream-base 0.7.3 → 0.7.4

data/app/assets/stylesheets/home.css

@@ -24,6 +24,7 @@
 .content_size {font-size: 13px;}
 .space_center_border {	padding-top: 8px;	padding-right: 4px;	border-bottom: thin solid #D4E4EA;}
 .title_bold{font-size:14px; font-weight:bold;}
+
 /********GROUPS HOME************/
 .browse_letter{	text-align:center;}
 .btn_group{  vertical-align:top;}
@@ -36,7 +37,12 @@
 #my_groups {	width: 100%;}
 
 
+/********SUBJECTS HOME************/
 
+.btn_subject{  vertical-align:top;}
+.user .logo, .group .logo{  display:block;  text-align:center;}
+.user .title a, .group .title a{  display:block;  font-size:9px;  text-decoration:none;  text-align:center;}
+.user .title a:hover, .group .title a:hover{  display:block;  text-decoration:underline;}
 
 
 

data/app/models/activity.rb

@@ -254,6 +254,7 @@ class Activity < ActiveRecord::Base
     subject.present? &&
     direct_object.present? &&
       ! direct_object.is_a?(Actor) &&
+      ! direct_object.class.ancestors.include?(SocialStream::Models::Subject) &&
       allow?(subject, 'destroy')
   end
 

data/app/views/groups/_group.html.erb

@@ -1,10 +1,4 @@
 <li>
-  <%= div_for group do %>
-    <div class="group_content">
-      <%=link_to(image_tag(group.logo.url(:actor), :class => 'btn_group', :alt => group.name, :title => group.name), group) %>
-    </div>
-    <div class="group_title">
-      <%=link_to(truncate_name(group.name), group)%>
-    </div>
-  <% end %>
+  <%= render :partial => 'subjects/subject',
+             :object  => group %>
 </li>

data/app/views/subjects/_subject.html.erb

@@ -0,0 +1,8 @@
+<%= div_for subject do %>
+  <div class="logo">
+    <%=link_to(image_tag(subject.logo.url(:actor), :class => 'btn_subject', :alt => subject.name, :title => subject.name), subject) %>
+  </div>
+  <div class="title">
+    <%=link_to(truncate_name(subject.name), subject)%>
+  </div>
+<% end %>

data/app/views/users/_user.html.erb

@@ -0,0 +1,2 @@
+<%= render :partial => 'subjects/subject',
+           :object  => user %>

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.7.3".freeze
+    VERSION = "0.7.4".freeze
   end
 end

data/spec/controllers/users_controller_spec.rb

@@ -16,6 +16,18 @@ describe UsersController do
       assert_response :success
     end
 
+    context "with fans" do
+      before do
+        @user = Factory(:fan_activity).receiver_subject
+      end
+
+      it "should render show" do
+        get :show, :id => @user.to_param
+
+        response.should be_success
+      end
+    end
+
     it "should render show with public activity" do
       activity = Factory(:public_activity)
 
@@ -81,7 +93,6 @@ describe UsersController do
         assert true
       end
     end
-
   end
 end
 

data/spec/factories/activity.rb

@@ -19,3 +19,8 @@ Factory.define :like_activity, :parent => :activity do |a|
   a.activity_verb { ActivityVerb["like"] }
   a.relation_ids { |b| Array(b.parent.contact.ties.first.relation.id) }
 end
+
+
+Factory.define :fan_activity, :parent => :public_activity do |a|
+  a.activity_objects { |b| Array(b.receiver.activity_object) }
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 +02:00
+date: 2011-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -839,12 +839,14 @@ files:
 - app/views/settings/index.html.erb
 - app/views/settings/index.js.erb
 - app/views/subjects/_contacts.html.erb
+- app/views/subjects/_subject.html.erb
 - app/views/toolbar/_home.html.erb
 - app/views/toolbar/_logo.html.erb
 - app/views/toolbar/_profile.html.erb
 - app/views/users/_groups.html.erb
 - app/views/users/_index.html.erb
 - app/views/users/_sidebar_index.html.erb
+- app/views/users/_user.html.erb
 - app/views/users/index.html.erb
 - app/views/users/index.js.erb
 - app/views/users/info.html.erb