streama 0.3.2 → 0.3.4

data/lib/streama/definition.rb

@@ -2,14 +2,14 @@ module Streama
   
   class Definition
     
-    attr_reader :name, :actor, :object, :target, :receivers
+    attr_reader :name, :actor, :object, :target_object, :receivers
     
     # @param dsl [Streama::DefinitionDSL] A DSL object
     def initialize(definition)
       @name = definition[:name]
       @actor = definition[:actor] || {}
       @object = definition[:object] || {}
-      @target = definition[:target] || {}
+      @target_object = definition[:target_object] || {}
     end
     
     #

data/lib/streama/definition_dsl.rb

@@ -9,12 +9,17 @@ module Streama
         :name => name.to_sym,
         :actor => {}, 
         :object => {}, 
-        :target => {}
+        :target_object => {}
       }
     end
     
     delegate :[], :to => :@attributes
-        
+    
+    def target(*args)
+      warn "[DEPRECATION] #target is deprecated. Please use #target_object instead."
+      @attributes[:target_object].store(args[0].is_a?(Symbol) ? args[0] : args[0].class.to_sym, args[1])
+    end
+    
     def self.data_methods(*args)
       args.each do |method|
         define_method method do |*args|
@@ -22,7 +27,7 @@ module Streama
         end
       end
     end
-    data_methods :actor, :object, :target
+    data_methods :actor, :object, :target_object
 
   end
   

data/lib/streama/version.rb

@@ -0,0 +1,3 @@
+module Streama
+  VERSION = "0.3.4"
+end

data/spec/app/models/activity.rb

@@ -0,0 +1,21 @@
+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

data/spec/{support/models/listing.rb → app/models/album.rb}

@@ -1,4 +1,4 @@
-class Listing
+class Album
   include Mongoid::Document
   
   field :title

data/spec/{support/models/enquiry.rb → app/models/photo.rb}

@@ -1,6 +1,6 @@
-class Enquiry
+class Photo
   include Mongoid::Document
   
-  field :comment
+  field :file
   
 end

data/spec/lib/activity_spec.rb

@@ -2,37 +2,57 @@ require 'spec_helper'
 
 describe "Activity" do
 
-  let(:enquiry) { Enquiry.create(:comment => "I'm interested") }
-  let(:listing) { Listing.create(:title => "A test listing") }
+  let(:photo) { Photo.create(:file => "image.jpg") }
+  let(:album) { Album.create(:title => "A test album") }
   let(:user) { User.create(:full_name => "Christos") }
 
-  describe '.activity' do
+  describe ".activity" do
     it "registers and return a valid definition" do
-      @definition = Activity.activity(:new_enquiry) do
+      @definition = Activity.activity(:test_activity) do
         actor :user, :cache => [:full_name]
-        object :enquiry, :cache => [:comment]
-        object :listing, :cache => [:title, :full_address]
-        target :listing, :cache => [:title]
+        object :photo, :cache => [:file]
+        target_object :album, :cache => [:title]
       end
       
       @definition.is_a?(Streama::Definition).should be true
     end
+    
   end
   
-  describe '#publish' do
+  describe "#publish" do
+
+    before :each do
+      @send_to = []
+      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
+    end
+
+
+    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
-      send_to = []
-      2.times { |n| send_to << User.create(:full_name => "Custom Receiver #{n}") }
-      5.times { |n| User.create(:full_name => "Receiver #{n}") }
-      @activity = Activity.publish(:new_enquiry, {:actor => user, :object => enquiry, :target => listing, :receivers => send_to})
+      @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_enquiry, {:actor => @actor, :object => enquiry, :target => listing})
+        @activity = Activity.publish(:new_photo, {:actor => @actor, :object => photo, :target_object => album})
         @activity.publish
       end
       
@@ -44,18 +64,18 @@ describe "Activity" do
       end
   end
   
-  describe '.publish' do
+  describe ".publish" do
     it "creates a new activity" do
-      activity = Activity.publish(:new_enquiry, {:actor => user, :object => enquiry, :target => listing})
+      activity = Activity.publish(:new_photo, {:actor => user, :object => photo, :target_object => album})
       activity.should be_an_instance_of Activity
     end
   end
 
-  describe '#refresh' do
+  describe "#refresh" do
     
     before :each do
       @user = user
-      @activity = Activity.publish(:new_enquiry, {:actor => @user, :object => enquiry, :target => listing})
+      @activity = Activity.publish(:new_photo, {:actor => @user, :object => photo, :target_object => album})
     end
     
     it "reloads instances and updates activities stored data" do
@@ -70,10 +90,10 @@ describe "Activity" do
     
   end
 
-  describe '#load_instance' do
+  describe "#load_instance" do
     
     before :each do
-      @activity = Activity.publish(:new_enquiry, {:actor => user, :object => enquiry, :target => listing})
+      @activity = Activity.publish(:new_photo, {:actor => user, :object => photo, :target_object => album})
       @activity = Activity.last
     end
     
@@ -82,11 +102,11 @@ describe "Activity" do
     end
     
     it "loads an object instance" do
-      @activity.load_instance(:object).should be_instance_of Enquiry
+      @activity.load_instance(:object).should be_instance_of Photo
     end
     
     it "loads a target instance" do
-      @activity.load_instance(:target).should be_instance_of Listing
+      @activity.load_instance(:target_object).should be_instance_of Album
     end
     
   end

data/spec/lib/actor_spec.rb

@@ -1,54 +1,45 @@
 require 'spec_helper'
 
 describe "Actor" do
-  
-  let(:enquiry) { Enquiry.create(:comment => "I'm interested") }
-  let(:listing) { Listing.create(:title => "A test listing") }
+
+  let(:photo) { Photo.create(:comment => "I'm interested") }
+  let(:album) { Album.create(:title => "A test album") }
   let(:user) { User.create(:full_name => "Christos") }
-  
-  before :all do
-    Activity.activity :new_comment do
-      actor :user, :cache => [:full_name]
-      object :listing, :cache => [:title]
-      target :listing, :cache => [:title]
-    end
-  end
-  
+
   describe "#publish_activity" do
-    
     before :each do
-      5.times { |n| User.create(:full_name => "Receiver #{n}") }
+      2.times { |n| User.create(:full_name => "Receiver #{n}") }
     end
-    
+
     it "pushes activity to receivers" do
-      activity = user.publish_activity(:new_enquiry, :object => enquiry, :target => listing)
+      activity = user.publish_activity(:new_photo, :object => photo, :target_object => album)
       activity.receivers.size == 6
     end
-    
+
     it "pushes to a defined stream" do
-      activity = user.publish_activity(:new_enquiry, :object => enquiry, :target => listing, :receivers => :friends)
+      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
-      5.times { |n| User.create(:full_name => "Receiver #{n}") }
-      user.publish_activity(:new_enquiry, :object => enquiry, :target => listing)
-      user.publish_activity(:new_comment, :object => listing)
+      2.times { |n| User.create(:full_name => "Receiver #{n}") }
+      user.publish_activity(:new_photo, :object => photo, :target_object => album)
+      user.publish_activity(:new_comment, :object => photo)
     end
-    
+
     it "retrieves the stream for an actor" do
       user.activity_stream.size.should eq 2
     end
-    
+
     it "retrieves the stream and filters to a particular activity type" do
-      user.activity_stream(:type => :new_comment).size.should eq 1
+      user.activity_stream(:type => :new_photo).size.should eq 1
     end
-        
+
   end
-  
-  
-end
+
+
+end

data/spec/lib/definition_dsl_spec.rb

@@ -28,9 +28,15 @@ describe "Definition" do
   end
 
   it "adds a target to the definition" do
+    dsl = definition_dsl
+    dsl.target_object(:company, :cache => [:id, :name])
+    dsl.attributes[:target_object].should eq :company => { :cache=>[:id, :name] }
+  end
+  
+  it "deprecates target method" do
     dsl = definition_dsl
     dsl.target(:company, :cache => [:id, :name])
-    dsl.attributes[:target].should eq :company => { :cache=>[:id, :name] }
+    dsl.attributes[:target_object].should eq :company => { :cache=>[:id, :name] }
   end
   
 end

data/spec/lib/definition_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe "Definition" do
   
   let(:definition_dsl) do
-    dsl = Streama::DefinitionDSL.new(:new_enquiry)
+    dsl = Streama::DefinitionDSL.new(:new_photo)
     dsl.actor(:user, :cache => [:id, :full_name])
-    dsl.object(:enquiry, :cache => [:id, :full_name])
-    dsl.target(:listing, :cache => [:id, :name, :full_address])
+    dsl.object(:photo, :cache => [:id, :full_name])
+    dsl.target_object(:album, :cache => [:id, :name, :full_address])
     dsl
   end
   
@@ -20,11 +20,11 @@ describe "Definition" do
       @definition.actor.has_key?(:user).should be true
     end
     it "assigns @object" do
-      @definition.object.has_key?(:enquiry).should be true
+      @definition.object.has_key?(:photo).should be true
     end
     
     it "assigns @target" do
-      @definition.target.has_key?(:listing).should be true
+      @definition.target_object.has_key?(:album).should be true
     end
     
   end
@@ -53,7 +53,7 @@ describe "Definition" do
   describe '.find' do
     
     it "returns the definition by name" do
-      Streama::Definition.find(:new_enquiry).name.should eq :new_enquiry
+      Streama::Definition.find(:new_photo).name.should eq :new_photo
     end
     
     it "raises an exception if invalid activity" do

data/spec/spec_helper.rb

@@ -1,25 +1,45 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+MODELS = File.join(File.dirname(__FILE__), "app/models")
+SUPPORT = File.join(File.dirname(__FILE__), "support")
+$LOAD_PATH.unshift(MODELS)
+$LOAD_PATH.unshift(SUPPORT)
 
-require 'rspec'
 require 'streama'
 require 'mongoid'
+require 'rspec'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+LOGGER = Logger.new($stdout)
+DATABASE_ID = Process.pid
 
 Mongoid.configure do |config|
-  name = "streama-rspec-test"
-  host = "localhost"
-  config.master = Mongo::Connection.new.db(name)
+  database = Mongo::Connection.new.db("mongoid_#{DATABASE_ID}")
+  database.add_user("mongoid", "test")
+  config.master = database
+  config.logger = nil
+end
+
+Dir[ File.join(MODELS, "*.rb") ].sort.each do |file|
+  name = File.basename(file, ".rb")
+  autoload name.camelize.to_sym, name
+end
+
+Dir[ File.join(SUPPORT, "*.rb") ].each do |file|
+  require File.basename(file)
 end
 
 RSpec.configure do |config|
   config.include RSpec::Matchers
   config.include Mongoid::Matchers
   config.mock_with :rspec
-  config.after :each do
-    Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
+  
+  config.before(:each) do
+    Mongoid::IdentityMap.clear
+  end
+  
+  config.after :suite do
+    Mongoid.master.connection.drop_database("mongoid_#{DATABASE_ID}")
   end
+  
 end

data/streama.gemspec

@@ -1,75 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "streama/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{streama}
-  s.version = "0.3.2"
+  s.name        = "streama"
+  s.version     = Streama::VERSION
+  s.authors     = ["Christos Pappas"]
+  s.email       = ["christos.pappas@gmail.com"]
+  s.homepage    = ""
+  s.summary     = %q{Activity Streams for Mongoid}
+  s.description = %q{Streama is a simple activity stream gem for use with the Mongoid ODM framework}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Christos Pappas"]
-  s.date = %q{2011-06-29}
-  s.description = %q{Streama is a simple activity stream gem for use with the Mongoid ODM framework.}
-  s.email = %q{christos.pappas@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/streama.rb",
-    "lib/streama/activity.rb",
-    "lib/streama/actor.rb",
-    "lib/streama/definition.rb",
-    "lib/streama/definition_dsl.rb",
-    "lib/streama/errors.rb",
-    "spec/lib/activity_spec.rb",
-    "spec/lib/actor_spec.rb",
-    "spec/lib/definition_dsl_spec.rb",
-    "spec/lib/definition_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/models/activity.rb",
-    "spec/support/models/enquiry.rb",
-    "spec/support/models/listing.rb",
-    "spec/support/models/user.rb",
-    "streama.gemspec"
-  ]
-  s.homepage = %q{http://github.com/christospappas/streama}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Streama is a simple activity stream gem for use with the Mongoid ODM framework.}
+  s.rubyforge_project = "streama"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.1"])
-    else
-      s.add_dependency(%q<activesupport>, ["~> 3.0"])
-      s.add_dependency(%q<mongoid>, ["~> 2.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.1"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, ["~> 3.0"])
-    s.add_dependency(%q<mongoid>, ["~> 2.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.1"])
-  end
+  s.add_development_dependency "rspec", "~> 2.5"
+  s.add_development_dependency "mongoid", "~> 2.4"
+  s.add_development_dependency "bson_ext", "~> 1.5"
+  s.add_development_dependency "rake"
 end
-