social_stream-documents 0.14.0 → 0.14.1

data/app/controllers/documents_controller.rb

@@ -1,21 +1,19 @@
 class DocumentsController < ApplicationController
-  include ActionView::Helpers::SanitizeHelper
   include SocialStream::Controllers::Objects
 
-  belongs_to_subjects :optional => true
-
   before_filter :profile_subject!, :only => :index
 
-  PER_PAGE=20
-  
   def index
-    super do |format|
-      format.json { render :json => collection.map{|a| a.activity_objects.first.document} }
-      if params[:no_layout].present?
-        format.html { render :action => :index, :layout => false }      
-      else  
-        format.html { render :action => :index }
-      end
+    respond_to do |format|
+      format.html {
+        collection
+
+        if params[:no_layout].present?
+          render :layout => false
+        end
+      }
+
+      format.json { render :json => collection }
     end
   end
   
@@ -64,31 +62,9 @@ class DocumentsController < ApplicationController
 
   private
 
-  def collection
-    @activities = profile_subject.wall(:profile,
-                                       :for => current_subject,
-                                       :object_type => Array(self.class.index_object_type))
-    if params[:q].present? 
-      @activities = @activities.joins(:activity_objects).where('activity_objects.title LIKE ? OR activity_objects.description LIKE ?', get_search_query, get_search_query)
-    end
-    @activities = @activities.page(params[:page]).per(PER_PAGE)
-  end
-
   class << self
     def index_object_type
       [ :Audio, :Video, :Picture, :Document ]
     end
   end
-  
-  def get_search_query
-    search_query = ""
-    param = strip_tags(params[:q]) || ""
-    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/controllers/pictures_controller.rb

@@ -1,2 +1,8 @@
 class PicturesController < DocumentsController
+  before_filter :default_style
+
+  protected
+  def default_style
+    params[:style] ||= 'original'
+  end
 end  

data/app/models/document.rb

@@ -6,6 +6,8 @@ class Document < ActiveRecord::Base
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style/:filename.:extension'
+
+  paginates_per 20
   
   validates_attachment_presence :file
   validates_presence_of :title
@@ -18,8 +20,6 @@ class Document < ActiveRecord::Base
     activity_object_index
 
     indexes file_file_name, :as => :file_name
-    
-    where "type IS NULL"
   end
   
   class << self 

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

@@ -1 +1 @@
-<%=render(:partial => 'common_documents/index') %>
+<%= render :partial => 'common_documents/index', :locals => { :documents => @audios } %>

data/app/views/common_documents/_headers.html.erb

@@ -1,25 +1,30 @@
 <% content_for :title do %>
-<%= profile_subject.name + ": " + t('repository.title') %>
+  <%= "#{ profile_subject && profile_subject.name + ': ' }#{ t('repository.title') }" %>
 <% end %>
 
 <% sidebar %>
 
-<%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%>
+<% if profile_subject %>
+  <%= 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)
+    ) %>
+<% else %>
+  <%= location(
+    link_to(t('repository.title'), polymorphic_path(controller.controller_name),:remote => true)
+    ) %>
+<% end %>
+
+<% if profile_subject %>
+  <% toolbar :profile, :subject => profile_subject %>
+<% elsif user_signed_in? %>
+  <% toolbar %>
+<% end %>
 
-<% toolbar :profile, :subject => profile_subject %>
 <br class="clearfloat" />
 <div class="space_center"></div>
 <div id="repository_filter">
-    <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :repository_filter_input %>
+    <%= text_field_tag :q, nil,:autocomplete => :off, :id => :repository_filter_input %>
   <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>
@@ -38,7 +43,7 @@ $(document).ready(function() {
       $("#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",
+          url : "<%= polymorphic_path([ profile_subject, Document.new ], :action => :search) %>",
           success : function(html) {      
             if ($("#repository_filter_input").val()==searchstring){ //Only show if input value is still the same
               $("#documents_grid").html(html);
@@ -54,7 +59,7 @@ $(document).ready(function() {
         $("#documents_grid").html("<center><%= escape_javascript(image_tag('loading.gif', :class => :loading)) %></center>");
         $.ajax({
           type : "GET",
-          url : "<%= polymorphic_url([current_subject, Document.new]) %>?q=" + searchstring + "&no_layout=true",
+          url : "<%= polymorphic_path([ profile_subject, Document.new ], :action => :search) %>?q=" + searchstring,
           success : function(html) {      
             if ($("#repository_filter_input").val()==searchstring){ //Only show if input value is still the same
               $("#documents_grid").html(html);

data/app/views/common_documents/_index.html.erb

@@ -1,14 +1,13 @@
-<% unless params[:no_layout].present? %>
+<% if params[:no_layout].blank? %>
   <%= render :partial => "common_documents/headers" %>
   <div id="documents_grid">
 <% end %> 
 
-<% @activities.each do |a| %>
-<% document = a.activity_objects.first.document %>
+<% documents.each do |document| %>
 <div class="attachment_tile" id="<%= dom_id(document)%>">
   <div class="attachment_tile_thumb">
     <%= link_to thumb_for(document,48),
-                document_path(document),
+                document,
                 :type => document.type,
                 :title => document.file_file_name,
                 :path => document_path(document) %>
@@ -57,10 +56,10 @@ $(document).ready(function(){
 <% end %>
 <% end %> 
 
-<% if @activities.size == DocumentsController::PER_PAGE %>
+<% unless documents.last_page? %>
   <% next_url = url_for(:no_layout => true, 
                         :page => params[:page].present? ? params[:page].to_i + 1 : 2,
-                        :query => params[:query].present? ? params[:query] : "") %>
+                        :q => params[:q]) %>
   <%= content_tag(:span, "", :class => "screw screw-after", :rel => next_url)%>
 <% end %>
 

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

@@ -1 +1 @@
-<%=render(:partial => 'common_documents/index') %>
+<%= render :partial => 'common_documents/index', :locals => { :documents => collection } %>

data/app/views/documents/search.html.erb

@@ -0,0 +1,3 @@
+<% params[:no_layout] = true %>
+<%= render :partial => 'common_documents/index',
+           :locals => { :documents => @documents } %>

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

@@ -1 +1 @@
-<%=render(:partial => 'common_documents/index') %>
+<%= render :partial => 'common_documents/index', :locals => { :documents => @pictures } %>

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

@@ -1 +1 @@
-<%=render(:partial => 'common_documents/index') %>
+<%= render :partial => 'common_documents/index', :locals => { :documents => @videos } %>

data/config/routes.rb

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
   resources :videos
 
   resources :documents do
+    get "search",   :on => :collection
     get "download", :on => :member
   end
   
@@ -15,6 +16,7 @@ Rails.application.routes.draw do
       resources :videos
 
       resources :documents do
+        get "search",   :on => :collection
         get "download", :on => :member
       end
     end

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.14.0".freeze
+    VERSION = "0.14.1".freeze
   end
 end

data/lib/tasks/db/populate_documents.rake

@@ -6,31 +6,14 @@ namespace :db do
 
     desc "Add documents to populate data"
     task :create_documents => :read_environment do
-      puts 'Documents population'
-      docs_start = Time.now
+      SS_DOCS_PATH=Gem::Specification.find_by_name('social_stream-documents').full_gem_path
+      doc_files = Forgery::Extensions::Array.new(Dir.glob(File.join(SS_DOCS_PATH, 'lib', 'samples', "*")))
 
-      doc_files = Forgery::Extensions::Array.new(Dir.glob(File.join(Rails.root, 'lib', 'documents', "*")))
-
-      50.times do
-        updated = Time.at(rand(Time.now.to_i))
-        author = Actor.all[rand(Actor.all.size)]
-        owner  = author
-        user_author =  ( author.subject_type == "User" ? author : author.user_author )
-
-        d = Document.create! :file => File.open(doc_files.random, "r"),
-                             :title => Forgery::LoremIpsum.words(1+rand(4),:random => true),
-                             :created_at => Time.at(rand(updated.to_i)),
-                             :updated_at => updated,
-                             :author_id  => author.id,
-                             :owner_id   => owner.id,
-                             :user_author_id => user_author.id,
-                             :relation_ids => [Relation::Public.instance.id]
-        d.save!
+      SocialStream::Population::ActivityObject.new Document do |d|
+        d.file  = File.open(doc_files.random, "r")
+        d.title = Forgery::LoremIpsum.words(rand(4), :random => true)
+        d.description = Forgery::LoremIpsum.sentences(rand(4), :random => true)
       end
-
-      docs_end = Time.now
-      puts '   -> ' +  (docs_end - docs_start).round(4).to_s + 's'
     end
   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.20.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.20.1')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-documents
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &84319120 !ruby/object:Gem::Requirement
+  requirement: &79325680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *84319120
+  version_requirements: *79325680
 - !ruby/object:Gem::Dependency
   name: paperclip-ffmpeg
-  requirement: &84318870 !ruby/object:Gem::Requirement
+  requirement: &79325360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *84318870
+  version_requirements: *79325360
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &84318640 !ruby/object:Gem::Requirement
+  requirement: &78886570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 2.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *84318640
+  version_requirements: *78886570
 - !ruby/object:Gem::Dependency
   name: delayed_paperclip
-  requirement: &84318410 !ruby/object:Gem::Requirement
+  requirement: &78886040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 2.4.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *84318410
+  version_requirements: *78886040
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &84318220 !ruby/object:Gem::Requirement
+  requirement: &78885730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84318220
+  version_requirements: *78885730
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &84317940 !ruby/object:Gem::Requirement
+  requirement: &78884960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *84317940
+  version_requirements: *78884960
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &84317690 !ruby/object:Gem::Requirement
+  requirement: &78884650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *84317690
+  version_requirements: *78884650
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &84317460 !ruby/object:Gem::Requirement
+  requirement: &78884370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *84317460
+  version_requirements: *78884370
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &84317230 !ruby/object:Gem::Requirement
+  requirement: &78884080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *84317230
+  version_requirements: *78884080
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -202,6 +202,7 @@ files:
 - app/views/documents/_new_activity_fields.html.erb
 - app/views/documents/destroy.js.erb
 - app/views/documents/index.html.erb
+- app/views/documents/search.html.erb
 - app/views/documents/show.html.erb
 - app/views/pictures/_new.html.erb
 - app/views/pictures/_picture.html.erb
@@ -233,6 +234,12 @@ files:
 - lib/delayed_paperclip/social_stream-documents.rb
 - lib/generators/social_stream/documents/install_generator.rb
 - lib/paperclip/social_stream-documents.rb
+- lib/samples/car.jpg
+- lib/samples/house.jpg
+- lib/samples/loremipsum.odt
+- lib/samples/loremipsum.pdf
+- lib/samples/siren.mp3
+- lib/samples/water.mp3
 - lib/social_stream-documents.rb
 - lib/social_stream/documents/dependencies.rb
 - lib/social_stream/documents/engine.rb
@@ -324,10 +331,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: File capabilities for Social Stream, the core for building social network
   websites
 test_files: []
-has_rdoc: