social_stream-base 0.9.22 → 0.9.23

data/app/assets/javascripts/activities.js.erb

@@ -138,7 +138,7 @@ $(function() {
   $(".actor_logo_new_comment").hide();
   
   //if there are 4 or more commments we only show the last 2 and a link to show the rest
-  $(".activity_comments").each(function(){
+  $("#wall .activity_comments").each(function(){
   	var comments = $(this).children(".subactivity");  	
   	//check if there are more than 3 comments
   	if (comments.size() > 3){

data/app/assets/javascripts/social_stream-base.js

@@ -4,4 +4,6 @@
 //= require modernizr
 //= require jquery.lightbox-with-resize-plugin
 //
+//= require avatars_for_rails
+//
 //= require_tree .

data/app/assets/stylesheets/social_stream-base.css

@@ -1,3 +1,5 @@
 /*
+ *= require avatars_for_rails
+ *
  *= require_tree .
  */

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

@@ -1,18 +1,5 @@
 <% toolbar :profile => current_subject %>
 
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "avatars.css", :media => "screen, projection" %>
-  <%= javascript_include_tag 'jquery.Jcrop.min' %>
-  <%= javascript_include_tag 'jquery.form' %>
-  <%= javascript_include_tag 'jquery.fileupload' %>
-  <%= javascript_include_tag 'jquery.fileupload-ui' %>
-  <%= javascript_include_tag 'avatars.js' %>
-
-  <%= stylesheet_link_tag "jquery.Jcrop", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "avatars", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "jquery.fileupload-ui", :media => "screen, projection" %>
-<% end %>
-
 <% content_for :title do%>
   <%= current_subject.name %>
 <% end%>

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

@@ -1,6 +1,9 @@
 //Display the new comment
 $("#comments_activity_<%= @comment.post_activity.parent.id %>").append("<%= escape_javascript(render @comment.post_activity) %>");
 $(".activities_comment_btn").hide();
+$(".input_new_comments").each(function() {
+  $(this).focus().val("").blur();   
+});
 
 setActivityPrivacyTooltips("<%= escape_javascript dom_id(@comment.post_activity) %>");
 

data/app/views/toolbar/_home.html.erb

@@ -7,7 +7,7 @@
     <%= yield(:toolbar_menu).empty? ? home_toolbar_menu : yield(:toolbar_menu)%>
 </div>
 
-<% if defined?(SocialStream::Presence) %>
+<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
   <%= render :partial => 'xmpp/chat' %>
 <% end %>
 

data/config/locales/en.yml

@@ -377,6 +377,7 @@ en:
   relation_public:
     name: "Public"
   representation:
+    notice: "Your session has changed. Now you are acting on behalf of %{subject}. Use the top-right menu to return to your session"
     switch: "Switch session"
   required: "(*) These fields are required"
   search:

data/config/locales/es.yml

@@ -372,6 +372,7 @@ es:
   relation_public:
     name: "Público"
   representation:
+    notice: "Tu sesión ha cambiado. Ahora actúas en nombre de %{subject}. Para regresar a tu sessión, utiliza el menú de arriba a la derecha"
     switch: "Cambiar sessión"
   required: "(*) Estos campos son obligatorios"
   search:

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.22".freeze
+    VERSION = "0.9.23".freeze
   end
 end

data/lib/social_stream/controllers/helpers.rb

@@ -103,6 +103,12 @@ module SocialStream
             raise CanCan::AccessDenied.new("Not authorized!", :represent, subject.name)
           end
 
+          if subject != current_user
+            flash[:notice] ||= ""
+            flash[:notice] += t('representation.notice',
+                                :subject => subject.name)
+          end
+
           self.current_subject = subject
         end
 

data/lib/social_stream/migrations/base.rb

@@ -1,12 +1,8 @@
-require 'social_stream/migrations/finder'
-
 module SocialStream
   module Migrations
     class Base
       def initialize
-        find_old_migration 'acts-as-taggable-on',
-                       ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
-
+        require_old_migration 'acts-as-taggable-on', 'lib/generators/acts_as_taggable_on/migration/templates/active_record/migration'
         @mailboxer_migration = find_migration 'mailboxer'
         @base_migration = find_migration 'social_stream-base'
       end
@@ -43,12 +39,19 @@ module SocialStream
       protected
 
       def find_migration(gem)
-        path = Gem::GemPathSearcher.new.find(gem).full_gem_path
-        File.join([path,'db', 'migrate'])
+        File.join([get_full_gem_path(gem)], 'db/migrate')
       end
 
-      def find_old_migration(gem, path)
-        SocialStream::Migrations::Finder.new gem, path
+      def require_old_migration(gem,file_path)
+        require File.join([get_full_gem_path(gem),file_path])
+      end
+
+      def get_full_gem_path(gem)
+        if (Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0'))
+          return Gem::Specification.find_by_name(gem).full_gem_path
+        else
+          return Gem::GemPathSearcher.new.find(gem).full_gem_path
+        end
       end
     end
   end

data/lib/social_stream/migrations/components.rb

@@ -4,7 +4,7 @@ module SocialStream
   module Migrations
     class Components < Base
       def initialize
-        @component = find_migration("social_stream-#{ self.class.name.split('::').last.underscore }")
+        @component = find_migration "social_stream-#{ self.class.name.split('::').last.underscore }"
       end
 
       def up(options = {})

data/social_stream-base.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.3.0')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.1.5')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.0')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
   # Authorization

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 9
-  - 22
-  version: 0.9.22
+  - 23
+  version: 0.9.23
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 +02:00
+date: 2011-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,12 +123,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 5
-        version: 0.1.5
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -548,6 +548,7 @@ files:
 - app/assets/images/btn/close.png
 - app/assets/images/btn/date.png
 - app/assets/images/btn/delete.png
+- app/assets/images/btn/download.png
 - app/assets/images/btn/edit.png
 - app/assets/images/btn/error.png
 - app/assets/images/btn/facebook.png
@@ -963,7 +964,6 @@ files:
 - lib/social_stream/d3.rb
 - lib/social_stream/migrations/base.rb
 - lib/social_stream/migrations/components.rb
-- lib/social_stream/migrations/finder.rb
 - lib/social_stream/models/object.rb
 - lib/social_stream/models/subject.rb
 - lib/social_stream/models/supertype.rb

data/lib/social_stream/migrations/finder.rb

@@ -1,20 +0,0 @@
-module SocialStream
-  module Migrations
-    # Searches for migrations in a gem and requires them.
-    # Example:
-    #
-    #   MigrationFinder.new 'acts-as-taggable-on',
-    #                       ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
-    #   ActsAsTaggableOnMigration.up
-    class Finder
-      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 taggable_migration
-      end
-    end
-  end
-end