social_stream 0.27.0 → 0.27.1

data/.travis.yml

@@ -1,3 +1,4 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
@@ -8,3 +9,8 @@ env:
 before_script:
   - "mysql -e 'create database social_stream_test;'"
   - "psql -c 'create database social_stream_test;' -U postgres"
+
+# blacklist
+branches:
+  except:
+    - staging

data/base/app/models/activity.rb

@@ -70,59 +70,6 @@ class Activity < ActiveRecord::Base
       merge(Audience.where(:relation_id => Relation.ids_shared_with(subject)))
   }
 
-  scope :wall, lambda { |args|
-    q =
-      select("DISTINCT activities.*").
-      joins(:audiences).
-      joins(:relations).
-      roots
-
-    if args[:object_type].present?
-      q = q.joins(:activity_objects).
-            where('activity_objects.object_type' => args[:object_type])
-    end
-
-    audiences  = Audience.arel_table
-    relations  = Relation.arel_table
-
-    owner_conditions =
-      arel_table[:author_id].eq(Actor.normalize_id(args[:owner])).
-        or(arel_table[:user_author_id].eq(Actor.normalize_id(args[:owner]))).
-        or(arel_table[:owner_id].eq(Actor.normalize_id(args[:owner])))
-
-    audience_conditions =
-      audiences[:relation_id].in(args[:relation_ids]).
-        or(relations[:type].eq('Relation::Public'))
-
-    conds =
-      case args[:type]
-      when :home
-        followed_conditions =
-          arel_table[:author_id].in(args[:followed]).
-            or(arel_table[:owner_id].in(args[:followed]))
-
-        owner_conditions.
-          or(followed_conditions.and(audience_conditions))
-      when :profile
-        if args[:for].present?
-          visitor_conditions =
-            arel_table[:author_id].eq(Actor.normalize_id(args[:for])).
-              or(arel_table[:owner_id].eq(Actor.normalize_id(args[:for])))
-
-          owner_conditions.
-            and(visitor_conditions.or(audience_conditions))
-        else
-          owner_conditions.
-            and(audience_conditions)
-        end
-      else
-        raise "Unknown wall type: #{ args[:type] }" 
-      end
-
-    q.where(conds).
-      order("created_at desc")
-  }
-
   after_create  :increment_like_count
   after_destroy :decrement_like_count, :delete_notifications
 

data/base/app/models/relation.rb

@@ -55,6 +55,8 @@ class Relation < ActiveRecord::Base
   has_many :audiences, :dependent => :destroy
   has_many :activities, :through => :audiences
 
+  has_many :activity_object_audiences, :dependent => :destroy
+
   scope :actor, lambda { |a|
     where(:actor_id => Actor.normalize_id(a))
   }

data/base/app/views/profiles/update.js.erb

@@ -1,6 +1,6 @@
 <% if @profile.valid? %>
   <% flash[:notice] = t('profile.update.success') %>
-  document.location.href="<%= resource_path(@profile) %>";
+  document.location.href="<%= polymorphic_path([ current_subject, :profile ]) %>";
 <% else %>
   if ($("#profile_notice").length == 0){
     $("#profile_form").prepend('<div id="profile_notice" class="notice"></div>');  

data/base/config/locales/en.yml

@@ -38,7 +38,7 @@ en:
       public:
         summary: "Public"
         full: "Shared with all the Internet"
-      show: "Mostrar"
+      show: "Show"
       visible:
         summary: "Restricted"
         full: "Shared with %{audience}"

data/base/config/locales/es.yml

@@ -38,7 +38,7 @@ es:
       public:
         summary: "Público"
         full: "Accesible por toda Internet"
-      show: "Show"
+      show: "Mostrar"
       visible:
         summary: "Restringido"
         full: "Compartido con %{audience}"

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.21.0".freeze
+    VERSION = "0.21.1".freeze
   end
 end

data/base/spec/controllers/profiles_controller_spec.rb

@@ -38,6 +38,13 @@ describe ProfilesController do
       response.should redirect_to([@user, :profile])
     end
 
+    it "should update via AJAX" do
+      put :update, :user_id => @user.to_param, :profile => { :organization => "Social Stream" }, :format => :js
+
+      response.should be_success
+    end
+
+
     it "should not update other's" do
       begin
         put :update, :user_id => Factory(:user).to_param, :profile => { :organization => "Social Stream" }

data/documents/app/controllers/documents_controller.rb

@@ -38,6 +38,8 @@ class DocumentsController < ApplicationController
       format.any {
         path = resource.file.path(params[:style] || params[:format])
 
+        head(:not_found) and return unless File.exist?(path)
+
         send_file path,
                  :filename => resource.file_file_name,
                  :disposition => "inline",
@@ -50,7 +52,7 @@ class DocumentsController < ApplicationController
   def download
     path = @document.file.path(params[:style])
 
-    head(:bad_request) and return unless File.exist?(path)
+    head(:not_found) and return unless File.exist?(path)
 
     send_file_options = {
       :filename => @document.file_file_name,

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

@@ -1,2 +1,2 @@
 <%= render :partial => 'documents/document_with_details',
-           :locals => {:document => video} %>
+           :locals => {:document => document} %>

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.15.0".freeze
+    VERSION = "0.15.1".freeze
   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.21.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.21.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')

data/events/app/views/events/_new.html.erb

@@ -27,10 +27,10 @@
   </div>
 
 
-  <% if profile_subject.rooms.any? %>
+  <% if f.object.owner.rooms.any? %>
   <div class="form_row">
     <%= f.label :room %>
-    <%= f.select :room_id, profile_subject.rooms.map{ |r| [r.name, r.id] }, { :include_blank => true } %>
+    <%= f.select :room_id, f.object.owner.rooms.map{ |r| [r.name, r.id] }, { :include_blank => true } %>
   </div>
   <% end %>
 

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.13.0".freeze
+    VERSION = "0.13.1".freeze
   end
 end

data/events/social_stream-events.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.21.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.21.1')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.27.0".freeze
+  VERSION = "0.27.1".freeze
 end

data/social_stream.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.21.0')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.15.0')
-  s.add_runtime_dependency('social_stream-events', '~> 0.13.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.21.1')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.15.1')
+  s.add_runtime_dependency('social_stream-events', '~> 0.13.1')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.12.0')
   s.add_runtime_dependency('social_stream-presence', '~> 0.14.0')
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.21.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.21.1
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: social_stream-events
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
   requirement: !ruby/object:Gem::Requirement