protocolist 0.9.0.beta → 1.0.0

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.idea
 Gemfile.lock
 pkg/*
 dummy

data/Guardfile

@@ -1,6 +1,6 @@
 require 'guard/guard'
 
-guard :rspec, :all_on_start => false, :all_after_pass => false, :cli => '--fail-fast --format doc' do
+guard :rspec, all_on_start: false, all_after_pass: false, cli: '--fail-fast --format doc' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})                { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')             { "spec" }

data/README.md

@@ -1,4 +1,5 @@
-#Protocolist [![Build Status](https://secure.travis-ci.org/welldan97/protocolist.png?branch=master)](http://travis-ci.org/welldan97/protocolist) [![Dependency Status](https://gemnasium.com/welldan97/protocolist.png)](https://gemnasium.com/welldan97/protocolist)
+#Protocolist
+[![Build Status](https://secure.travis-ci.org/welldan97/protocolist.png?branch=master)](http://travis-ci.org/welldan97/protocolist) [![Dependency Status](https://gemnasium.com/welldan97/protocolist.png)](https://gemnasium.com/welldan97/protocolist) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/welldan97/protocolist)
 
 Simple activity feeds solution for Rails applications. Gives a flexible way to build activity feeds infrastructure over it.
 
@@ -27,7 +28,7 @@ Getting started
 ---------------
 
 Activity model has four attributes: actor("who did it"), activity_type("what
-they did"), target("what they did it to") and data(additional information). Subject will be
+they did"), target("what they did it to") and data(additional information). Actor will be
 set as current user by default.
 
 Protocolist expects you to have `current_user` method in a
@@ -51,12 +52,12 @@ Activity with current user set as actor, `:create` as type,
 The more convenient usage:
 
 ```ruby
-fires :edit, :on => :update,
-             :data => :changes,
-             :if => 'changes.any?'
+fires :edit, on:   :update,
+             data: :changes,
+             if:   'changes.any?'
 ```
 
-The event type will be `edit`. A proc, symbol a̶n̶d̶ ̶a̶ ̶s̶t̶r̶i̶n̶g̶ for data
+The event type will be `edit`. A proc, symbol and a string for data
 option represent a method, else types will be stored as is.
 
 The `unless` option also can be passed.
@@ -64,7 +65,7 @@ The `unless` option also can be passed.
 The `on` option can be an array:
 
 ```ruby
-fires :comment_activity, :on => [:create, :update, :destroy]
+fires :comment_activity, on: [:create, :update, :destroy]
 ```
 
 The most flexible way is to use `fire` method:
@@ -72,7 +73,7 @@ The most flexible way is to use `fire` method:
 ```ruby
 def destroy_projects
     self.projects.destroy_all
-    fire :destroy_all, :target => false, :data => {:company_id => company_id}
+    fire :destroy_all, target: false, data: { company_id: company_id }
 end
 ```
 
@@ -92,9 +93,9 @@ which will strike after download action.
 The customized one:
 
 ```ruby
-fires :download, :only => [:download_report, :download_file, :download_map],
-                 :data => lambda{|c| c.params[:city] },
-                 :if => lambda{|c| c.response.status == 200 }
+fires :download, only: [:download_report, :download_file, :download_map],
+                 data: ->(c) { c.params[:city] },
+                 if:   ->(c) { c.response.status == 200 }
 ```
 
 The `fire` method can be used same way as in models, but also if type is not
@@ -111,7 +112,7 @@ is the same as
 ```ruby
 def show
     @article = Article.find(params[:id])
-    fire :show, :target => @article
+    fire :show, target: @article
 end
 ```
 
@@ -130,6 +131,3 @@ Protocolist was inspired by
 [timeline_fu](https://github.com/jamesgolick/timeline_fu).  I used it,
 but its functionality wasn't enough for me, so I made my own with
 blackjack and stewardesses.
-
-
-

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

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

@@ -7,23 +7,78 @@ module Protocolist
 
       source_root File.expand_path("../templates", __FILE__)
 
-      def generate_activity_model
-        migration_template "migration.rb", "db/migrate/create_activities"
-        invoke "active_record:model", ['Activity'], :migration => false
-        model_content = <<CONTENT
-  attr_accessible :activity_type, :target, :actor, :data
-  belongs_to :target, :polymorphic => true
-  belongs_to :actor, :polymorphic => true
-  serialize :data
-CONTENT
-        inject_into_class('app/models/activity.rb', 'Activity', model_content) if File.exists?(File.join(destination_root, 'app/models/activity.rb'))
+      class_option 'model-orm',       type: :string, default: 'active_record',          aliases: '-o', desc: 'Model ORM (ActiveRecord or MongoId)'
+      class_option 'model-classname', type: :string, default: 'Activity',               aliases: '-c'
+      class_option 'model-filename',  type: :string, default: 'app/models/activity.rb', aliases: '-f'
 
 
+      def generate_activity_model
+        if model_orm == 'mongoid' && defined?(Mongoid)
+          generate_mongoid_activity_model
+        elsif model_orm == 'active_record' && defined?(ActiveRecord)
+          generate_active_record_activity_model
+        end
       end
 
       def self.next_migration_number(dirname) #:nodoc:
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
+
+      private
+
+      def generate_mongoid_activity_model
+        content = <<-CONTENT.gsub(/^ +/, '  ')
+
+          belongs_to :actor,  polymorphic: true
+          belongs_to :target, polymorphic: true
+
+          field :activity_type, type: String
+          field :data,          type: Hash
+        CONTENT
+
+
+        invoke "mongoid:model", [model_classname]
+
+        if model_exists?
+          inject_into_file(model_filename, content, after: "include Mongoid::Document\n")
+        end
+      end
+
+      def generate_active_record_activity_model
+        content = <<-CONTENT.gsub(/^ +/, '  ')
+          attr_accessible :activity_type, :target, :actor, :data
+
+          belongs_to :target, polymorphic: true
+          belongs_to :actor,  polymorphic: true
+
+          serialize :data
+        CONTENT
+
+
+        migration_template "migration.rb", "db/migrate/create_activities"
+        invoke "active_record:model", [model_classname], migration: false
+
+        if model_exists?
+          gsub_file model_filename, / +# attr_accessible :title, :body\n/, ''
+          inject_into_class(model_filename, model_classname, content)
+        end
+      end
+
+      def model_exists?
+        File.exists?(File.join(destination_root, model_filename))
+      end
+
+      def model_filename
+        options['model-filename']
+      end
+
+      def model_classname
+        options['model-classname']
+      end
+
+      def model_orm
+        options['model-orm']
+      end
     end
   end
 end

data/lib/generators/protocolist/install/templates/migration.rb

@@ -1,14 +1,15 @@
 class CreateActivities < ActiveRecord::Migration
   def change
     create_table :activities do |t|
-      t.references :actor, :polymorphic => true
-      t.references :target, :polymorphic => true
+      t.references :actor,  polymorphic: true
+      t.references :target, polymorphic: true
+
       t.string :activity_type
       t.text :data
 
       t.timestamps
     end
-    add_index :activities, :actor_id
-    add_index :activities, :target_id
+    add_index :activities, [:actor_id, :actor_type]
+    add_index :activities, [:target_id, :target_type]
   end
 end

data/lib/protocolist.rb

@@ -1,29 +1,20 @@
-require "protocolist/version"
-require "protocolist/model_additions"
-require "protocolist/controller_additions"
-require "protocolist/railtie" if defined? Rails
+require 'active_support'
 
+require 'protocolist/version'
+require 'protocolist/model_additions'
+require 'protocolist/controller_additions'
 
-module Protocolist
-
-  def self.fire activity_type, options={}
-    options = {:actor => @actor, :activity_type => activity_type}.merge options
-    @activity_class.create options if options[:actor] && @activity_class
-  end
+require 'protocolist/railtie' if defined? Rails
 
-  def self.actor
-    @actor
-  end
 
-  def self.actor= actor
-    @actor = actor
-  end
+module Protocolist
 
-  def self.activity_class
-    @activity_class
+  def self.fire(activity_type, options = {})
+    options = options.reverse_merge(actor:@actor, activity_type: activity_type)
+    @activity_class.try(:create, options) if options[:actor]
   end
 
-  def self.activity_class= activity_class
-    @activity_class = activity_class
+  class << self
+    attr_accessor :actor, :activity_class
   end
 end

data/lib/protocolist/controller_additions.rb

@@ -1,50 +1,45 @@
+require 'protocolist/controller_additions/initializer'
+require 'protocolist/util/data_proc'
+
 module Protocolist
   module ControllerAdditions
-    module ClassMethods
-      def fires activity_type, options={}
-        #options normalization
-        options[:only] ||= activity_type unless options[:except]
-
-        data_proc = if options[:data].respond_to?(:call)
-                      lambda{|controller| options[:data].call(controller)}
-                    elsif options[:data].class == Symbol
-                      lambda{|controller| controller.send(options[:data]) }
-                    else
-                      lambda{|record| options[:data] }
-                    end
-
-        options_for_callback = options.select{|k,v| [:if, :unless, :only, :except].include? k }
-
-        options_for_fire = options.reject{|k,v| [:if, :unless, :only, :except].include? k }
+    extend ActiveSupport::Concern
+    include Initializer
+    include Util::DataProc
+
+    def fire(activity_type = nil, options = {})
+      target = case options[:target]
+               when nil
+                 instance_variable_get("@#{controller_name.singularize}")
+               when false
+                 nil
+               else
+                 options[:target]
+               end
 
-        callback_proc = lambda{|controller|
-          controller.fire activity_type, options_for_fire.merge({:data => data_proc.call(controller)})
-        }
+      activity_type ||= action_name.to_sym
+      options = options.merge(target: target)
 
-        send(:after_filter, callback_proc, options_for_callback)
-      end
+      Protocolist.fire(activity_type, options)
+    end
 
+    module ClassMethods
+      def fires(activity_type, options = {})
+        options = options.merge(only: activity_type) unless options[:only] || options[:except]
 
-      def self.extended base
-        base.send(:before_filter, :initilize_protocolist)
-      end
-    end
+        data_proc = extract_data_proc(options[:data])
 
-    def self.included base
-      base.extend ClassMethods
-    end
+        options_for_callback = options.slice(:if, :unless, :only, :except)
+        options_for_fire     = options.except(:if, :unless, :only, :except)
 
-    def fire activity_type=nil, options={}
-      options[:target] =  instance_variable_get("@#{self.controller_name.singularize}") if options[:target] == nil
-      options[:target] = nil if options[:target] == false
-      activity_type ||= action_name.to_sym
+        callback_proc = ->(controller; options) do
+          options = options_for_fire.merge(data: data_proc.call(controller))
 
-      Protocolist.fire activity_type, options
-    end
+          controller.fire(activity_type, options)
+        end
 
-    def initilize_protocolist
-      Protocolist.actor = current_user
-      Protocolist.activity_class = Activity
+        send(:after_filter, callback_proc, options_for_callback)
+      end
     end
   end
 end

data/lib/protocolist/controller_additions/initializer.rb

@@ -0,0 +1,16 @@
+module Protocolist
+  module ControllerAdditions
+    module Initializer
+      extend ActiveSupport::Concern
+    
+      included do      
+        before_filter :initialize_protocolist
+      end
+    
+      def initialize_protocolist
+        Protocolist.actor = current_user
+        Protocolist.activity_class = Activity
+      end
+    end
+  end
+end

data/lib/protocolist/model_additions.rb

@@ -1,41 +1,43 @@
+require 'protocolist/util/data_proc'
+
 module Protocolist
   module ModelAdditions
-    module ClassMethods
-      def fires activity_type, options={}
-        #options normalization
-        fires_on = Array(options[:on] || activity_type)
+    extend ActiveSupport::Concern
+    include Util::DataProc
+
+    def fire(activity_type, options = {})
+      target = case options[:target]
+               when nil
+                 self
+               when false
+                 nil
+               else
+                 options[:target]
+               end
+
+      options = options.merge(target: target)
+
+      Protocolist.fire(activity_type, options)
+    end
 
-        data_proc = if options[:data].respond_to?(:call)
-                      lambda{|record| options[:data].call(record)}
-                    elsif options[:data].class == Symbol
-                      lambda{|record| record.send(options[:data]) }
-                    else
-                      lambda{|record| options[:data] }
-                    end
+    module ClassMethods
+      def fires(activity_type, options = {})
+        fires_on  = [*options[:on] || activity_type]
+        data_proc = extract_data_proc(options[:data])
 
-        options_for_callback = options.select{|k,v| [:if, :unless].include? k }
+        options_for_callback = options.slice(:if, :unless)
+        options_for_fire     = options.except(:if, :unless, :on)
 
-        options_for_fire = options.reject{|k,v| [:if, :unless, :on].include? k }
+        callback_proc = ->(record; options) do
+          options = options_for_fire.merge(data: data_proc.call(record))
 
-        callback_proc = lambda{|record|
-          record.fire activity_type, options_for_fire.merge({:data => data_proc.call(record)})
-        }
+          record.fire(activity_type, options)
+        end
 
         fires_on.each do |on|
-          send("after_#{on.to_s}".to_sym, callback_proc, options_for_callback)
+          send("after_#{on}", callback_proc, options_for_callback)
         end
       end
     end
-
-    def self.included base
-      base.extend ClassMethods
-    end
-
-    def fire activity_type, options={}
-      options[:target] = self if options[:target] == nil
-      options[:target] = nil if options[:target] == false
-
-      Protocolist.fire activity_type, options
-    end
   end
 end

data/lib/protocolist/railtie.rb

@@ -1,12 +1,19 @@
 module Protocolist
   class Railtie < Rails::Railtie
     initializer 'protocolist.model_additions' do
-      ActiveSupport.on_load :active_record do
+      ActiveSupport.on_load(:active_record) do
         include ModelAdditions
       end
+      if defined?(Mongoid)
+        Mongoid::Document.module_eval do
+          included do
+            include ModelAdditions
+          end
+        end
+      end
     end
     initializer 'protocolist.controller_additions' do
-      ActiveSupport.on_load :action_controller do
+      ActiveSupport.on_load(:action_controller) do
         include ControllerAdditions
       end
     end

data/lib/protocolist/util/data_proc.rb

@@ -0,0 +1,23 @@
+module Protocolist
+  module Util
+    module DataProc
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        private
+
+        def extract_data_proc(data)
+          if data.respond_to?(:call)
+            ->(o) { data.call(o) }
+          elsif data.is_a?(Symbol)
+            ->(o) { o.send(data) }
+          elsif data.is_a?(String)
+            ->(o) { o.instance_eval "(#{data})" }
+          else
+            ->(_) { data }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/protocolist/version.rb

@@ -1,3 +1,3 @@
 module Protocolist
-  VERSION = "0.9.0.beta"
+  VERSION = "1.0.0"
 end

data/protocolist.gemspec

@@ -18,9 +18,12 @@ 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 'activesupport', '~> 3.0'
+
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 2.9.0'
-  s.add_development_dependency 'guard-rspec', '~> 0.7.0'
-  s.add_development_dependency 'supermodel'
+  s.add_development_dependency 'rspec', '~> 2.12.0'
+  s.add_development_dependency 'guard-rspec', '~> 2.3.0'
+  s.add_development_dependency 'supermodel', '~> 0.1.6'
+  s.add_development_dependency 'psych', '~> 1.3.0' # fixes ' superclass mismatch for class Mark ' error
   s.add_development_dependency 'railties', '~> 3.0'
 end

data/spec/protocolist/controller_additions_spec.rb

@@ -1,59 +1,57 @@
 require "spec_helper"
 
-class User < SuperModel::Base
-
-end
-
-class Activity < SuperModel::Base
-
-end
-
 class FirestartersController
   #stub before filter
   def self.before_filter *args
   end
 
   include Protocolist::ControllerAdditions
-  def explicit_use
-    fire :gogogo, :target => User.new(:name => 'Lisa'), :data => '<3 <3 <3'
+
+  def explicit_use(target, data)
+    fire :gogogo, target: target, data: data
   end
 
-  def implicit_use
-    @firestarter = User.new(:name => 'Marge')
+  def implicit_use(target)
+    @firestarter = target
     fire
   end
 end
 
 describe Protocolist::ControllerAdditions do
+  let(:controller) { FirestartersController.new }
+  let(:actor) { User.new(name: 'Bill') }
+  let(:lisa)  { User.new(name: 'Lisa') }
+  let(:mary)  { User.new(name: 'Mary') }
+
   before :each do
     Activity.destroy_all
-    user = User.new(:name => 'Bill')
-    @controller = FirestartersController.new
 
-    @controller.stub(:current_user){user}
-    @controller.stub(:controller_name){'firestarters'}
-    @controller.stub(:action_name){'quick_and_dirty_action_stub'}
-    @controller.stub(:params){'les params'}
+    controller.stub(:current_user).and_return(actor)
+    controller.stub(:controller_name).and_return('firestarters')
+    controller.stub(:action_name).and_return('quick_and_dirty_action_stub')
+    controller.stub(:params).and_return('les params')
 
-    @controller.initilize_protocolist
+    controller.initialize_protocolist
   end
 
   describe 'direct fire method call' do
     it 'saves record with target and data when called explicitly' do
-      @controller.explicit_use
+      controller.explicit_use(lisa, '<3 <3 <3')
 
-      Activity.last.actor.name.should == 'Bill'
-      Activity.last.activity_type.should == :gogogo
-      Activity.last.target.name.should == 'Lisa'
-      Activity.last.data.should == '<3 <3 <3'
+      activity = Activity.last
+      activity.actor.should         == actor
+      activity.activity_type.should == :gogogo
+      activity.target.should        == lisa
+      activity.data.should          == '<3 <3 <3'
     end
 
     it 'saves record with target and data when called implicitly' do
-      @controller.implicit_use
+      controller.implicit_use(mary)
 
-      Activity.last.actor.name.should == 'Bill'
-      Activity.last.activity_type.should == :quick_and_dirty_action_stub
-      Activity.last.target.name.should == 'Marge'
+      activity = Activity.last
+      activity.actor.should         == actor
+      activity.activity_type.should == :quick_and_dirty_action_stub
+      activity.target.should        == mary
     end
   end
 
@@ -61,36 +59,35 @@ describe Protocolist::ControllerAdditions do
     it 'saves record when called with minimal options' do
       FirestartersController.should_receive(:after_filter) do |callback_proc, options|
         options[:only].should == :download
+        expect { callback_proc.call(controller) }.to change { Activity.count }.by(1)
 
-        expect {
-          callback_proc.call(@controller)
-        }.to change{Activity.count}.by 1
-        Activity.last.actor.name.should == 'Bill'
-        Activity.last.activity_type.should == :download
-        Activity.last.target.should_not be
+        activity = Activity.last
+        activity.actor.should         == actor
+        activity.activity_type.should == :download
+        activity.target.should_not be
       end
+
       FirestartersController.send(:fires, :download)
     end
 
     it 'saves record when called with complex options' do
       FirestartersController.should_receive(:after_filter) do |callback_proc, options|
         options[:only].should == [:download_report, :download_file, :download_map]
-        options[:if].should == 'if condition'
+        options[:if].should   == 'if condition'
 
-        expect {
-          callback_proc.call(@controller)
-        }.to change{Activity.count}.by 1
+        expect { callback_proc.call(controller) }.to change { Activity.count }.by(1)
 
-        Activity.last.actor.name.should == 'Bill'
-        Activity.last.activity_type.should == :download
-        Activity.last.data.should == 'les params'
-        Activity.last.target.should_not be
+        activity = Activity.last
+        activity.actor.should         == actor
+        activity.activity_type.should == :download
+        activity.data.should          == 'les params'
+        activity.target.should_not be
       end
 
       FirestartersController.send(:fires, :download,
-                                  :only => [:download_report, :download_file, :download_map],
-                                  :data => lambda{|c| c.params },
-                                  :if => 'if condition')
+        only: [:download_report, :download_file, :download_map],
+        data: ->(c) { c.params }, if: 'if condition'
+      )
     end
   end
 end

data/spec/protocolist/model_additions_spec.rb

@@ -1,41 +1,31 @@
 require "spec_helper"
 
-class User < SuperModel::Base
-
-end
-
-class Activity < SuperModel::Base
-
-end
-
 class Firestarter < SuperModel::Base
   include Protocolist::ModelAdditions
 
   def delete
-    fire :delete, :target => false
+    fire :delete, target: false
   end
 
   def myself
     fire :myself
   end
 
-  def love_letter_for_mary
-    user = User.create(:name => 'Mary')
-    fire :love_letter, :target => user, :data => '<3 <3 <3'
+  def love_letter_for_mary(target, data)
+    fire :love_letter, target: target, data: data
   end
 end
 
 class SimpleFirestarter < SuperModel::Base
   include Protocolist::ModelAdditions
-
   fires :create
 end
 
 class ConditionalFirestarter < SuperModel::Base
   include Protocolist::ModelAdditions
 
-  fires :i_will_be_saved, :on => :create, :if => :return_true_please
-  fires :and_i_won_t, :on => :create, :if => :return_false_please
+  fires :i_will_be_saved, on: :create, if: :return_true_please
+  fires :and_i_won_t,     on: :create, if: :return_false_please
 
   def return_false_please
     false
@@ -49,7 +39,8 @@ end
 class ComplexFirestarter < SuperModel::Base
   include Protocolist::ModelAdditions
 
-  fires :yohoho, :on =>[:create, :destroy], :target => false, :data => :hi
+  fires :yohoho, on: [:create, :destroy], target: false, data: :hi
+  fires :yohoho, on: :update, data: 'name * 2'
 
   def hi
     'Hi!'
@@ -57,87 +48,95 @@ class ComplexFirestarter < SuperModel::Base
 end
 
 describe Protocolist::ModelAdditions do
-  before :each do
+  let(:actor) { User.new(name: 'Bill') }
+  let(:mary) { User.new(name: 'Mary') }
+
+  before do
     Activity.destroy_all
-    @actor = User.new(:name => 'Bill')
-    Protocolist.actor = @actor
+
+    Protocolist.actor = actor
     Protocolist.activity_class = Activity
   end
 
   describe 'direct fire method call' do
-    before :each do
-      @firestarter = Firestarter.new
-    end
+    let(:firestarter) { Firestarter.new }
 
     it 'saves record with target and data' do
-      expect {
-        @firestarter.love_letter_for_mary
-      }.to change{Activity.count}.by 1
-      Activity.last.actor.name.should == 'Bill'
-      Activity.last.activity_type.should == :love_letter
-      Activity.last.target.name.should == 'Mary'
-      Activity.last.data.should == '<3 <3 <3'
+      expect { firestarter.love_letter_for_mary(mary, '<3 <3 <3') }.to change { Activity.count }.by(1)
+
+      activity = Activity.last
+      activity.actor.should         == actor
+      activity.activity_type.should == :love_letter
+      activity.target.should        == mary
+      activity.data.should          == '<3 <3 <3'
     end
 
     it 'saves record with self as target if target is not set' do
-      expect {
-        @firestarter.myself
-      }.to change{Activity.count}.by 1
-      Activity.last.actor.name.should == 'Bill'
-      Activity.last.activity_type.should == :myself
-      Activity.last.target.should == @firestarter
+      expect { firestarter.myself }.to change { Activity.count }.by(1)
+
+      activity = Activity.last
+      activity.actor.should         == actor
+      activity.activity_type.should == :myself
+      activity.target.should        == firestarter
     end
 
     it 'saves record without target if target set to false' do
-      expect {
-        @firestarter.delete
-      }.to change{Activity.count}.by 1
-      Activity.last.actor.name.should == 'Bill'
-      Activity.last.activity_type.should == :delete
-      Activity.last.target.should be_false
+      expect { firestarter.delete }.to change { Activity.count }.by(1)
+
+      activity = Activity.last
+      activity.actor.should         == actor
+      activity.activity_type.should == :delete
+      activity.target.should        be_false
     end
   end
 
   describe 'fires callback' do
     it 'saves record when called with minimal options' do
-      expect {
-        SimpleFirestarter.create(:name => 'Ted')
-      }.to change{Activity.count}.by 1
-      Activity.last.actor.name.should == 'Bill'
-      Activity.last.activity_type.should == :create
-      Activity.last.target.name.should == 'Ted'
+      expect { SimpleFirestarter.create(name: 'Ted') }.to change { Activity.count }.by(1)
+
+      activity = Activity.last
+      activity.actor.should         == actor
+      activity.activity_type.should == :create
+      activity.target.name.should   == 'Ted'
     end
 
     it 'saves record when called with complex options' do
 
       #first create record
 
-      expect {
-          ComplexFirestarter.create(:name => 'Ted')
-      }.to change{Activity.count}.by 1
-      Activity.last.actor.name.should == 'Bill'
-      Activity.last.activity_type.should == :yohoho
-      Activity.last.target.should_not be
-      Activity.last.data.should == 'Hi!'
+      expect { ComplexFirestarter.create(name: 'Ted') }.to change { Activity.count }.by(1)
+
+      activity = Activity.last
+      activity.actor.should         == actor
+      activity.activity_type.should == :yohoho
+      activity.target.should_not be
+      activity.data.should == 'Hi!'
 
       #then destroy record
 
-      expect {
-        ComplexFirestarter.last.destroy
-      }.to change{Activity.count}.by 1
-      Activity.last.actor.name.should == 'Bill'
-      Activity.last.activity_type.should == :yohoho
-      Activity.last.target.should_not be
-      Activity.last.data.should == 'Hi!'
+      expect { ComplexFirestarter.last.destroy }.to change { Activity.count }.by(1)
+
+      activity = Activity.last
+      activity.actor.should         == actor
+      activity.activity_type.should == :yohoho
+      activity.target.should_not be
+      activity.data.should == 'Hi!'
     end
 
-    it 'saves checks conditions' do
-      expect {
-        ConditionalFirestarter.create(:name => 'Ted')
-      }.to change{Activity.count}.by 1
-      Activity.last.activity_type.should == :i_will_be_saved
+    it 'saves record with string data attribute parsed' do
+      ComplexFirestarter.create(name: 'Ted')
+      ComplexFirestarter.last.update_attributes name: 'Bob'
+
+      activity = Activity.last
+      activity.data.should == 'BobBob'
     end
-  end
 
+    it 'saves checks conditions' do
+      expect { ConditionalFirestarter.create(name: 'Ted') }.to change { Activity.count }.by(1)
 
+      activity = Activity.last
+      activity.actor.should         == actor
+      activity.activity_type.should == :i_will_be_saved
+    end
+  end
 end

data/spec/protocolist_spec.rb

@@ -9,46 +9,51 @@ class Activity < SuperModel::Base
 end
 
 describe Protocolist do
-  before :each do
+  let(:actor) { User.new(name: 'Bill') }
+  let(:another_actor) { User.new(name: 'Bob') }
+  let(:target) { User.new(name: 'Mary') }
+
+  before do
     Activity.destroy_all
-    @actor = User.new(:name => 'Bill')
-    Protocolist.actor = @actor
+
+    Protocolist.actor = actor
     Protocolist.activity_class = Activity
   end
 
   it 'should silently skip saving if actor is falsy' do
     Protocolist.actor = nil
-    expect {Protocolist.fire :alarm}.not_to change{Activity.count}
-    expect {Protocolist.fire :alarm}.not_to raise_error
+
+    expect { Protocolist.fire(:alarm) }.not_to change { Activity.count }
+    expect { Protocolist.fire(:alarm) }.not_to raise_error
   end
 
   it 'should silently skip saving if activity_class is falsy' do
     Protocolist.activity_class = nil
-    expect {Protocolist.fire :alarm}.not_to change{Activity.count}
-    expect {Protocolist.fire :alarm}.not_to raise_error
+
+    expect { Protocolist.fire(:alarm) }.not_to change { Activity.count }
+    expect { Protocolist.fire(:alarm) }.not_to raise_error
   end
 
   it 'should save a simple record' do
-    expect {Protocolist.fire :alarm}.to change{Activity.count}.by 1
+    expect { Protocolist.fire(:alarm) }.to change { Activity.count }.by(1)
 
-    Activity.last.actor.should == @actor
-    Activity.last.activity_type.should == :alarm
+    activity = Activity.last
+    activity.actor.should         == actor
+    activity.activity_type.should == :alarm
   end
 
   it 'should save a complex record' do
-    another_actor = User.new(:name => 'Bob')
-    target = User.new(:name => 'Mary')
-
-    expect {
-      Protocolist.fire :alarm,
-      :actor => another_actor,
-      :target => target,
-      :data => {:some_attr => :some_data}
-    }.to change{Activity.count}.by 1
-
-    Activity.last.actor.name.should == 'Bob'
-    Activity.last.activity_type.should == :alarm
-    Activity.last.target.name.should == 'Mary'
-    Activity.last.data[:some_attr].should == :some_data
+    expect do
+      Protocolist.fire(:alarm,
+                       actor: another_actor,
+                       target: target,
+                       data: { foo: :bar })
+    end.to change { Activity.count }.by(1)
+
+    activity = Activity.last
+    activity.actor.should         == another_actor
+    activity.activity_type.should == :alarm
+    activity.target.should        == target
+    activity.data[:foo].should    == :bar
   end
 end

data/spec/spec_helper.rb

@@ -2,8 +2,11 @@ require 'protocolist'
 require 'supermodel'
 Bundler.require(:default)
 
+User     = Class.new(SuperModel::Base)
+Activity = Class.new(SuperModel::Base)
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.filter_run :focus => true
+  config.filter_run(focus: true)
   config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,19 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: protocolist
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Dmitry Yakimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &75671410 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,43 +37,79 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75671410
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75671120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: *75671120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &75670800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *75670800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &75670540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.6
   type: :development
   prerelease: false
-  version_requirements: *75670540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &75670090 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +117,12 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *75670090
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: ! 'Simple activity feeds solution for Rails applications. Gives a flexible
   way to build activity feeds infrastructure over it. '
 email:
@@ -87,8 +144,10 @@ files:
 - lib/generators/protocolist/install/templates/migration.rb
 - lib/protocolist.rb
 - lib/protocolist/controller_additions.rb
+- lib/protocolist/controller_additions/initializer.rb
 - lib/protocolist/model_additions.rb
 - lib/protocolist/railtie.rb
+- lib/protocolist/util/data_proc.rb
 - lib/protocolist/version.rb
 - protocolist.gemspec
 - spec/protocolist/controller_additions_spec.rb
@@ -107,16 +166,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1046353843920226917
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1046353843920226917
 requirements: []
 rubyforge_project: protocolist
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Activity feeds solution for Rails.
-test_files: []
+test_files:
+- spec/protocolist/controller_additions_spec.rb
+- spec/protocolist/model_additions_spec.rb
+- spec/protocolist_spec.rb
+- spec/spec_helper.rb