social_stream 0.25.1 → 0.25.2

data/base/spec/dummy/config/initializers/social_stream.rb

@@ -27,7 +27,11 @@ SocialStream.setup do |config|
   # :follow - user just follow other users, like Twitter
   #
   # config.relation_model = :custom
-  
+
+  # Expose resque interface to manage background tasks at /resque
+  #
+  # config.resque_access = true
+ 
   # Quick search (header) and Extended search models and its order. Remember to create
   # the indexes with thinking-sphinx if you are using customized models.
   # 

data/base/spec/factories/tie.rb

@@ -20,6 +20,10 @@ Factory.define :reject, :parent => :tie do |t|
   t.after_build { |u| u.relation = Relation::Reject.instance }
 end
 
+Factory.define :follow, :parent => :tie do |t|
+  t.after_build { |u| u.relation = Relation::Follow.instance }
+end
+
 # Group ties
 Factory.define :g2u_tie, :parent => :tie do |t|
   t.contact { |c| Factory(:group_contact) }

data/base/spec/integration/resque_access_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe "ResqueAccess" do
+  context "with config enabled" do
+    before do
+      SocialStream.resque_access = true
+    end
+
+    it "should be success" do
+      get '/resque/overview'
+
+      response.should be_success
+    end
+  end
+
+  context "with config disabled" do
+    before do
+      SocialStream.resque_access = false
+    end
+
+    it "should be success" do
+      begin
+        get '/resque/overview'
+        assert false
+      rescue ActionController::RoutingError
+        assert true
+      end
+    end
+  end
+end

data/base/spec/models/post_spec.rb

@@ -32,32 +32,81 @@ describe Post do
   end
 
   context "without relations" do
-    it "should allow create to friend" do
-      tie = Factory(:friend)
+    before :all do
+      @ss_relation_model = SocialStream.relation_model
+    end
+
+    after :all do
+      SocialStream.relation_model = @ss_relation_model
+    end
+
+    context "in follow relation model" do
+      before do
+        SocialStream.relation_model = :follow
+      end
+
+      it "should allow create to follower" do
+        tie = Factory(:follow)
+
+        post = Post.new :text => "testing",
+                        :author_id => tie.receiver.id,
+                        :owner_id => tie.sender.id,
+                        :user_author_id => tie.receiver.id
+
+        assert post.build_post_activity.allow? tie.receiver_subject, 'create'
+
+        ability = Ability.new(tie.receiver_subject)
+
+        ability.should be_able_to(:create, post)
+      end
 
-      post = Post.new :text => "testing",
-                      :author_id => tie.receiver.id,
-                      :owner_id => tie.sender.id,
-                      :user_author_id => tie.receiver.id
+      it "should fill relation" do
+        tie = Factory(:follow)
 
-      assert post.build_post_activity.allow? tie.receiver_subject, 'create'
+        post = Post.new :text => "testing",
+          :author_id => tie.receiver.id,
+          :owner_id => tie.sender.id,
+          :user_author_id => tie.receiver.id
 
-      ability = Ability.new(tie.receiver_subject)
+        post.save!
+
+        post.post_activity.relations.should include(Relation::Public.instance)
+      end
 
-      ability.should be_able_to(:create, post)
     end
 
-    it "should fill relation" do
-      tie = Factory(:friend)
+    context "in custom relation model" do
+      before do
+        SocialStream.relation_model = :custom
+      end
+
+      it "should allow create to friend" do
+        tie = Factory(:friend)
+
+        post = Post.new :text => "testing",
+          :author_id => tie.receiver.id,
+          :owner_id => tie.sender.id,
+          :user_author_id => tie.receiver.id
 
-      post = Post.new :text => "testing",
-                      :author_id => tie.receiver.id,
-                      :owner_id => tie.sender.id,
-                      :user_author_id => tie.receiver.id
+        assert post.build_post_activity.allow? tie.receiver_subject, 'create'
 
-      post.save!
+        ability = Ability.new(tie.receiver_subject)
 
-      post.post_activity.relations.should include(tie.relation)
+        ability.should be_able_to(:create, post)
+      end
+
+      it "should fill relation" do
+        tie = Factory(:friend)
+
+        post = Post.new :text => "testing",
+          :author_id => tie.receiver.id,
+          :owner_id => tie.sender.id,
+          :user_author_id => tie.receiver.id
+
+        post.save!
+
+        post.post_activity.relations.should include(tie.relation)
+      end
     end
   end
 

data/documents/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/documents/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/documents/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/documents/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/documents/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')

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.25.1".freeze
+  VERSION = "0.25.2".freeze
 end

data/social_stream.gemspec

@@ -11,8 +11,8 @@ 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-documents', '~> 0.13.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.19.2')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.13.2')
   s.add_runtime_dependency('social_stream-events', '~> 0.11.0')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.9.0')
   s.add_runtime_dependency('social_stream-presence', '~> 0.12.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,33 @@ 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: &82780440 !ruby/object:Gem::Requirement
+  requirement: &80624950 !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: *82780440
+  version_requirements: *80624950
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &82778310 !ruby/object:Gem::Requirement
+  requirement: &80612120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.2
   type: :runtime
   prerelease: false
-  version_requirements: *82778310
+  version_requirements: *80612120
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &82775280 !ruby/object:Gem::Requirement
+  requirement: &80607490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *82775280
+  version_requirements: *80607490
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &82774270 !ruby/object:Gem::Requirement
+  requirement: &80586880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *82774270
+  version_requirements: *80586880
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &82772290 !ruby/object:Gem::Requirement
+  requirement: &80553820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *82772290
+  version_requirements: *80553820
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &82769670 !ruby/object:Gem::Requirement
+  requirement: &80545390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *82769670
+  version_requirements: *80545390
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &82767730 !ruby/object:Gem::Requirement
+  requirement: &80544550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82767730
+  version_requirements: *80544550
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &82750030 !ruby/object:Gem::Requirement
+  requirement: &80543960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82750030
+  version_requirements: *80543960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &82747580 !ruby/object:Gem::Requirement
+  requirement: &80543340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *82747580
+  version_requirements: *80543340
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &82746360 !ruby/object:Gem::Requirement
+  requirement: &80542510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *82746360
+  version_requirements: *80542510
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &82736970 !ruby/object:Gem::Requirement
+  requirement: &80540950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *82736970
+  version_requirements: *80540950
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &82735660 !ruby/object:Gem::Requirement
+  requirement: &80537790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *82735660
+  version_requirements: *80537790
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: 
@@ -514,6 +514,7 @@ files:
 - base/app/views/conversations/_conversations.html.erb
 - base/app/views/conversations/_index.html.erb
 - base/app/views/conversations/_show.html.erb
+- base/app/views/conversations/destroy.js.erb
 - base/app/views/conversations/edit.html.erb
 - base/app/views/conversations/index.html.erb
 - base/app/views/conversations/index.js.erb
@@ -703,6 +704,9 @@ files:
 - base/lib/social_stream/models/subtype.rb
 - base/lib/social_stream/models/supertype.rb
 - base/lib/social_stream/populate.rb
+- base/lib/social_stream/routing/constraints/custom.rb
+- base/lib/social_stream/routing/constraints/follow.rb
+- base/lib/social_stream/routing/constraints/resque.rb
 - base/lib/social_stream/test_helpers.rb
 - base/lib/social_stream/test_helpers/controllers.rb
 - base/lib/social_stream/views/list.rb
@@ -714,6 +718,7 @@ files:
 - base/social_stream-base.gemspec
 - base/spec/controllers/comments_controller_spec.rb
 - base/spec/controllers/contacts_controller_spec.rb
+- base/spec/controllers/followers_controller_spec.rb
 - base/spec/controllers/frontpage_controller_spec.rb
 - base/spec/controllers/groups_controller_spec.rb
 - base/spec/controllers/home_controller_spec.rb
@@ -771,6 +776,7 @@ files:
 - base/spec/factories/tie.rb
 - base/spec/factories/user.rb
 - base/spec/integration/navigation_spec.rb
+- base/spec/integration/resque_access_spec.rb
 - base/spec/models/activity_action_spec.rb
 - base/spec/models/activity_authorization_spec.rb
 - base/spec/models/activity_spec.rb
@@ -951,6 +957,7 @@ files:
 - documents/lib/social_stream/documents/version.rb
 - documents/lib/social_stream/migrations/documents.rb
 - documents/lib/social_stream/views/toolbar/documents.rb
+- documents/lib/tasks/db/populate_documents.rake
 - documents/social_stream-documents.gemspec
 - documents/spec/controllers/documents_controller_spec.rb
 - documents/spec/controllers/pictures_controller_spec.rb