social_stream 0.25.0 → 0.25.1

data/base/app/models/activity_object.rb

@@ -52,7 +52,8 @@ class ActivityObject < ActiveRecord::Base
   # after_create :create_post_activity, :unless => :acts_as_actor?
 
   scope :authored_by, lambda { |subject|
-    joins(:received_author_action).merge(ActivityAction.sent_by(subject))
+    joins(:received_actions).
+      merge(ActivityAction.sent_by(subject).where(:author => true))
   }
 
   scope :followed, order("activity_objects.follower_count DESC")

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.19.0".freeze
+    VERSION = "0.19.1".freeze
   end
 end

data/base/lib/social_stream/models/object.rb

@@ -8,6 +8,9 @@ module SocialStream
         subtype_of :activity_object,
                    :build => { :object_type => to_s }
 
+        has_many :received_actions,
+                 :through => :activity_object
+
         unless self == Actor
           validates_presence_of :author_id, :owner_id, :user_author_id
 

data/base/spec/models/post_spec.rb

@@ -60,4 +60,12 @@ describe Post do
       post.post_activity.relations.should include(tie.relation)
     end
   end
+
+  describe "authored_by" do
+    it "should work" do
+      post = Factory(:post)
+
+      Post.authored_by(post.author).should include(post)
+    end
+  end
 end

data/documents/app/assets/javascripts/social_stream.video.js.erb

@@ -7,7 +7,7 @@ SocialStream.Video = (function(SS, $, undefined){
         ready: function () {
           $(this).jPlayer("setMedia", {
             webmv: $(this).closest(".video").find(".video-webm").attr("href"), // Defines the webm url
-            flv: $(this).closest(".video").find(".video-flv").attr("href") // Defines the flv url
+            flv: $(this).closest(".video").find(".video-flv").attr("href"), // Defines the flv url
             mp4: $(this).closest(".video").find(".video-mp4").attr("href") // Defines the mp4 url
           });
         },

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.13.0".freeze
+    VERSION = "0.13.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.19.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.19.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/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.25.0".freeze
+  VERSION = "0.25.1".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.0')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.13.0')
+  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-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.0
+  version: 0.25.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000Z
+date: 2012-04-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &84203640 !ruby/object:Gem::Requirement
+  requirement: &82780440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
-  version_requirements: *84203640
+  version_requirements: *82780440
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &84203100 !ruby/object:Gem::Requirement
+  requirement: &82778310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *84203100
+  version_requirements: *82778310
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &84202540 !ruby/object:Gem::Requirement
+  requirement: &82775280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *84202540
+  version_requirements: *82775280
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &84202170 !ruby/object:Gem::Requirement
+  requirement: &82774270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *84202170
+  version_requirements: *82774270
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &84201850 !ruby/object:Gem::Requirement
+  requirement: &82772290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *84201850
+  version_requirements: *82772290
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &84201380 !ruby/object:Gem::Requirement
+  requirement: &82769670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *84201380
+  version_requirements: *82769670
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &84200740 !ruby/object:Gem::Requirement
+  requirement: &82767730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84200740
+  version_requirements: *82767730
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &84200310 !ruby/object:Gem::Requirement
+  requirement: &82750030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84200310
+  version_requirements: *82750030
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &84190140 !ruby/object:Gem::Requirement
+  requirement: &82747580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *84190140
+  version_requirements: *82747580
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &84189750 !ruby/object:Gem::Requirement
+  requirement: &82746360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *84189750
+  version_requirements: *82746360
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &84189340 !ruby/object:Gem::Requirement
+  requirement: &82736970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *84189340
+  version_requirements: *82736970
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &84188810 !ruby/object:Gem::Requirement
+  requirement: &82735660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *84188810
+  version_requirements: *82735660
 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: