social_stream 0.18.2 → 0.19.0

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

@@ -57,7 +57,7 @@ activate_anti_rebounds = function(){
     $(this).find('input[type=text]').each(function() {
       $(this).blur().attr('readonly', true);
     });
-    $("#masterSubmitButton").val("<%= I18n.t('activity.sending') %>...").attr("disabled", true); 
+    $("#masterSubmitButton").val(I18n.t('activity.sending') + '...').attr("disabled", true); 
     
     // Add _relation_ids[] parameter from authorization selector
     $('.liveAdded').remove();
@@ -81,7 +81,7 @@ activate_anti_rebounds = function(){
       $(this).blur().attr('readonly', true); 
     });
     $(this).find(".submitActivity").each(function() {
-      $(this).val("<%= I18n.t('activity.sending') %>...").attr("disabled", true);   
+      $(this).val(I18n.t('activity.sending') + '...').attr("disabled", true);   
     });
     return true;    
   });
@@ -90,9 +90,9 @@ activate_anti_rebounds = function(){
 
 unblock_all_forms = function() {  
   //Sharing buttons
-  $(".submitActivity").val("<%= I18n.t('share') %>").removeAttr("disabled");  
+  $(".submitActivity").val(I18n.t('share')).removeAttr("disabled");  
   //Header activities form
-  $("#masterSubmitButton").val("<%= I18n.t('share') %>").removeAttr("disabled");
+  $("#masterSubmitButton").val(I18n.t('share')).removeAttr("disabled");
   $('#wrapper_activities_header form').find('input[type=text]').each(function() {
     $(this).removeAttr("readonly").val("").blur();
   });  
@@ -141,7 +141,7 @@ $(function() {
   	//check if there are more than 3 comments
   	if (comments.size() > 3){
   		$(this).prepend("<div class='hide_show_comments'><a href='#' onclick='showAllComments(\""+ 
-  		                 $(this).attr('id') +"\"); return false;'><%= I18n.t('comment.view_all') %> (" + 
+  		                 $(this).attr('id') +"\"); return false;'>" + I18n.t('comment.view_all') + "(" +
   		                comments.size() + ")</a></div><div class='space_comments'></div>");
   		comments.slice(0,comments.size()-2).hide();
   		//hide alto space_comments

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

@@ -4,6 +4,8 @@
 //= require modernizr
 //= require jquery.lightbox-with-resize-plugin
 //= require jquery.screw
+//= require i18n
+//= require i18n/translations
 //
 //= require avatars_for_rails
 //= require social_cheesecake

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

@@ -84,10 +84,23 @@
   padding: 5px;
   display: none;
   max-height: 200px;
+  overflow-y: auto;
 }
 #contacts_changes_details ul{
   padding-left: 20px;
 }
+#contacts_changes_details .change_deleted{
+  font-weight: bold;
+  color: $error-color;
+}
+#contacts_changes_details .change_modified{
+  font-weight: bold;
+  color: $alert-color;
+}
+#contacts_changes_details .change_added{
+  font-weight: bold;
+  color: $success-color;
+}
 #contacts_grid .actor {
   width: 48px;
   height: 48px;

data/base/app/controllers/omniauth_callbacks_controller.rb

@@ -1,15 +1,15 @@
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def facebook
-    #print env['omniauth.auth']
     @user = User.find_or_create_for_facebook_oauth(env['omniauth.auth'],current_user)
+
     if @user.persisted?
       sign_in_and_redirect @user, :event => :authentication
     end
   end
 
-  def linked_in
-    #print env['omniauth.auth']
+  def linkedin
     @user = User.find_or_create_for_linkedin_oauth(env['omniauth.auth'],current_user)
+
     if @user.persisted?
       sign_in_and_redirect @user, :event => :authentication
     end

data/base/app/helpers/notifications_helper.rb

@@ -10,7 +10,7 @@ module NotificationsHelper
       act_obj.title.truncate(30, :separator => ' ')
     elsif act_obj.respond_to? :url and (not act_obj.url.nil?)
       act_obj.url.truncate(30, :separator => ' ')
-    else t('notification.default')
+    else I18n.t('notification.default')
     end
   end
 
@@ -21,7 +21,7 @@ module NotificationsHelper
     elsif act_obj.respond_to? :description and (not act_obj.description.nil?)
       sanitize(act_obj.description.truncate(100, :separator =>' '))
     else
-      t('notification.watch_it')
+      I18n.t('notification.watch_it')
     end
   end
 

data/base/app/models/user.rb

@@ -115,26 +115,27 @@ class User < ActiveRecord::Base
       record
     end
 
-    def find_or_create_for_facebook_oauth(access_token,signed_in_resource=nil)
-      data = access_token['extra']['user_hash']
-      print data
-      auth = Authentication.find_by_provider_and_uid(access_token["provider"],access_token["uid"])
-      user = User.find_by_email(data["email"])
-      
-      if user == nil
-        user = User.create!(:name => data["name"], :email => data["email"], :password => Devise.friendly_token[0,20])
+    def find_or_create_for_facebook_oauth(hash, signed_in_resource = nil)
+      puts hash.inspect
+      auth = Authentication.find_by_provider_and_uid(hash["provider"], hash["uid"])
+      user = User.find_by_email(hash["info"]["email"])
+
+      if user.nil?
+        user = User.create!(:name => hash["info"]["name"], :email => hash["info"]["email"], :password => Devise.friendly_token[0,20])
       end
-      if auth == nil
-        auth = Authentication.create!(:user_id => user.id, :uid =>access_token["uid"], :provider => access_token["provider"])
+
+      if auth.nil?
+        auth = Authentication.create!(:user_id => user.id, :uid =>hash["uid"], :provider => hash["provider"])
       end
+
       user
     end
     
-    def find_or_create_for_linkedin_oauth(access_token,signed_in_resource=nil)
-      auth = Authentication.find_by_uid_and_provider(access_token["uid"],access_token["provider"])
+    def find_or_create_for_linkedin_oauth(hash,signed_in_resource=nil)
+      auth = Authentication.find_by_uid_and_provider(hash["uid"],hash["provider"])
       if auth==nil
-        user = User.create!(:name => access_token["user_info"]["name"], :email => 'demo@socialstream.com', :password => Devise.friendly_token[0,20])
-        auth = Authentication.create!(:user_id => user.id, :uid =>access_token["uid"], :provider => access_token["provider"])
+        user = User.create!(:name => hash["info"]["name"], :email => 'demo@socialstream.com', :password => Devise.friendly_token[0,20])
+        auth = Authentication.create!(:user_id => user.id, :uid =>hash["uid"], :provider => hash["provider"])
         user
       else
         user = User.find_by_id(auth.user_id)

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

@@ -48,7 +48,75 @@ $(function(){
       cheesecakeData.highlightedSectorCallback(cheese);
     });    
     cheese.onChange = function(cheesecake){
-      $("#contacts_save_changes").val(JSON.stringify(cheesecake.getChanges()));
+      var initial = cheesecake.getInitialState();
+      var changes = cheesecake.getChanges();
+      var changes_html = "";
+      var actors = changes.actors;
+      $("#contacts_save_changes").val(JSON.stringify(changes));
+      for(var i in actors){
+        actor = actors[i];
+        if(actor.justAdded){
+          var new_subsectors = actor.subsectors;
+          var new_subsectors_string = "";
+          for(var i in new_subsectors){
+            if(i > 0) new_subsectors_string += ", ";
+            new_subsectors_string += cheesecake.getSubsectorById(new_subsectors[i]).label;
+          }
+          changes_html += "<div class=\"change_added\">" + actor.name + " has been removed from " + old_subsectors_string + "</div>";
+        }else if(actor.subsectors.length==0){
+          var old_subsectors = [];
+          var old_subsectors_string = "";
+          for(var i in initial.actors){
+            if(actor.id==initial.actors[i].id){
+              old_subsectors = initial.actors[i].subsectors;
+              break;
+            }
+          }
+          for(var i in old_subsectors){
+            if(i > 0) old_subsectors_string += ", ";
+            old_subsectors_string += cheesecake.getSubsectorById(old_subsectors[i]).label;
+          }
+          changes_html += "<div class=\"change_deleted\">" + actor.name + " has been removed from " + old_subsectors_string + "</div>";
+        }else{
+          var old_subsectors = [];
+          var new_subsectors = actor.subsectors;
+          var left_subsectors = "";
+          var joined_subsectors = "";
+          for(var i in initial.actors){
+            if(actor.id==initial.actors[i].id){
+              old_subsectors = initial.actors[i].subsectors;
+              break;
+            }
+          }
+          for(var i in old_subsectors){
+            if(new_subsectors.indexOf(old_subsectors[i])==-1){
+              if(left_subsectors.length!=0){
+                left_subsectors += ", ";
+              }
+              left_subsectors += cheesecake.getSubsectorById(old_subsectors[i]).label;
+            }
+          }
+          for(var i in new_subsectors){
+            if(old_subsectors.indexOf(new_subsectors[i])==-1){
+              if(joined_subsectors.length!=0){
+                joined_subsectors += ", ";
+              }
+              joined_subsectors += cheesecake.getSubsectorById(new_subsectors[i]).label;
+            }
+          }
+          if((joined_subsectors.length!=0)&&(left_subsectors.length!=0)){
+            changes_html += "<div class=\"change_modified\">" + actor.name + " has been removed from " + left_subsectors + " and added to " + joined_subsectors + "</div>";
+          }else if(joined_subsectors.length!=0){
+            changes_html += "<div class=\"change_added\">" + actor.name + " has been added to " + joined_subsectors + "</div>";
+          }else{
+            changes_html += "<div class=\"change_deleted\">" + actor.name + " has been removed from " + left_subsectors + "</div>";  
+          }
+        }
+      }
+      $("#contacts_changes_details").html(changes_html);
+      if (!$("#contacts_changes_details").is (":visible")){
+        $("#contacts_changes_details").slideToggle("slow");
+      }
     }
     if(cheese.grid.actors.length > 30){    
       var extra_text = ["<%= t('cheesecake.hidden_contact.one')%>","<%= t('cheesecake.hidden_contact.other')%>"];

data/base/app/views/frontpage/_social_networks.html.erb

@@ -1,3 +1,3 @@
 <span>|</span>
 <%= link_to image_tag('btn/facebook.png'), user_omniauth_authorize_path(:facebook), :class => "menu_icon" %>
-<%= link_to image_tag('btn/linkedin.png'), user_omniauth_authorize_path(:linked_in), :class => "menu_icon" %>
+<%= link_to image_tag('btn/linkedin.png'), user_omniauth_authorize_path(:linkedin), :class => "menu_icon" %>

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

@@ -1,6 +1,6 @@
 <!-- HTML5 DOCTYPE -->
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<%= I18n.locale.to_s %>">
   <head>
     <meta charset="utf-8">
     <title><%= yield(:title).empty? ? t('site.name') : yield(:title)%></title>
@@ -20,6 +20,11 @@
       <%= csrf_meta_tag %>
     <% end %>
 
+    <script type="text/javascript">
+      I18n.defaultLocale = "<%= I18n.default_locale %>";
+      I18n.locale = "<%= I18n.locale %>";
+    </script>
+
     <script type="text/javascript">
       $(document).ready(function() {
         <%= yield :javascript %>

data/base/lib/acts_as_taggable_on/social_stream.rb

@@ -1,14 +1,69 @@
 require "acts_as_taggable_on/acts_as_taggable_on/dirty"
 
+module ActsAsTaggableOn::Taggable::Core::ClassMethods
+ def initialize_acts_as_taggable_on_core
+   tag_types.map(&:to_s).each do |tags_type|
+     tag_type         = tags_type.to_s.singularize
+     context_taggings = "#{tag_type}_taggings".to_sym
+     context_tags     = tags_type.to_sym
+ 
+     class_eval do
+       has_many context_taggings, :as => :taggable, :dependent => :destroy, :include => :tag, :class_name => "ActsAsTaggableOn::Tagging",
+       :conditions => ["#{ActsAsTaggableOn::Tagging.table_name}.context = ?", tags_type]
+       has_many context_tags, :through => context_taggings, :source => :tag, :class_name => "ActsAsTaggableOn::Tag"
+     end
+ 
+     class_eval %(
+       def #{tag_type}_list
+         tag_list_on('#{tags_type}')
+       end
+ 
+       def #{tag_type}_list=(new_tags)
+         set_tag_list_on('#{tags_type}', new_tags)
+       end
+ 
+       def all_#{tags_type}_list
+         all_tags_list_on('#{tags_type}')
+       end
+     )
+   end
+ end
+end
+
+module ActsAsTaggableOn::Taggable::Core::InstanceMethods
+  def set_tag_list_on(context, new_list)
+    add_custom_context(context)
+
+    variable_name = "@#{context.to_s.singularize}_list"
+    process_dirty_object(context, new_list) unless custom_contexts.include?(context.to_s)
+
+    instance_variable_set(variable_name, ActsAsTaggableOn::TagList.from(new_list))
+  end
+
+  def process_dirty_object(context,new_list)
+    value = new_list.is_a?(Array) ? new_list.join(', ') : new_list
+    attrib = "#{context.to_s.singularize}_list"
+
+    if changed_attributes.include?(attrib)
+      # The attribute already has an unsaved change.
+      old = changed_attributes[attrib]
+      changed_attributes.delete(attrib) if (old.to_s == value.to_s)
+    else
+      old = tag_list_on(context).to_s
+      changed_attributes[attrib] = old if (old.to_s != value.to_s)
+    end
+  end
+end
+
 module ActsAsTaggableOn::Taggable
   def acts_as_taggable_on(*tag_types)
     tag_types = tag_types.to_a.flatten.compact.map(&:to_sym)
 
     if taggable?
-      write_inheritable_attribute(:tag_types, (self.tag_types + tag_types).uniq)
+        self.tag_types = (self.tag_types + tag_types).uniq
     else
-      write_inheritable_attribute(:tag_types, tag_types)
-      class_inheritable_reader(:tag_types)
+        class_attribute :tag_types
+        self.tag_types = tag_types
 
       class_eval do
         has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag, :class_name => "ActsAsTaggableOn::Tagging"
@@ -18,6 +73,7 @@ module ActsAsTaggableOn::Taggable
           true
         end
 
+        include ActsAsTaggableOn::Utils
         include ActsAsTaggableOn::Taggable::Core
         include ActsAsTaggableOn::Taggable::Collection
         include ActsAsTaggableOn::Taggable::Cache
@@ -28,31 +84,3 @@ module ActsAsTaggableOn::Taggable
     end
   end
 end
-
-
-module ActsAsTaggableOn::Taggable::Core::InstanceMethods
-  def set_tag_list_on(context, new_list)
-    add_custom_context(context)
-
-    variable_name = "@#{context.to_s.singularize}_list"
-    process_dirty_object(context, new_list)        
-
-    instance_variable_set(variable_name, ActsAsTaggableOn::TagList.from(new_list))
-  end
-
-  def process_dirty_object(context,new_list)
-    value = new_list.is_a?(Array) ? new_list.join(', ') : new_list
-    attr = "#{context.to_s.singularize}_list"
-
-    if changed_attributes.include?(attr)
-      # The attribute already has an unsaved change.
-      old = changed_attributes[attr]
-      changed_attributes.delete(attr) if (old.to_s == value.to_s)
-    else
-      old = tag_list_on(context).to_s
-      changed_attributes[attr] = old if (old.to_s != value.to_s)
-    end
-  end
-end
-
-

data/base/lib/i18n-js/social_stream-base.rb

@@ -0,0 +1,36 @@
+# Monkey patch https://github.com/fnando/i18n-js/commit/888e9c59dfb5164a85f136705186b02d9ef33d5a
+#
+# Remove with i18n-js > 2.1.2
+require 'i18n-js'
+
+module SimplesIdeias
+  module I18n
+    class Engine
+      initializers.pop
+
+      initializer "i18n-js.asset_dependencies", :after => "sprockets.environment" do
+        next unless I18n.has_asset_pipeline?
+
+        config = I18n.config_file
+        cache_file = I18n::Engine.load_path_hash_cache
+
+        Rails.application.assets.register_preprocessor "application/javascript", :"i18n-js_dependencies" do |context, data|
+          if context.logical_path == I18N_TRANSLATIONS_ASSET
+            context.depend_on(config) if I18n.config?
+            # also set up dependencies on every locale file
+            ::I18n.load_path.each {|path| context.depend_on(path)}
+
+            # Set up a dependency on the contents of the load path
+            # itself. In some situations it is possible to get here
+            # before the path hash cache file has been written; in
+            # this situation, write it now.
+            I18n::Engine.write_hash! unless File.exists?(cache_file)
+            context.depend_on(cache_file)
+          end
+
+          data
+        end
+      end
+    end
+  end
+end

data/base/lib/social_stream/base/dependencies.rb

@@ -23,7 +23,9 @@ require 'avatars_for_rails'
 # Pagination
 require 'kaminari'
 # Oauth
-require 'omniauth/oauth'
+require 'omniauth'
+require 'omniauth-facebook'
+require 'omniauth-linkedin'
 #Tags
 require 'acts-as-taggable-on'
 require 'acts_as_taggable_on/social_stream'
@@ -43,5 +45,7 @@ require 'sass-rails'
 require 'rails_autolink'
 # SocialCheesecake
 require 'social_cheesecake'
-
+# I18n-js
+require 'i18n-js'
+require 'i18n-js/social_stream-base'
 

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.13.2".freeze
+    VERSION = "0.14.0".freeze
   end
 end

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

@@ -4,27 +4,24 @@ module SocialStream
     module CancanDeviseIntegration
       extend ActiveSupport::Concern
       
-      module InstanceMethods
+      private
 
-        private
-
-        # Catch some authorization errors:
-        #
-        # * Redirect to home when the user changes the session and the resource
-        #   is not accesible with the new representation
-        #
-        # * Redirect to login if the user is trying to access a protected resource
-        #   and she is not authenticated
-        def rescue_from_access_denied(exception)
-          if user_signed_in?
-            if params[:s].present? && controller_name != 'home'
-              redirect_to :home
-            else
-              raise exception
-            end
+      # Catch some authorization errors:
+      #
+      # * Redirect to home when the user changes the session and the resource
+      #   is not accesible with the new representation
+      #
+      # * Redirect to login if the user is trying to access a protected resource
+      #   and she is not authenticated
+      def rescue_from_access_denied(exception)
+        if user_signed_in?
+          if params[:s].present? && controller_name != 'home'
+            redirect_to :home
           else
-            redirect_to new_user_session_path
+            raise exception
           end
+        else
+          redirect_to new_user_session_path
         end
       end
     end