social_stream-base 0.19.0 → 0.19.1

data/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/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/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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ 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: rails
-  requirement: &86758160 !ruby/object:Gem::Requirement
+  requirement: &82053200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *86758160
+  version_requirements: *82053200
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &86757430 !ruby/object:Gem::Requirement
+  requirement: &82052710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *86757430
+  version_requirements: *82052710
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &86757050 !ruby/object:Gem::Requirement
+  requirement: &82052290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *86757050
+  version_requirements: *82052290
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &86756810 !ruby/object:Gem::Requirement
+  requirement: &82051510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *86756810
+  version_requirements: *82051510
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &86756490 !ruby/object:Gem::Requirement
+  requirement: &82051160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *86756490
+  version_requirements: *82051160
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &86756120 !ruby/object:Gem::Requirement
+  requirement: &82050870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *86756120
+  version_requirements: *82050870
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &86755770 !ruby/object:Gem::Requirement
+  requirement: &82050490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *86755770
+  version_requirements: *82050490
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &86755180 !ruby/object:Gem::Requirement
+  requirement: &82050240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *86755180
+  version_requirements: *82050240
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &86754850 !ruby/object:Gem::Requirement
+  requirement: &82049940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *86754850
+  version_requirements: *82049940
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &86742010 !ruby/object:Gem::Requirement
+  requirement: &82049530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *86742010
+  version_requirements: *82049530
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &86741350 !ruby/object:Gem::Requirement
+  requirement: &82049140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *86741350
+  version_requirements: *82049140
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &86740750 !ruby/object:Gem::Requirement
+  requirement: &82048660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *86740750
+  version_requirements: *82048660
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &86740230 !ruby/object:Gem::Requirement
+  requirement: &82048060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *86740230
+  version_requirements: *82048060
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &86739800 !ruby/object:Gem::Requirement
+  requirement: &80850010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *86739800
+  version_requirements: *80850010
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &86739310 !ruby/object:Gem::Requirement
+  requirement: &80847300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *86739310
+  version_requirements: *80847300
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &86738770 !ruby/object:Gem::Requirement
+  requirement: &80845980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *86738770
+  version_requirements: *80845980
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &86738450 !ruby/object:Gem::Requirement
+  requirement: &80836730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 1.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *86738450
+  version_requirements: *80836730
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &86738180 !ruby/object:Gem::Requirement
+  requirement: &80834710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *86738180
+  version_requirements: *80834710
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &86737860 !ruby/object:Gem::Requirement
+  requirement: &80832000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *86737860
+  version_requirements: *80832000
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &86737340 !ruby/object:Gem::Requirement
+  requirement: &80830520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,10 +231,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *86737340
+  version_requirements: *80830520
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &86736820 !ruby/object:Gem::Requirement
+  requirement: &80827690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -242,10 +242,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *86736820
+  version_requirements: *80827690
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &86736400 !ruby/object:Gem::Requirement
+  requirement: &80826760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *86736400
+  version_requirements: *80826760
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &86736110 !ruby/object:Gem::Requirement
+  requirement: &80824260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *86736110
+  version_requirements: *80824260
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &86735670 !ruby/object:Gem::Requirement
+  requirement: &80822270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *86735670
+  version_requirements: *80822270
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &86735000 !ruby/object:Gem::Requirement
+  requirement: &80820130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -286,10 +286,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86735000
+  version_requirements: *80820130
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &86734620 !ruby/object:Gem::Requirement
+  requirement: &80802380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86734620
+  version_requirements: *80802380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &86724410 !ruby/object:Gem::Requirement
+  requirement: &80800060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -308,10 +308,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *86724410
+  version_requirements: *80800060
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &86724010 !ruby/object:Gem::Requirement
+  requirement: &80798980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *86724010
+  version_requirements: *80798980
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &86723630 !ruby/object:Gem::Requirement
+  requirement: &80796760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *86723630
+  version_requirements: *80796760
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &86723160 !ruby/object:Gem::Requirement
+  requirement: &80788160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *86723160
+  version_requirements: *80788160
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &86722730 !ruby/object:Gem::Requirement
+  requirement: &80783760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,7 +352,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *86722730
+  version_requirements: *80783760
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.