eventifier 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eventifier (0.0.2)
+    eventifier (0.0.4)
       actionmailer
       actionmailer
       activerecord
@@ -37,8 +37,8 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     bson (1.6.4)
-    bson_ext (1.6.3)
-      bson (~> 1.6.3)
+    bson_ext (1.6.4)
+      bson (~> 1.6.4)
     builder (3.0.0)
     database_cleaner (0.7.2)
     diff-lcs (1.1.3)
@@ -46,12 +46,12 @@ GEM
     fabrication (1.4.0)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.3)
+    journey (1.0.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
+    mime-types (1.19)
     mongo (1.6.2)
       bson (~> 1.6.2)
     mongoid (2.4.11)

data/lib/eventifier/notification_mailer.rb

@@ -7,11 +7,7 @@ module Eventifier
 
     def notification_email(notification)
       @notification = notification
-      @notification_url = if Eventifier::EventTracking.url_mappings[notification.event.eventable_type.underscore.to_sym]
-          main_app.url_for Eventifier::EventTracking.url_mappings[notification.event.eventable_type.underscore.to_sym].call(notification.event.eventable)
-        else
-          main_app.url_for notification.event.eventable
-        end
+      @notification_url = main_app.url_for notification.url
       @notification_message = notification_message(notification.event)
 
       mail :to => notification.user.email,

data/lib/eventifier/notification_mixin.rb

@@ -30,6 +30,14 @@ module Eventifier
       end
     end
 
+    def url
+      if Eventifier::EventTracking.url_mappings[event.eventable_type.underscore.to_sym]
+        Eventifier::EventTracking.url_mappings[event.eventable_type.underscore.to_sym].call(event.eventable)
+      else
+        event.eventable
+      end
+    end
+
     def unread_for?(user)
       return true if user.notifications_last_read_at.nil?
       created_at > user.notifications_last_read_at

data/lib/eventifier/version.rb

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

data/spec/integration/eventifier_spec.rb

@@ -76,17 +76,17 @@ describe Eventifier 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>#{event.user.name}</strong> just created a new post - you should check it out"
+      helper.event_message(event).should == "<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>#{event.user.name}</strong> made a change to their post"
+      helper.event_message(event).should == "<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>#{event.user.name}</strong> made some changes to their post"
+      helper.event_message(event).should == "<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
@@ -100,7 +100,7 @@ describe Eventifier do
       I18n.backend.store_translations :test, :events => @event_strings
       I18n.with_locale("test") do
         event = Fabricate(:event, :eventable => Fabricate(:post), :verb => :create)
-        helper.event_message(event).should == "<strong>#{event.user.name}</strong> created a <strong>Post</strong>"
+        helper.event_message(event).should == "<strong class='user'>#{event.user.name}</strong> created a <strong>Post</strong>"
       end
     end
   end

data/spec/notification_helper_spec.rb

@@ -30,21 +30,21 @@ describe Eventifier::NotificationHelper 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>#{event.user.name}</strong> just created an Post - you should check it out"
+      helper.notification_message(event).should == "<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>#{event.user.name}</strong> made a change to their Post"
+      helper.notification_message(event).should == "<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>#{event.user.name}</strong> deleted their Post"
+      helper.notification_message(event).should == "<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>#{event.user.name}</strong> made some changes to their Post"
+      helper.notification_message(event).should == "<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
@@ -58,7 +58,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>#{event.user.name}</strong> created a <strong>Post</strong>"
+        helper.notification_message(event).should == "<strong class='user'>#{event.user.name}</strong> created a <strong>Post</strong>"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventifier
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70102747627500 !ruby/object:Gem::Requirement
+  requirement: &70264499466000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102747627500
+  version_requirements: *70264499466000
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70102747627040 !ruby/object:Gem::Requirement
+  requirement: &70264499465580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102747627040
+  version_requirements: *70264499465580
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70102747626540 !ruby/object:Gem::Requirement
+  requirement: &70264499465160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102747626540
+  version_requirements: *70264499465160
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &70102747626060 !ruby/object:Gem::Requirement
+  requirement: &70264499464720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102747626060
+  version_requirements: *70264499464720
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70102747625400 !ruby/object:Gem::Requirement
+  requirement: &70264499464260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102747625400
+  version_requirements: *70264499464260
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70102747624340 !ruby/object:Gem::Requirement
+  requirement: &70264499489580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102747624340
+  version_requirements: *70264499489580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70102747645620 !ruby/object:Gem::Requirement
+  requirement: &70264499488880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70102747645620
+  version_requirements: *70264499488880
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70102747645200 !ruby/object:Gem::Requirement
+  requirement: &70264499487960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102747645200
+  version_requirements: *70264499487960
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70102747644640 !ruby/object:Gem::Requirement
+  requirement: &70264499487320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102747644640
+  version_requirements: *70264499487320
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70102747644020 !ruby/object:Gem::Requirement
+  requirement: &70264499486680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102747644020
+  version_requirements: *70264499486680
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70102747643360 !ruby/object:Gem::Requirement
+  requirement: &70264499486000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +132,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102747643360
+  version_requirements: *70264499486000
 description: Tracks and logs events and sends notifications of events on Active Record
   models.
 email: