eventifier 0.0.14 → 0.1.0

data/spec/helpers/eventifier/notification_helper_spec.rb

@@ -20,21 +20,21 @@ describe Eventifier::NotificationHelper do
   describe "#notification_message" do
     it "should return the I18n message for that event" do
       event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :create)
-      helper.notification_message(event).should == "<strong class='user'>#{event.user.name}</strong> just created an Post - you should check it out"
+      expect(helper.notification_message(event)).to eq "<strong class='user'>#{event.user.name}</strong> just created an Post - you should check it out"
     end
 
     it "should return a message specific to a single change if only 1 change has been made" do
       event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :update, :change_data => { :name => ["Fred", "Mike"] })
-      helper.notification_message(event).should == "<strong class='user'>#{event.user.name}</strong> made a change to their Post"
+      expect(helper.notification_message(event)).to eq "<strong class='user'>#{event.user.name}</strong> made a change to their Post"
     end
     it "should return a message specific to a particular field change if configuration is present" do
       event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :update, :change_data => { :deleted_at => [nil, Time.now] })
-      helper.notification_message(event).should == "<strong class='user'>#{event.user.name}</strong> deleted their Post"
+      expect(helper.notification_message(event)).to eq "<strong class='user'>#{event.user.name}</strong> deleted their Post"
     end
 
     it "should return a message specific to multiple changes if more than 1 change has been made" do
       event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :update, :change_data => { :name => ["Fred", "Mike"], :age => [55, 65] })
-      helper.notification_message(event).should == "<strong class='user'>#{event.user.name}</strong> made some changes to their Post"
+      expect(helper.notification_message(event)).to eq "<strong class='user'>#{event.user.name}</strong> made some changes to their Post"
     end
 
     it "should return the default I18n message if one doesn't exist" do
@@ -48,7 +48,7 @@ describe Eventifier::NotificationHelper do
       I18n.backend.store_translations :test, :notifications => @notification_strings
       I18n.with_locale("test") do
         event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :create)
-        helper.notification_message(event).should == "<strong class='user'>#{event.user.name}</strong> created a <strong>Post</strong>"
+        expect(helper.notification_message(event)).to eq "<strong class='user'>#{event.user.name}</strong> created a <strong>Post</strong>"
       end
     end
   end
@@ -67,12 +67,12 @@ describe Eventifier::NotificationHelper do
 
       it "should replace {{stuff}} with awesome" do
         message = "I'm really loving {{eventable.title}}"
-        helper.replace_vars(message, event).should == "I'm really loving <strong>#{event.eventable.title}</strong>"
+        expect(helper.replace_vars(message, event)).to eq "I'm really loving <strong>#{event.eventable.title}</strong>"
       end
 
       it "should replace multiple {{stuff}} with multiple awesome" do
         message = "I'm really loving {{eventable.title}} and all {{eventable.class.name}}s"
-        helper.replace_vars(message, event).should == "I'm really loving <strong>#{event.eventable.title}</strong> and all <strong>Post</strong>s"
+        expect(helper.replace_vars(message, event)).to eq "I'm really loving <strong>#{event.eventable.title}</strong> and all <strong>Post</strong>s"
       end
     end
 
@@ -81,8 +81,8 @@ describe Eventifier::NotificationHelper do
       it "should add some handy methods to an event instance" do
         event = Fabricate(:event)
         event = helper.load_event_for_template event
-        event.object.should == event.eventable
-        event.object_type.should == event.eventable_type
+        expect(event.object).to eq event.eventable
+        expect(event.object_type).to eq event.eventable_type
       end
 
     end
@@ -148,12 +148,12 @@ describe Eventifier::NotificationHelper do
 
       it "should replace {{stuff}} with awesome" do
         message = "I'm really loving {{eventable.title}}"
-        helper.replace_vars(message, event).should == "I'm really loving <strong>#{event.eventable.title}</strong>"
+        expect(helper.replace_vars(message, event)).to eq "I'm really loving <strong>#{event.eventable.title}</strong>"
       end
 
       it "should replace multiple {{stuff}} with multiple awesome" do
         message = "I'm really loving {{eventable.title}} and all {{eventable.class.name}}s"
-        helper.replace_vars(message, event).should == "I'm really loving <strong>#{event.eventable.title}</strong> and all <strong>Post</strong>s"
+        expect(helper.replace_vars(message, event)).to eq "I'm really loving <strong>#{event.eventable.title}</strong> and all <strong>Post</strong>s"
       end
     end
 
@@ -161,8 +161,8 @@ describe Eventifier::NotificationHelper do
       it "should add some handy methods to an event instance" do
         event = Fabricate(:event)
         event = helper.load_event_for_template event
-        event.object.should == event.eventable
-        event.object_type.should == event.eventable_type
+        expect(event.object).to eq event.eventable
+        expect(event.object_type).to eq event.eventable_type
       end
     end
   end

data/spec/helpers/eventifier/path_helper_spec.rb

@@ -5,15 +5,15 @@ describe Eventifier::PathHelper do
 
   describe "partial_path" do
     it "returns an app view path with context in the path" do
-      helper.partial_path(notification, :donkey).should == 'eventifier/donkey/notification'
+expect(      helper.partial_path(notification, :donkey)).to eq'eventifier/donkey/notification'
     end
 
     it "returns an app view if it's defined" do
-      helper.partial_path(notification, :dropdown).should == 'eventifier/dropdown/awesome_object'
+expect(      helper.partial_path(notification, :dropdown)).to eq'eventifier/dropdown/awesome_object'
     end
 
     it "returns the default view if not defined" do
-      helper.partial_path(notification).should == 'eventifier/notification'
+expect(      helper.partial_path(notification)).to eq'eventifier/notification'
     end
   end
 end

data/spec/integration/eventifier_spec.rb

@@ -7,7 +7,7 @@ describe Eventifier do
       notify :readers, :on => [:create, :update]
     end
 
-    Eventifier.tracked_classes.should == [Post]
+    expect(Eventifier.tracked_classes).to eq [Post]
   end
 end
 
@@ -45,18 +45,18 @@ describe 'event tracking' do
     it "does not store a notification for the post creator" do
       post.save
 
-      Eventifier::Notification.where(
+      expect(Eventifier::Notification.where(
         :event_id => event.id, :user_id => owner.id
-      ).count.should == 0
+        ).count).to eq 0
     end
 
     it "stores notifications for the reader" do
       post.save
 
       [reader1, reader2].each do |reader|
-        Eventifier::Notification.where(
+        expect(Eventifier::Notification.where(
           :event_id => event.id, :user_id => reader.id
-        ).count.should == 1
+        ).count).to eq 1
       end
     end
 
@@ -76,7 +76,7 @@ describe 'event tracking' do
     it "stores the post as the groupable object" do
       post.save
 
-      event.groupable.should == post
+      expect(event.groupable).to eq post
     end
 
     it "deletes the event when the post is destroyed" do
@@ -112,18 +112,18 @@ describe 'event tracking' do
     it "does not store a notification for the post creator" do
       post.update_attribute(:title, 'something else')
 
-      Eventifier::Notification.where(
+      expect(Eventifier::Notification.where(
         :event_id => event.id, :user_id => owner.id
-      ).count.should == 0
+      ).count).to eq 0
     end
 
     it "stores notifications for the reader" do
       post.update_attribute(:title, 'something else')
 
       [reader1, reader2].each do |reader|
-        Eventifier::Notification.where(
+        expect(Eventifier::Notification.where(
           :event_id => event.id, :user_id => reader.id
-        ).count.should == 1
+        ).count).to eq 1
       end
     end
 
@@ -131,7 +131,7 @@ describe 'event tracking' do
       post.update_attribute(:title, 'somethang')
 
       [reader1, reader2].each do |reader|
-        reader.notifications.count.should == 1
+        expect(reader.notifications.count).to eq 1
       end
     end
 

data/spec/integration/internationalisation_spec.rb

@@ -9,17 +9,17 @@ describe "Internationalisation" do
 
   it "should return the I18n message for that event" do
     event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :create)
-    helper.event_message(event).should == "<strong class='user'>#{event.user.name}</strong> just created a new post - you should check it out"
+    expect(helper.event_message(event)).to eq "<strong class='user'>#{event.user.name}</strong> just created a new post - you should check it out"
   end
 
   it "should return a message specific to a single change if only 1 change has been made" do
     event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :update, :change_data => { :name => ["Fred", "Mike"] })
-    helper.event_message(event).should == "<strong class='user'>#{event.user.name}</strong> made a change to their post"
+    expect(helper.event_message(event)).to eq "<strong class='user'>#{event.user.name}</strong> made a change to their post"
   end
 
   it "should return a message specific to multiple changes if more than 1 change has been made" do
     event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :update, :change_data => { :name => ["Fred", "Mike"], :age => [55, 65] })
-    helper.event_message(event).should == "<strong class='user'>#{event.user.name}</strong> made some changes to their post"
+    expect(helper.event_message(event)).to eq "<strong class='user'>#{event.user.name}</strong> made some changes to their post"
   end
 
   it "should return the default I18n message if one doesn't exist" do
@@ -33,7 +33,7 @@ describe "Internationalisation" do
 
     I18n.with_locale("test") do
       event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :create)
-      helper.event_message(event).should == "<strong class='user'>#{event.user.name}</strong> created a <strong>Post</strong>"
+      expect(helper.event_message(event)).to eq "<strong class='user'>#{event.user.name}</strong> created a <strong>Post</strong>"
     end
   end
 end

data/spec/integration/system_events_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe 'System Events' do
+  let(:owner)  { Fabricate(:user) }
+  let(:reader) { Fabricate(:user) }
+  let(:post)   { Fabricate(:post, :author => owner) }
+  let(:event)  {
+    Eventifier::Event.where(
+      :verb => :log, :system => true, user_id: nil,
+      :eventable_type => 'Post', :eventable_id => post.id
+    ).first
+  }
+
+  before do
+    Subscription.create! user: owner,  post: post
+    Subscription.create! user: reader, post: post
+
+    Eventifier::Notifier.new [Post], :readers, on: :log
+  end
+
+  it "logs an event" do
+    Eventifier::EventBuilder.store post, nil, :log, nil, system: true
+
+    event.should be_present
+  end
+
+  it "stores notifications for the readers" do
+    Eventifier::EventBuilder.store post, nil, :log, nil, system: true
+    ActiveSupport::Notifications.instrument(
+      "log.posts.notification.eventifier",
+      verb: :log, event: event, object: post
+    )
+
+    [owner, reader].each do |user|
+      expect(Eventifier::Notification.where(
+        :event_id => event.id, :user_id => user.id
+      ).count).to eq 1
+    end
+  end
+end

data/spec/models/eventifier/event_spec.rb

@@ -17,7 +17,7 @@ describe Eventifier::Event do
       alpha = Fabricate :event, :eventable => eventable
       beta  = Fabricate :event, :eventable => Fabricate(:user)
 
-      Eventifier::Event.find_all_by_eventable(eventable).should == [alpha]
+      expect(Eventifier::Event.find_all_by_eventable(eventable)).to eq [alpha]
     end
   end
 end

data/spec/models/eventifier/ghost_spec.rb

@@ -21,10 +21,9 @@ describe Eventifier::Ghost do
     subject     { Fabricate.build(:ghost, :data_hash => post.serializable_hash) }
 
     it "should be an object with the attributes of the undeleted object" do
-      pending
-
-      subject.ghost.class.should == Post
-      subject.ghost.attributes.except("_type").should == post.serializable_hash
+      expect(subject.ghost.class).to eq Post
+      expect(subject.ghost.attributes.except("_type")).
+        to eq post.serializable_hash
     end
   end
 end

data/spec/models/eventifier/notification_spec.rb

@@ -53,7 +53,7 @@ describe Eventifier::Notification do
     context 'when the user has never read notifications' do
       let(:last_read) { nil }
       it 'should return true' do
-        subject.should be_true
+        subject.should be_truthy
       end
     end
     context 'when the user has read notifications before' do
@@ -61,12 +61,12 @@ describe Eventifier::Notification do
       describe 'notificication newer than that time' do
         let(:last_read) { Time.now - 1.day }
 
-        it { should be_true }
+        it { should be_truthy }
       end
       describe 'notificication older than that time' do
         let(:last_read) { Time.now + 1.day }
 
-        it { should be_false }
+        it { should be_falsey }
       end
     end
   end

data/spec/notifier/notification_mapping_spec.rb

@@ -6,7 +6,7 @@ describe Eventifier::NotificationMapping do
     it 'acts like a datasource' do
       Eventifier::NotificationMapping.add 'test', :relation
 
-      Eventifier::NotificationMapping.find('test').should == [:relation]
+      expect(Eventifier::NotificationMapping.find('test')).to eq [:relation]
     end
 
     it "appends further relations" do
@@ -15,8 +15,8 @@ describe Eventifier::NotificationMapping do
       Eventifier::NotificationMapping.add 'test', :relation_a
       Eventifier::NotificationMapping.add 'test', :relation_b
 
-      Eventifier::NotificationMapping.find('test').
-        should == [:relation_a, :relation_b]
+      expect(Eventifier::NotificationMapping.find('test')).
+      to eq [:relation_a, :relation_b]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventifier
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors:
 - Nathan Sampimon
@@ -10,176 +10,190 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: compass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.4
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
+- !ruby/object:Gem::Dependency
+  name: rails-observers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: fabrication
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 3.0.0.beta2
 description: Tracks and logs events and sends notifications of events on Active Record
   models.
 email:
@@ -188,8 +202,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.textile
 - Rakefile
@@ -221,6 +235,7 @@ files:
 - db/migrate/2_eventifier_notification_settings.rb
 - db/migrate/3_notification_sent_status.rb
 - db/migrate/4_event_groupable.rb
+- db/migrate/5_system_events.rb
 - eventifier.gemspec
 - lib/eventifier.rb
 - lib/eventifier/delivery.rb
@@ -241,12 +256,13 @@ files:
 - lib/eventifier/tracker.rb
 - lib/generators/eventifier/install/install_generator.rb
 - lib/generators/eventifier/install/templates/event_tracking.rb
-- lib/generators/eventifier/install/templates/events.en.yaml
+- lib/generators/eventifier/install/templates/events.en.yml
 - lib/tasks/email.rake
 - spec/controllers/eventifier/notifications_controller_spec.rb
 - spec/controllers/eventifier/preferences_controller_spec.rb
 - spec/event_tracking_spec.rb
 - spec/eventifier/delivery_spec.rb
+- spec/eventifier/notification_translator_spec.rb
 - spec/eventifier/preferences_spec.rb
 - spec/eventifier/relationship_spec.rb
 - spec/eventifier_spec.rb
@@ -255,6 +271,7 @@ files:
 - spec/helpers/eventifier/path_helper_spec.rb
 - spec/integration/eventifier_spec.rb
 - spec/integration/internationalisation_spec.rb
+- spec/integration/system_events_spec.rb
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/lib/event_tracking.rb
 - spec/internal/app/models/category.rb
@@ -279,7 +296,8 @@ files:
 - spec/support/controller_helpers.rb
 - spec/support/model_helpers.rb
 homepage: http://github.com/inspire9/eventifier
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -287,17 +305,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: eventifier
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Event tracking and notifying for active record models
@@ -306,6 +324,7 @@ test_files:
 - spec/controllers/eventifier/preferences_controller_spec.rb
 - spec/event_tracking_spec.rb
 - spec/eventifier/delivery_spec.rb
+- spec/eventifier/notification_translator_spec.rb
 - spec/eventifier/preferences_spec.rb
 - spec/eventifier/relationship_spec.rb
 - spec/eventifier_spec.rb
@@ -314,6 +333,7 @@ test_files:
 - spec/helpers/eventifier/path_helper_spec.rb
 - spec/integration/eventifier_spec.rb
 - spec/integration/internationalisation_spec.rb
+- spec/integration/system_events_spec.rb
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/lib/event_tracking.rb
 - spec/internal/app/models/category.rb