social_stream 0.12.1 → 0.12.2

data/Rakefile

@@ -1,15 +1,13 @@
 # encoding: UTF-8
-require 'rake'
-require 'rake/rdoctask'
+require 'bundler/gem_tasks'
 
-require 'rubygems'
+require 'rdoc/task'
 
+require 'rspec/core'
 require 'rspec/core/rake_task'
 
 require 'ci/reporter/rake/rspec'
 
-require 'bundler'
-
 require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'version')
 
 

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

@@ -3,6 +3,7 @@
 //= require jquery-ui
 //= require modernizr
 //= require jquery.lightbox-with-resize-plugin
+//= require jquery.screw
 //
 //= require avatars_for_rails
 //

data/base/app/models/contact.rb

@@ -126,7 +126,9 @@ class Contact < ActiveRecord::Base
   # We need to update that status here
   def relation_ids=(ids)
     remove_follower(ids)
-
+    if defined?(SocialStream::Presence) and SocialStream::Presence.enable
+      SocialStream::Presence::XmppServerOrder::removeBuddy(self)
+    end
     association(:relations).ids_writer(ids)
   end
 

data/base/config/routes.rb

@@ -23,9 +23,23 @@ Rails.application.routes.draw do
       resource :like
       resource :profile
       resources :activities
+
+      # Nested Social Stream objects configured in config/initializers/social_stream.rb
+      #
+      # /users/demo/posts
+      (SocialStream.objects - [ :actor ]).each do |object|
+        resources object.to_s.pluralize
+      end
     end
   end
 
+  # Social Stream objects configured in config/initializers/social_stream.rb
+  #
+  # /posts
+  (SocialStream.objects - [ :actor ]).each do |object|
+    resources object.to_s.pluralize
+  end
+
   resources :contacts do
     collection do
       get 'pending'
@@ -72,10 +86,6 @@ Rails.application.routes.draw do
   
   match 'ties' => 'ties#index', :as => :ties
   
-  # Social Stream objects configured in config/initializers/social_stream.rb
-  (SocialStream.objects - [ :actor ]).each do |object|
-    resources object.to_s.pluralize
-  end
   
   ##API###
   match 'api/keygen' => 'api#create_key', :as => :api_keygen

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.24".freeze
+    VERSION = "0.9.25".freeze
   end
 end

data/base/vendor/assets/javascripts/jquery.screw.js

@@ -0,0 +1,188 @@
+<!-- 
+/* 
+    Screw - A jQuery plugin
+    ==================================================================
+    ©2010-2011 JasonLau.biz - Version 1.0.4
+    ==================================================================
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    
+*/
+
+(function($){
+ 	$.fn.extend({ 
+ 		screw: function(options) {
+			var defaults = {
+			 loadingHTML : 'Loading ... '
+			}				
+			var option =  $.extend(defaults, options);
+            var obj = $(this);
+
+    		return this.each(function() {   		  
+              $(window).scroll(function() {
+                 screwIt($(this));                             
+              });
+              
+              var screwIt = function(it){
+                var h = $(window).height(), w = $(window).width(), st = it.scrollTop(), t = h+st;
+                $(".screw-image").each(function(){                   
+                    var pos = $(this).offset(), rand = Math.round(Math.random()*1000);
+                    if(t >= pos.top && pos.left <= w){
+                    if(!$(this).hasClass('screw-loaded') && !$(this).hasClass('screw-loading')){
+                        
+                        $(this).addClass('screw-loading').html('<div id="screw-loading-' + rand + '">' + option.loadingHTML + '</div>');
+                        // Stop cache
+                        var url = $(this).attr('rel'), patt = /&/g;
+                        if(patt.test(url)){
+                            url += '&screw_rand=' + rand;
+                        } else {
+                            url += '?screw_rand=' + rand;
+                        }
+                        // Preload image
+                        objImage = new Image();
+                        objImage.src = url;
+                        var o = $(this);
+                        objImage.onload = function(){
+                            o.append('<img style="display:none" id="screw-content-' + rand + '" class="screw-content" src="' + url + '" />');                            
+                            $('#screw-loading-' + rand).fadeOut('slow', function(){
+                                $('#screw-content-' + rand).fadeIn('slow');
+                                o.removeClass('screw-loading').addClass('screw-loaded');
+                            });
+                        };
+                    }                        
+                    }
+                });	
+                
+                $(".screw").each(function(){
+                    var pos = $(this).offset(), o = $(this), rand = Math.round(Math.random()*1000), data_type = 'html';
+                    if(t >= pos.top && pos.left <= w){
+                        if($(this).hasClass('screw-xml')){
+                          data_type = 'xml';  
+                        } else if($(this).hasClass('screw-json')){
+                          data_type = 'json';  
+                        } else if($(this).hasClass('screw-script')){
+                          data_type = 'script';  
+                        }
+                    if((!$(this).hasClass('screw-loaded') || $(this).hasClass('screw-repeat') && !$(this).hasClass('screw-loading'))){
+                        o.addClass('screw-loading');
+                        if(option.loadingHTML){
+                            o.html('<div id="screw-loading-' + rand + '">' + option.loadingHTML + '</div>');
+                        }
+                        
+                        if(o.hasClass('screw-replace')){
+                        if($(this).attr('rel')){
+                          $.get($(this).attr('rel'), { screwrand : Math.round(Math.random()*1000) }, function(data) {
+                             o.replaceWith(data);
+                        }, data_type);
+                        } else if($(this).attr('rev')){
+                            o.replaceWith($(this).attr('rev'));
+                        }
+                        } else if(o.hasClass('screw-append')){
+                        if($(this).attr('rel')){
+                          $.get($(this).attr('rel'), { screwrand : Math.round(Math.random()*1000) }, function(data) {
+                             o.append('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + data + '</div>');
+                             showContent(rand);
+                        }, data_type);  
+                        } else if($(this).attr('rev')){
+                            o.append('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + $(this).attr('rev') + '</div>');
+                            showContent(rand);
+                        } 
+                        } else if(o.hasClass('screw-prepend')){
+                        if($(this).attr('rel')){
+                          $.get($(this).attr('rel'), { screwrand : Math.round(Math.random()*1000) }, function(data) {
+                             o.prepend('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + data + '</div>');
+                             showContent(rand);
+                        }, data_type);  
+                        } else if($(this).attr('rev')){
+                            o.prepend('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + $(this).attr('rev') + '</div>');
+                            showContent(rand);
+                        } 
+                        } else if(o.hasClass('screw-before')){
+                        if($(this).attr('rel')){
+                          $.get($(this).attr('rel'), { screwrand : Math.round(Math.random()*1000) }, function(data) {
+                             o.before('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + data + '</div>');
+                             showContent(rand);
+                        }, data_type);  
+                        } else if($(this).attr('rev')){
+                            o.before('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + $(this).attr('rev') + '</div>');
+                            showContent(rand);
+                        }
+                        
+                        if(o.hasClass('screw-repeat') && pos.top < $(window).height() && pos.left < $(window).width()){
+                            if($(this).attr('rel')){
+                            $.get($(this).attr('rel'), { screwrand : Math.round(Math.random()*1000) }, function(data) {
+                                    o.before('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + data + '</div>');
+                                    showContent(rand);
+                            }, data_type);
+                            } else if($(this).attr('rev')){
+                                o.before('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + $(this).attr('rev') + '</div>');
+                                showContent(rand);
+                            }
+                        }
+                         
+                        } else if(o.hasClass('screw-after')){
+                        if($(this).attr('rel')){
+                          $.get($(this).attr('rel'), { screwrand : Math.round(Math.random()*1000) }, function(data) {
+                             o.after('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + data + '</div>');
+                             showContent(rand);
+                        }, data_type);  
+                        } else if($(this).attr('rev')){
+                            o.after('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + $(this).attr('rev') + '</div>');
+                            showContent(rand);
+                        } 
+                        } else {
+                        if($(this).attr('rel')){
+                          $.get($(this).attr('rel'), { screwrand : Math.round(Math.random()*1000) }, function(data) {
+                             o.append('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + data + '</div>');
+                             showContent(rand);
+                        }, data_type);  
+                        } else if($(this).attr('rev')){
+                            o.append('<div style="display:none" id="screw-content-' + rand + '" class="screw-content">' + $(this).attr('rev') + '</div>');
+                            showContent(rand);
+                        } 
+                        }
+                        o.removeClass('screw-loading').addClass('screw-loaded');
+                    }                        
+                    }
+                });
+                
+                $(".screw-remove").each(function(){
+                    if($(this).hasClass('screw-loaded')){
+                        var p = $(this).position();
+                        if(p.top < st || p.left > w){
+                            if($(this).is(':visible')){
+                                $(this).fadeOut('slow');
+                            }
+                        }
+                    }
+                });
+                
+              };
+              
+              var showContent = function(rand){
+                if(option.loadingHTML){
+                    $('#screw-loading-' + rand).fadeOut('slow', function(){
+                        $('#screw-content-' + rand).fadeIn('slow');
+                    });
+                } else {
+                    $('#screw-content-' + rand).fadeIn('slow');
+                }               
+              };
+              
+              screwIt($(window));
+    		});
+    	}
+	});
+	
+})(jQuery);
+ -->

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

@@ -59,3 +59,9 @@ toggleDocumentEdit = function(){
     $("#document_edit_action").removeClass("selected");
   }
 }
+
+$(document).ready(function(){
+  $("body").screw({
+    loadingHTML: '<%= image_tag('loading.gif') %>'
+  });
+});

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

@@ -222,3 +222,8 @@
 .processing_text{
   padding: 10px 0px 10px 50px;
 }
+
+.screw{
+  width: 100%;
+  text-align: center;
+}

data/documents/app/controllers/documents_controller.rb

@@ -1,4 +1,5 @@
 class DocumentsController < InheritedResources::Base
+  include ActionView::Helpers::SanitizeHelper
   respond_to :html, :js
 
   belongs_to_subjects :optional => true
@@ -7,7 +8,19 @@ class DocumentsController < InheritedResources::Base
 
   load_and_authorize_resource :except => :index
 
+  PER_PAGE=20
   SEND_FILE_METHOD = :default
+  
+  def index
+    super do |format|
+      if params[:no_layout].present?
+        format.html { render :action => :index, :layout => false }      
+      else  
+        format.html { render :action => :index }
+      end
+    end
+  end
+  
   def create
     super do |format|
       format.all {redirect_to request.referer || home_path}
@@ -64,10 +77,12 @@ class DocumentsController < InheritedResources::Base
 
   def collection
     @activities = profile_subject.wall(:profile,
-    :for => current_subject,
-    :object_type => Array(self.class.index_object_type)).
-    page(params[:page]).
-    per(params[:per])
+                                       :for => current_subject,
+                                       :object_type => Array(self.class.index_object_type))
+    if params[:query].present? 
+      @activities = @activities.joins(:activity_objects => :document).where('documents.title LIKE ?', get_search_query)
+    end
+    @activities.page(params[:page]).per(PER_PAGE)
   end
 
   class << self
@@ -75,4 +90,16 @@ class DocumentsController < InheritedResources::Base
       [ :Audio, :Video, :Picture, :Document ]
     end
   end
+  
+  def get_search_query
+    search_query = ""
+    param = strip_tags(params[:query]) || ""
+    bare_query = param unless bare_query.html_safe?
+    search_query_words = bare_query.strip.split
+    search_query_words.each_index do |i|
+      search_query+= search_query_words[i] + " " if i < (search_query_words.size - 1)
+      search_query+= "%" + search_query_words[i] + "% " if i == (search_query_words.size - 1)
+    end
+    return search_query.strip
+  end
 end

data/documents/app/views/common/_headers.html.erb

@@ -0,0 +1,76 @@
+<% content_for :title do %>
+<%= profile_subject.name + ": " + t('repository.title') %>
+<% end %>
+
+<% content_for :sidebar do %>
+<%= render :partial => 'home/sidebar' %>
+<% end %>
+
+<%if profile_subject_is_current?%>
+<%= location(
+  link_to(t('repository.title'), polymorphic_path(controller.controller_name),:remote => true)
+  ) %>
+<%else%>
+<%= location(
+  link_to(profile_subject.name, polymorphic_path(profile_subject),:remote => true),
+  link_to(t('repository.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
+  ) %>
+<%end%>
+
+<% toolbar :profile => profile_subject %>
+<br class="clearfloat" />
+<div class="space_center"></div>
+<div id="repository_filter">
+  <form action="<%= search_path%>" method="get" id="repository_filter">
+    <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :repository_filter_input %>
+  </form>
+  <div id="order_by"><%= t('repository.order.by') %>: <%= t('repository.order.last_modified') %> · <%= t('repository.order.most_popular') %>  </div>
+</div>
+<div class="space_center"></div>
+
+<%= javascript_tag do %>
+$(document).ready(function() {
+  var last_search = "";
+  
+  
+  $("#repository_filter_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
+
+  $("#repository_filter_input").keyup(function() {
+    var searchstring = $(this).val();
+    if((searchstring=="")){
+      if (last_search!=searchstring){last_search=searchstring;}
+      $("#documents_grid").html("<center><%= escape_javascript(image_tag('loading.gif', :class => :loading)) %></center>");
+        $.ajax({
+          type : "GET",
+          url : "<%= polymorphic_url([current_subject, Document.new]) %>?no_layout=true",
+          success : function(html) {      
+            if ($("#repository_filter_input").val()==searchstring){ //Only show if input value is still the same
+              $("#documents_grid").html(html);
+            }          
+          },
+          error: function(){
+            $("#header_search_display").html("<center><%= escape_javascript(content_tag(:span,I18n.t('search.wrong'), :class => :warning)) %></center>");
+         }
+        });
+    } else {
+      if (last_search!=searchstring){
+        last_search=searchstring;
+        $("#documents_grid").html("<center><%= escape_javascript(image_tag('loading.gif', :class => :loading)) %></center>");
+        $.ajax({
+          type : "GET",
+          url : "<%= polymorphic_url([current_subject, Document.new]) %>?query=" + searchstring + "&no_layout=true",
+          success : function(html) {      
+            if ($("#repository_filter_input").val()==searchstring){ //Only show if input value is still the same
+              $("#documents_grid").html(html);
+            }          
+          },
+          error: function(){
+            $("#header_search_display").html("<center><%= escape_javascript(content_tag(:span,I18n.t('search.wrong'), :class => :warning)) %></center>");
+         }
+        });
+      }
+    }
+    return false;
+  });  
+})
+<% end %>

data/documents/app/views/common/_index.html.erb

@@ -1,32 +1,7 @@
-<% content_for :title do %>
-<%= profile_subject.name + ": " + t('repository.title') %>
-<% end %>
-
-<% content_for :sidebar do %>
-<%= render :partial => 'home/sidebar' %>
-<% end %>
-
-<%if profile_subject_is_current?%>
-<%= location(
-  link_to(t('repository.title'), polymorphic_path(controller.controller_name),:remote => true)
-  ) %>
-<%else%>
-<%= location(
-  link_to(profile_subject.name, polymorphic_path(profile_subject),:remote => true),
-  link_to(t('repository.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
-  ) %>
-<%end%>
-
-<% toolbar :profile => profile_subject %>
-<br class="clearfloat" />
-<div class="space_center"></div>
-<div id="repository_filter">
-  <form action="<%= search_path%>" method="get" id="repository_filter">
-    <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :repository_filter_input %>
-  </form>
-  <div id="order_by"><%= t('repository.order.by') %>: <%= t('repository.order.last_modified') %> · <%= t('repository.order.most_popular') %>  </div>
-</div>
-<div class="space_center"></div>
+<% unless params[:no_layout].present? %>
+  <%= render :partial => "common/headers" %>
+  <div id="documents_grid">
+<% end %> 
 
 <% @activities.each do |a| %>
 <% document = a.activity_objects.first.document %>
@@ -46,4 +21,15 @@
     :path => document_path(document) %>
   </div>
 </div>
-<% end %> 
+<% end %> 
+
+<% if @activities.size == DocumentsController::PER_PAGE %>
+  <% next_url = url_for(:no_layout => true, 
+                        :page => params[:page].present? ? params[:page].to_i + 1 : 2,
+                        :query => params[:query].present? ? params[:query] : "") %>
+  <%= content_tag(:span, "", :class => "screw screw-after", :rel => next_url)%>
+<% end %>
+
+<% unless params[:no_layout].present? %>
+  </div>
+<% end %>