streama 0.3.6 → 0.3.7

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+services: mongodb
 matrix:
   include:
     - rvm: 1.9.3

data/lib/streama/activity.rb

@@ -1,9 +1,9 @@
 module Streama
   module Activity
     extend ActiveSupport::Concern
-    
+
     included do
-      
+
       include Mongoid::Document
       include Mongoid::Timestamps
 
@@ -13,7 +13,6 @@ module Streama
       field :target_object
       field :receivers,     :type => Array
 
-      index :name => 1
       index({ 'actor._id' => 1, 'actor._type' => 1 })
       index({ 'object._id' => 1, 'object._type' => 1 })
       index({ 'target_object._id' => 1, 'target_object._type' => 1 })
@@ -21,9 +20,9 @@ module Streama
 
       validates_presence_of :actor, :verb
       before_save :assign_data
-      
+
     end
-    
+
     module ClassMethods
 
       # Defines a new activity type and registers a definition
@@ -54,33 +53,33 @@ module Streama
         receivers = data.delete(:receivers)
         new({:verb => verb}.merge(data)).publish(:receivers => receivers)
       end
-      
+
       def stream_for(actor, options={})
         query = {:receivers => {'$elemMatch' => {:id => actor.id, :type => actor.class.to_s}}}
-        query.merge!({:verb => options[:type]}) if options[:type]
+        query.merge!({:verb.in => [*options[:type]]}) if options[:type]
         self.where(query).without(:receivers).desc(:created_at)
       end
 
       def stream_of(actor, options={})
          query = {'actor.id' => actor.id, 'actor.type' => actor.class.to_s}
-         query.merge!({:verb => options[:type]}) if options[:type]
+         query.merge!({:verb.in => [*options[:type]]}) if options[:type]
          self.where(query).without(:receivers).desc(:created_at)
       end
-      
+
     end
 
-    
+
     # Publishes the activity to the receivers
     #
     # @param [ Hash ] options The options to publish with.
     #
     def publish(options = {})
-      actor = load_instance(:actor) 
+      actor = load_instance(:actor)
       self.receivers = (options[:receivers] || actor.followers).map { |r| { :id => r.id, :type => r.class.to_s } }
       self.save
       self
     end
-    
+
     # Returns an instance of an actor, object or target
     #
     # @param [ Symbol ] type The data type (actor, object, target) to return an instance for.
@@ -89,38 +88,38 @@ module Streama
     def load_instance(type)
       (data = self.read_attribute(type)).is_a?(Hash) ? data['type'].to_s.camelcase.constantize.find(data['id']) : data
     end
-  
+
     def refresh_data
       assign_data
       save(:validates_presence_of => false)
     end
-  
+
     protected
-      
+
     def assign_data
-    
+
       [:actor, :object, :target_object].each do |type|
         next unless object = load_instance(type)
 
         class_sym = object.class.name.underscore.to_sym
 
         raise Errors::InvalidData.new(class_sym) unless definition.send(type).has_key?(class_sym)
-    
+
         hash = {'id' => object.id, 'type' => object.class.name}
-              
+
         if fields = definition.send(type)[class_sym].try(:[],:cache)
           fields.each do |field|
             raise Errors::InvalidField.new(field) unless object.respond_to?(field)
             hash[field.to_s] = object.send(field)
           end
         end
-        write_attribute(type, hash)      
+        write_attribute(type, hash)
       end
     end
-  
+
     def definition
       @definition ||= Streama::Definition.find(verb)
     end
-    
+
   end
 end

data/lib/streama/definition_dsl.rb

@@ -1,29 +1,34 @@
 module Streama
-  
+
   class DefinitionDSL
-    
+
     attr_reader :attributes
-    
+
     def initialize(name)
       @attributes = {
         :name => name.to_sym,
-        :actor => {}, 
-        :object => {}, 
+        :actor => {},
+        :object => {},
         :target_object => {}
       }
     end
-    
+
     delegate :[], :to => :@attributes
-    
+
     def self.data_methods(*args)
       args.each do |method|
         define_method method do |*args|
-          @attributes[method].store(args[0].is_a?(Symbol) ? args[0] : args[0].class.to_sym, args[1])
+          class_sym = if class_name = args[1].try(:delete,:class_name)
+                        class_name.underscore.to_sym
+                      else
+                        args[0].is_a?(Symbol) ? args[0] : args[0].class.to_sym
+                      end
+          @attributes[method].store(class_sym, args[1])
         end
       end
     end
     data_methods :actor, :object, :target_object
 
   end
-  
-end
+
+end

data/lib/streama/version.rb

@@ -1,3 +1,3 @@
 module Streama
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/spec/app/models/activity.rb

@@ -1,21 +1,32 @@
 class Activity
   include Streama::Activity
-  
+
   activity :new_photo do
     actor :user, :cache => [:full_name]
     object :photo, :cache => [:file]
     target_object :album, :cache => [:title]
   end
-  
+
   activity :new_photo_without_cache do
     actor :user
     object :photo
     target_object :album
   end
-  
+
   activity :new_comment do
     actor :user, :cache => [:full_name]
     object :photo
   end
-    
-end
+
+  activity :new_tag do
+    actor :user, :cache => [:full_name]
+    object :photo
+  end
+
+  activity :new_mars_photo do
+    actor :user, :cache => [:full_name], :class_name => 'Mars::User'
+    object :photo
+    target_object :album, :cache => [:title]
+  end
+
+end

data/spec/app/models/mars/user.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+module Mars
+  class User
+    include Mongoid::Document
+    include Streama::Actor
+
+    field :full_name
+
+    def followers
+      self.class.all
+    end
+
+  end
+
+end

data/spec/lib/activity_spec.rb

@@ -5,6 +5,7 @@ describe "Activity" do
   let(:photo) { Photo.create(:file => "image.jpg") }
   let(:album) { Album.create(:title => "A test album") }
   let(:user) { User.create(:full_name => "Christos") }
+  let(:mars_user) { Mars::User.create(:full_name => "Mars User") }
 
   describe ".activity" do
     it "registers and return a valid definition" do
@@ -13,12 +14,12 @@ describe "Activity" do
         object :photo, :cache => [:file]
         target_object :album, :cache => [:title]
       end
-      
+
       @definition.is_a?(Streama::Definition).should be true
     end
-    
+
   end
-  
+
   describe "#publish" do
 
     before :each do
@@ -26,7 +27,7 @@ describe "Activity" do
       2.times { |n| @send_to << User.create(:full_name => "Custom Receiver #{n}") }
       5.times { |n| User.create(:full_name => "Receiver #{n}") }
     end
-    
+
     it "pushes activity to receivers" do
       @activity = Activity.publish(:new_photo, {:actor => user, :object => photo, :target_object => album, :receivers => @send_to})
       @activity.receivers.size.should == 2
@@ -34,28 +35,28 @@ describe "Activity" do
 
 
     context "when activity not cached" do
-      
+
       it "pushes activity to receivers" do
         @activity = Activity.publish(:new_photo_without_cache, {:actor => user, :object => photo, :target_object => album, :receivers => @send_to})
         @activity.receivers.size.should == 2
       end
-      
+
     end
-    
+
     it "overrides the recievers if option passed" do
       @activity = Activity.publish(:new_photo, {:actor => user, :object => photo, :target_object => album, :receivers => @send_to})
       @activity.receivers.size.should == 2
     end
-    
 
-    
+
+
     context "when republishing"
       before :each do
         @actor = user
         @activity = Activity.publish(:new_photo, {:actor => @actor, :object => photo, :target_object => album})
         @activity.publish
       end
-      
+
       it "updates metadata" do
         @actor.full_name = "testing"
         @actor.save
@@ -63,52 +64,58 @@ describe "Activity" do
         @activity.actor['full_name'].should eq "testing"
       end
   end
-  
+
   describe ".publish" do
     it "creates a new activity" do
       activity = Activity.publish(:new_photo, {:actor => user, :object => photo, :target_object => album})
       activity.should be_an_instance_of Activity
     end
+
+    it " creates a new activity when actor has namespace" do
+      activity = Activity.publish(:new_mars_photo, {:actor => mars_user, :object => photo, :target_object => album})
+      activity.should be_an_instance_of Activity
+    end
+
   end
 
   describe "#refresh" do
-    
+
     before :each do
       @user = user
       @activity = Activity.publish(:new_photo, {:actor => @user, :object => photo, :target_object => album})
     end
-    
+
     it "reloads instances and updates activities stored data" do
       @activity.save
-      @activity = Activity.last    
-      
+      @activity = Activity.last
+
       expect do
         @user.update_attribute(:full_name, "Test")
         @activity.refresh_data
       end.to change{ @activity.load_instance(:actor).full_name}.from("Christos").to("Test")
     end
-    
+
   end
 
   describe "#load_instance" do
-    
+
     before :each do
       @activity = Activity.publish(:new_photo, {:actor => user, :object => photo, :target_object => album})
       @activity = Activity.last
     end
-    
+
     it "loads an actor instance" do
       @activity.load_instance(:actor).should be_instance_of User
     end
-    
+
     it "loads an object instance" do
       @activity.load_instance(:object).should be_instance_of Photo
     end
-    
+
     it "loads a target instance" do
       @activity.load_instance(:target_object).should be_instance_of Album
     end
-    
+
   end
-  
+
 end

data/spec/lib/actor_spec.rb

@@ -5,7 +5,7 @@ describe "Actor" do
   let(:photo) { Photo.create(:comment => "I'm interested") }
   let(:album) { Album.create(:title => "A test album") }
   let(:user) { User.create(:full_name => "Christos") }
-  
+
   it "raises an exception if the class is not a mongoid document" do
     lambda { NoMongoid.new }.should raise_error Streama::Errors::NotMongoid
   end
@@ -24,48 +24,57 @@ describe "Actor" do
       activity = user.publish_activity(:new_photo, :object => photo, :target_object => album, :receivers => :friends)
       activity.receivers.size == 6
     end
-    
+
   end
 
   describe "#activity_stream" do
-    
+
     before :each do
       user.publish_activity(:new_photo, :object => photo, :target_object => album)
       user.publish_activity(:new_comment, :object => photo)
 
       u = User.create(:full_name => "Other User")
       u.publish_activity(:new_photo, :object => photo, :target_object => album)
+      u.publish_activity(:new_tag, :object => photo)
 
     end
 
     it "retrieves the stream for an actor" do
-      user.activity_stream.size.should eq 3
+      user.activity_stream.size.should eq 4
     end
 
     it "retrieves the stream and filters to a particular activity type" do
       user.activity_stream(:type => :new_photo).size.should eq 2
     end
 
+    it "retrieves the stream and filters to a couple particular activity types" do
+      user.activity_stream(:type => [:new_tag, :new_comment]).size.should eq 2
+    end
+
   end
-  
+
   describe "#published_activities" do
     before :each do
-      user.publish_activity(:new_photo, :object => photo, :target_object => album)      
+      user.publish_activity(:new_photo, :object => photo, :target_object => album)
       user.publish_activity(:new_comment, :object => photo)
-      
+      user.publish_activity(:new_tag, :object => photo)
+
       u = User.create(:full_name => "Other User")
       u.publish_activity(:new_photo, :object => photo, :target_object => album)
-
     end
-    
+
     it "retrieves published activities for the actor" do
-      user.published_activities.size.should eq 2
+      user.published_activities.size.should eq 3
     end
-    
+
     it "retrieves and filters published activities by type for the actor" do
       user.published_activities(:type => :new_photo).size.should eq 1
     end
-    
+
+    it "retrieves and filters published activities by a couple types for the actor" do
+      user.published_activities(:type => [:new_comment, :new_tag]).size.should eq 2
+    end
+
   end
 
 

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require "pry"
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
@@ -10,7 +11,7 @@ require 'streama'
 require 'mongoid'
 require 'rspec'
 require 'database_cleaner'
- 
+
 LOGGER = Logger.new($stdout)
 
 DatabaseCleaner.strategy = :truncation
@@ -27,6 +28,7 @@ Dir[ File.join(MODELS, "*.rb") ].sort.each do |file|
   name = File.basename(file, ".rb")
   autoload name.camelize.to_sym, name
 end
+require File.join(MODELS,"mars","user.rb")
 
 Dir[ File.join(SUPPORT, "*.rb") ].each do |file|
   require File.basename(file)
@@ -36,20 +38,20 @@ RSpec.configure do |config|
   config.include RSpec::Matchers
   config.include Mongoid::Matchers
   config.mock_with :rspec
-  
+
   config.before(:each) do
     DatabaseCleaner.start
     Mongoid::IdentityMap.clear
   end
-  
+
   config.after(:each) do
     DatabaseCleaner.clean
   end
-  
+
   config.after(:suite) do
     if ENV["CI"]
       Mongoid::Threaded.sessions[:default].drop
     end
   end
-  
+
 end

data/streama.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency("mongoid", "~> 3.0.0")
+
   s.add_development_dependency "rspec", "~> 2.5"
   s.add_development_dependency "database_cleaner", "~> 0.8"
-  s.add_development_dependency "mongoid", "~> 3.0.0"
+  s.add_development_dependency "pry"
   s.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: streama
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70100852275820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +37,15 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70100852275820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70100852275320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +53,31 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70100852275320
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: &70100852274860 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100852274860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70100852274480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100852274480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Streama is a simple activity stream gem for use with the Mongoid ODM
   framework
 email:
@@ -81,6 +117,7 @@ files:
 - lib/streama/version.rb
 - spec/app/models/activity.rb
 - spec/app/models/album.rb
+- spec/app/models/mars/user.rb
 - spec/app/models/no_mongoid.rb
 - spec/app/models/photo.rb
 - spec/app/models/user.rb
@@ -102,27 +139,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4280395878127855216
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4280395878127855216
 requirements: []
 rubyforge_project: streama
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Activity Streams for Mongoid
 test_files:
 - spec/app/models/activity.rb
 - spec/app/models/album.rb
+- spec/app/models/mars/user.rb
 - spec/app/models/no_mongoid.rb
 - spec/app/models/photo.rb
 - spec/app/models/user.rb
@@ -131,3 +163,4 @@ test_files:
 - spec/lib/definition_dsl_spec.rb
 - spec/lib/definition_spec.rb
 - spec/spec_helper.rb
+has_rdoc: