activist 0.0.3 → 0.0.4

data/.rvmrc

@@ -0,0 +1,2 @@
+rvm 1.9.2
+rvm gemset use activist

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activist (0.0.1)
+    activist (0.0.4)
       activesupport (~> 3.0)
       redis (~> 2.2)
       redis-namespace (= 0.10.0)

data/README.markdown

@@ -4,6 +4,10 @@ Activity stream in rails 3.0 applications
 
 Based on http://activitystrea.ms/spec/1.0/atom-activity-01.html
 
+## Requirements ##
+
+* Redis
+
 ## Installation ##
 
 Just run the following command :
@@ -20,17 +24,17 @@ And run
 
 ## Usage ##
 
-First generate a friendship model :
+First generate a status model :
 
     rails generate activist:install
 
-This command creates a new model called __Action__ in *'app/models'* :
+This command creates a new model called __ActivistStatus__ in *'app/models'* :
 
-    class Status < ActiveRecord::Base
+    class ActivistStatus < ActiveRecord::Base
       serialize :data, Hash
     end
 
-It also creates a new migration for the Status model so don't forget to migrate your database :
+It also creates a new migration for the __ActivistStatus__ model so don't forget to migrate your database :
 
     rake db:migrate
 
@@ -47,3 +51,24 @@ Then add __activist__ in your user model :
         [user]
       end
     end
+
+And finally create some activities :
+
+    class Post < ActiveRecord::Base
+      include Activist::Action
+      
+      belongs_to :user
+      
+      activities :public, :on => :after_create
+      activities :private, :actor => :user, :action => :posted, :on => :after_create
+      activities :public, :on => :after_update, :data => proc { |post| post.changes }
+      
+      after_destroy
+        activity :private, :action => :deleted
+      end
+      
+      def promote
+        self.title = "[PROMOTED] #{self.title}"
+        activity :private, :action => :promoted, :data => proc { |post| { :title => post.title } }
+      end
+    end

data/activist.gemspec

@@ -1,33 +1,33 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "activist/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'activist/version'
 
 Gem::Specification.new do |s|
-  s.name        = "activist"
+  s.name        = 'activist'
   s.version     = Activist::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Adrian Dulić"]
-  s.email       = ["adulic@gmail.com"]
-  s.homepage    = "http://github.com/adriandulic/activist"
-  s.summary     = %q{Activity stream in rails 3.0 application}
-  s.description = %q{Activity stream in rails 3.0 application}
-
-  s.extra_rdoc_files = ["README.markdown"]
-
-  s.required_rubygems_version = ">= 1.3.6"
+  s.authors     = ['Adrian Dulić']
+  s.email       = ['adulic@gmail.com']
+  s.homepage    = 'http://github.com/adriandulic/activist'
+  s.summary     = %q{Redis and database based activity stream in Rails 3 applications}
+  s.description = %q{Redis and database based activity stream in Rails 3 applications}
+  
+  s.extra_rdoc_files = ['README.markdown']
+  
+  s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project = s.name
-
-  s.add_dependency "redis", "~> 2.2"
-  s.add_dependency "redis-namespace", "0.10.0"
-  s.add_dependency "activesupport", "~> 3.0"
-
-  s.add_development_dependency "bundler", "~> 1.0"
-  s.add_development_dependency "rspec", "~> 2.0"
-  s.add_development_dependency "activerecord", "~> 3.0"
-  s.add_development_dependency "sqlite3-ruby", "~> 1.3.2"
-
+  
+  s.add_dependency 'redis', '~> 2.2'
+  s.add_dependency 'redis-namespace', '0.10.0'
+  s.add_dependency 'activesupport', '~> 3.0'
+  
+  s.add_development_dependency 'bundler', '~> 1.0'
+  s.add_development_dependency 'rspec', '~> 2.0'
+  s.add_development_dependency 'activerecord', '~> 3.0'
+  s.add_development_dependency 'sqlite3-ruby', '~> 1.3.2'
+  
   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"]
+  s.require_paths = ['lib']
 end

data/lib/activist.rb

@@ -3,9 +3,9 @@ require 'redis/namespace'
 require 'redis'
 
 module Activist
+  autoload :Action, 'activist/action'
+  autoload :Actor, 'activist/actor'
   autoload :Redis, 'activist/redis'
   autoload :Store, 'activist/store'
-  autoload :Actor, 'activist/actor'
-  autoload :Action, 'activist/action'
   autoload :Stream, 'activist/stream'
 end

data/lib/activist/action.rb

@@ -6,7 +6,7 @@ module Activist
     module ClassMethods
       def activities(stream, options = {})
         options.symbolize_keys!
-        callback = options[:when]
+        callback = options[:on] || ''
         
         define_method "activist_#{stream}_#{callback}" do
           store_activities(stream, options)

data/lib/activist/actor.rb

@@ -1,8 +1,6 @@
 module Activist
   module Actor
-    def self.included(receiver)
-      receiver.extend(ClassMethods)
-    end
+    extend ActiveSupport::Concern
     
     module ClassMethods
       def stream(stream, &block)

data/lib/activist/store.rb

@@ -3,9 +3,38 @@ module Activist
     extend ActiveSupport::Concern
     
     module InstanceMethods
+      # Options:
+      # :actor (optional)
+      # :action (optional)
+      # :on (required)
+      # :data (optional)
+      # :if (optional)
+      # :unless (optional)
       def store_activities(stream, options = {})
         options.symbolize_keys!
-        callback = options.delete(:when)
+        
+        callback = options.delete(:on)
+        
+        if_condition = case options[:if]
+          when Symbol
+            send(options[:if])
+          when Proc
+            options[:if].call(self)
+          else
+            true
+        end
+        return unless if_condition
+        
+        unless_condition = case options[:unless]
+          when Symbol
+            send(options[:unless])
+          when Proc
+            options[:unless].call(self)
+          else
+            false
+        end
+        return if unless_condition
+        
         actor = case options[:actor]
           when nil
             send(:user)
@@ -14,8 +43,9 @@ module Activist
           when Proc
             options[:actor].call(self)
           else
-            options[:actor]
+            nil
         end
+        
         action = if options[:action].nil?
           case callback
             when :before_create, :after_create
@@ -27,14 +57,22 @@ module Activist
             when :before_destroy, :after_destroy
               options[:action] = :destroyed
             else
-              options[:action] = :undefined
+              nil
           end
         else
           options[:action]
         end
-        data = options[:data]
         
-        status = ::Status.create! do |s|
+        data = case options[:data]
+          when Hash
+            options[:data]
+          when Proc
+            options[:data].call(self)
+          else
+            nil
+        end
+        
+        status = ::ActivistStatus.create! do |s|
           s.actor_class = actor.class.to_s
           s.actor_id = actor.id
           s.action = action

data/lib/activist/stream.rb

@@ -15,8 +15,10 @@ module Activist
     end
     
     def all(options={})
-      activities = Redis.execute.lrange(to_key, options[:offset] || 0, options[:limit] || size)
-      ::Status.where(:id => activities)
+      options[:offset] ||= 0
+      options[:limit] ||= size.to_i
+      activities = Redis.execute.lrange(to_key, options[:offset], options[:offset] + options[:limit])
+      ::ActivistStatus.where(:id => activities)
     end
     
     def size
@@ -28,7 +30,7 @@ module Activist
     end
     
     def to_key
-      "#{@actor.class}.#{@actor.id}:#{@name}"
+      "#{actor.class}.#{actor.id}:#{name}"
     end
   end
 end

data/lib/activist/version.rb

@@ -1,3 +1,3 @@
 module Activist
-  VERSION = "0.0.3"
+  VERSION = '0.0.4'
 end

data/lib/generators/activist/install/install_generator.rb

@@ -5,19 +5,19 @@ module Activist
   module Generators
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
-
+      
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
-
+      
       def self.next_migration_number
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
+        Time.now.utc.strftime('%Y%m%d%H%M%S')
       end
-
-      desc "This generator creates a status model and its migration file"
+      
+      desc 'This generator creates a status model and its migration file'
       def create_friendship_model_files
-        template 'status.rb', 'app/models/status.rb'
-        template 'create_statuses.rb', "db/migrate/#{self.class.next_migration_number}_create_statuses.rb"
+        template 'activist_status.rb', 'app/models/activist_status.rb'
+        template 'create_activist_statuses.rb', "db/migrate/#{self.class.next_migration_number}_create_activist_statuses.rb"
       end
     end
   end

data/lib/generators/activist/install/templates/activist_status.rb

@@ -0,0 +1,3 @@
+class ActivistStatus < ActiveRecord::Base
+  serialize :data, Hash
+end

data/lib/generators/activist/install/templates/{create_statuses.rb → create_activist_statuses.rb}

@@ -1,6 +1,6 @@
-class CreateStatuses < ActiveRecord::Migration
+class CreateActivistStatuses < ActiveRecord::Migration
   def self.up
-    create_table :statuses do |t|
+    create_table :activist_statuses do |t|
       t.string  :actor_class
       t.integer :actor_id
       t.string  :action
@@ -11,8 +11,8 @@ class CreateStatuses < ActiveRecord::Migration
       t.timestamps
     end
   end
-
+  
   def self.down
-    drop_table :statuses
+    drop_table :activist_statuses
   end
 end

data/spec/activist_spec.rb

@@ -1,23 +1,44 @@
 require 'spec_helper'
 
 describe Activist do
-  before do
-    @region = Region.create!(:name => "Mazovia")
-    @kate = User.create!(:name => "Kate", :regions => Region.all)
-    @john = User.create!(:name => "John", :regions => Region.all)
+  before :all do
+    @region = Region.create!(:name => 'Mazovia')
+    @kate = User.create!(:name => 'Kate', :regions => Region.all)
+    @john = User.create!(:name => 'John', :regions => Region.all)
+    @note = Note.create!(:note => 'Note by Kate', :user => @kate)
   end
   
-  context "actor" do
-    it "should create streams for actor" do
+  context 'actor' do
+    it 'should create streams for actor' do
       @kate.public_stream.should be_kind_of Activist::Stream
       @kate.regional_stream.should be_kind_of Activist::Stream
       @kate.private_stream.should be_kind_of Activist::Stream
     end
   end
   
-  context "action" do
+  context 'action' do
+    it 'should define activist methods' do
+      @note.public_methods.should include(:activist_regional_after_create)
+      @note.public_methods.should include(:activist_private_after_create)
+    end
+    
+    it 'should define activist class methods' do
+      @note.class.public_methods.should include(:activities)
+    end
+    
+    it 'should define activist instance methods' do
+      @note.public_methods.should include(:activity)
+    end
+    
+    it 'should not pass' do
+      size = @kate.regional_stream.size
+      @empty = Note.create!(:note => '', :user => @kate)
+      @kate.regional_stream.size.should == size
+      @present = Note.create!(:note => 'Some note', :user => @kate)
+      @kate.regional_stream.size.should == size + 1
+    end
   end
   
-  context "stream" do
+  context 'stream' do
   end
 end

data/spec/setup.rb

@@ -1,13 +1,13 @@
 require 'active_record'
 
 ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => ":memory:"
+  :adapter => 'sqlite3',
+  :database => ':memory:'
 )
 ActiveRecord::Migration.verbose = false
 
 ActiveRecord::Schema.define do
-  create_table :statuses, :force => true do |t|
+  create_table :activist_statuses, :force => true do |t|
     t.string    :actor_class
     t.integer   :actor_id
     t.string    :action
@@ -22,9 +22,11 @@ ActiveRecord::Schema.define do
     t.string    :name
   end
   
-  create_table :regions_users, :id => false, :force => true do |t|
+  create_table :user_regions, :force => true do |t|
     t.integer   :user_id
     t.integer   :region_id
+    t.datetime  :created_at
+    t.datetime  :updated_at
   end
   
   create_table :users, :force => true do |t|
@@ -40,18 +42,26 @@ end
 REDIS = Redis.new(:host => '127.0.0.1', :port => 6379)
 Activist::Redis.execute.flushall
 
-class Status < ActiveRecord::Base
+class ActivistStatus < ActiveRecord::Base
   serialize :data, Hash
 end
 
 class Region < ActiveRecord::Base
-  has_and_belongs_to_many :users
+  has_many :user_regions
+  has_many :users, :through => :user_regions
+end
+
+class UserRegion < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :region
 end
 
 class User < ActiveRecord::Base
   include Activist::Actor
+  
   has_many :notes
-  has_and_belongs_to_many :regions
+  has_many :user_regions
+  has_many :regions, :through => :user_regions
   
   stream :public do
     all
@@ -68,10 +78,11 @@ end
 
 class Note < ActiveRecord::Base
   include Activist::Action
+  
   belongs_to :user
   
-  activities :regional, :when => :after_create
-  activities :private, :when => :after_create
+  activities :private, :on => :after_create
+  activities :regional, :on => :after_create, :if => proc { |note| note.note.present? }
   
   after_destroy do |note|
     activity :private, :action => :deleted

metadata

@@ -2,7 +2,7 @@
 name: activist
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - "Adrian Duli\xC4\x87"
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 Z
+date: 2011-06-27 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
@@ -89,7 +90,7 @@ dependencies:
         version: 1.3.2
   type: :development
   version_requirements: *id007
-description: Activity stream in rails 3.0 application
+description: Redis and database based activity stream in Rails 3 applications
 email: 
 - adulic@gmail.com
 executables: []
@@ -100,6 +101,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENCE
@@ -114,11 +116,12 @@ files:
 - lib/activist/stream.rb
 - lib/activist/version.rb
 - lib/generators/activist/install/install_generator.rb
-- lib/generators/activist/install/templates/create_statuses.rb
-- lib/generators/activist/install/templates/status.rb
+- lib/generators/activist/install/templates/activist_status.rb
+- lib/generators/activist/install/templates/create_activist_statuses.rb
 - spec/activist_spec.rb
 - spec/setup.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/adriandulic/activist
 licenses: []
 
@@ -142,10 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activist
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Activity stream in rails 3.0 application
+summary: Redis and database based activity stream in Rails 3 applications
 test_files: 
 - spec/activist_spec.rb
 - spec/setup.rb

data/lib/generators/activist/install/templates/status.rb

@@ -1,3 +0,0 @@
-class Status < ActiveRecord::Base
-  serialize :data, Hash
-end