social_stream-documents 0.4.1 → 0.4.2

data/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/app/assets/stylesheets/documents.css.scss

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

data/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/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/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 %> 

data/config/routes.rb

@@ -19,4 +19,4 @@ Rails.application.routes.draw do
       end
     end
   end
-end
+end

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.1".freeze
+    VERSION = "0.4.2".freeze
   end
 end

data/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.9.24')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.25')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-documents
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-31 00:00:00 +01:00
+date: 2011-11-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 9
-        - 24
-        version: 0.9.24
+        - 25
+        version: 0.9.25
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -258,6 +258,7 @@ files:
 - app/views/audios/show.html.erb
 - app/views/common/_document_info.html.erb
 - app/views/common/_edit_form.html.erb
+- app/views/common/_headers.html.erb
 - app/views/common/_index.html.erb
 - app/views/common/_show.html.erb
 - app/views/documents/_document.html.erb