social_stream-documents 0.13.1 → 0.13.2

data/app/controllers/documents_controller.rb

@@ -7,7 +7,6 @@ class DocumentsController < ApplicationController
   before_filter :profile_subject!, :only => :index
 
   PER_PAGE=20
-  SEND_FILE_METHOD = :default
   
   def index
     super do |format|
@@ -60,12 +59,6 @@ class DocumentsController < ApplicationController
       :type => @document.file_content_type
     }
 
-    # Ask Victor about the rationale of this:
-    case SEND_FILE_METHOD
-    when :apache then send_file_options[:x_sendfile] = true
-    when :nginx then head(:x_accel_redirect => path.gsub(Rails.root, ''))
-    end
-
     send_file(path, send_file_options)
   end
 
@@ -75,8 +68,8 @@ class DocumentsController < ApplicationController
     @activities = profile_subject.wall(:profile,
                                        :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)
+    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
@@ -89,7 +82,7 @@ class DocumentsController < ApplicationController
   
   def get_search_query
     search_query = ""
-    param = strip_tags(params[: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|

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

@@ -54,7 +54,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]) %>?query=" + searchstring + "&no_layout=true",
+          url : "<%= polymorphic_url([current_subject, Document.new]) %>?q=" + 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);

data/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.13.1".freeze
+    VERSION = "0.13.2".freeze
   end
 end

data/lib/tasks/db/populate_documents.rake

@@ -0,0 +1,36 @@
+namespace :db do
+  namespace :populate do
+
+    desc "Create populate data with documents"
+    task :create => :create_documents
+
+    desc "Add documents to populate data"
+    task :create_documents => :read_environment do
+      puts 'Documents population'
+      docs_start = Time.now
+
+      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!
+      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.19.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.19.2')
   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.13.1
+  version: 0.13.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &77854210 !ruby/object:Gem::Requirement
+  requirement: &81873720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.2
   type: :runtime
   prerelease: false
-  version_requirements: *77854210
+  version_requirements: *81873720
 - !ruby/object:Gem::Dependency
   name: paperclip-ffmpeg
-  requirement: &77853330 !ruby/object:Gem::Requirement
+  requirement: &81868870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *77853330
+  version_requirements: *81868870
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &77833110 !ruby/object:Gem::Requirement
+  requirement: &81867500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 2.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *77833110
+  version_requirements: *81867500
 - !ruby/object:Gem::Dependency
   name: delayed_paperclip
-  requirement: &77831740 !ruby/object:Gem::Requirement
+  requirement: &81865980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 2.4.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *77831740
+  version_requirements: *81865980
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &77831020 !ruby/object:Gem::Requirement
+  requirement: &81864070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77831020
+  version_requirements: *81864070
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &77830090 !ruby/object:Gem::Requirement
+  requirement: &81861120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *77830090
+  version_requirements: *81861120
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &77829660 !ruby/object:Gem::Requirement
+  requirement: &81857440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *77829660
+  version_requirements: *81857440
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &77829230 !ruby/object:Gem::Requirement
+  requirement: &81855520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *77829230
+  version_requirements: *81855520
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &77828750 !ruby/object:Gem::Requirement
+  requirement: &81851410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *77828750
+  version_requirements: *81851410
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -239,6 +239,7 @@ files:
 - lib/social_stream/documents/version.rb
 - lib/social_stream/migrations/documents.rb
 - lib/social_stream/views/toolbar/documents.rb
+- lib/tasks/db/populate_documents.rake
 - social_stream-documents.gemspec
 - spec/controllers/documents_controller_spec.rb
 - spec/controllers/pictures_controller_spec.rb