eventifier 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2071b87e51e9744870630017008eab9348b7d4fe
-  data.tar.gz: 005ab9667e45c84e6772482af80145e047d2ed0d
+  metadata.gz: 0b2058a8b8853d745b422702127a30d6f813782f
+  data.tar.gz: 15cc3e4c382f87e2fabb2e39c9491564125de1c1
 SHA512:
-  metadata.gz: a19f718a1c2e30dfe1861c46738c171f753c71cd358a737f79f4a4e657015a4f547afe10474ea18492e79e3b8e48c909cf3a3c1e3e5fe4ea5d5f1e54e9087c7b
-  data.tar.gz: 5aab6adecdd25f9fdd5879c240c1c7f485ea725cd068b5f74b71fb12f40929a3577ab3bbce3d59924d94cee95b562d93784c24a4cdfffe6aadfa6b0dbb056848
+  metadata.gz: 1c97b31eafca299de510fac186d067513d7172110217bc989b9e65fc44af6a3907cc056f39a4bda8f6b8f3ec70ec076bb11d19d809a5e1d5659e1ef78ec52054
+  data.tar.gz: 09fe86cdb9b773bd3bbeeec95a575a20ec99b957d534e44474c2188b87a03c0fc491ee2e7cbe070bd7b7b451fd669ba93fc8b861fb072979ad7ec4e447e944be

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.1
   # - jruby-19mode # JRuby in 1.9 mode
 before_script:
   - psql -c 'create database eventifier;' -U postgres

data/app/assets/javascripts/eventifier/notifications.coffee

@@ -78,9 +78,10 @@ class window.NotificationDropdown
           else
             @el
               .find('ol')
-              .prepend @lastInserted = $("<li />")
+              .prepend( @lastInserted = $("<li />")
                 .addClass('unread')
                 .html(notification.html)
+            )
         else
           @el
           .find('ol')

data/app/helpers/eventifier/path_helper.rb

@@ -5,8 +5,9 @@ module Eventifier
     end
 
     def partial_path notification, context = nil
-      if lookup_context.exists?(notification.event.eventable_type.underscore, [[:eventifier, context].compact.join("/")], true)
-        [:eventifier, context, notification.event.eventable_type.underscore].compact.join("/")
+      eventable_path = notification.event.eventable_type.underscore.gsub('/', '_')
+      if lookup_context.exists?(eventable_path, [[:eventifier, context].compact.join("/")], true)
+        [:eventifier, context, eventable_path].compact.join("/")
       else
         [:eventifier, context, 'notification'].compact.join("/")
       end

data/eventifier.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "eventifier"
-  s.version     = '0.1.1'
+  s.version     = '0.1.2'
   s.authors     = ["Nathan Sampimon", "Peter Murray", "Pat Allan"]
   s.email       = ["nathan@inspire9.com"]
   s.homepage    = "http://github.com/inspire9/eventifier"
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'haml_coffee_assets'
   s.add_runtime_dependency 'coffee-rails',    '~> 4.0.0'
   s.add_runtime_dependency 'compass-rails'
-  s.add_runtime_dependency 'multi_json',      '~> 1.7.4'
-  s.add_runtime_dependency 'jbuilder',        '~> 2.0.4'
+  s.add_runtime_dependency 'multi_json',      '>= 1.7.4'
+  s.add_runtime_dependency 'jbuilder',        '>= 2.0.4'
   s.add_runtime_dependency 'rails-observers', '~> 0.1.2'
 
   s.add_development_dependency 'combustion',  '~> 0.5.0'

data/lib/eventifier/event_subscriber.rb

@@ -13,10 +13,9 @@ class Eventifier::EventSubscriber
     return if notifications.notifier.listening?(name)
 
     notifications.subscribe(name) do |*args|
-      event = EventTranslator.new(*args).translate
-
+      event = Eventifier::EventTranslator.new(*args).translate
       notifications.instrument "#{prefix}.notification.eventifier",
-        verb: :create, event: event, object: event.eventable
+        verb: :create, event: event, object: event.eventable unless event.nil?
     end
   end
 

data/lib/eventifier/event_tracking.rb

@@ -18,15 +18,15 @@ module Eventifier
       Eventifier.tracked_classes.uniq!
     end
 
-    def track_on methods, options = {}
+    def track_on(methods, options = {})
       Eventifier::Tracker.new @klasses, methods, options
     end
 
-    def notify *args
+    def notify(*args)
       Eventifier::Notifier.new @klasses, *args
     end
 
-    def url url_proc
+    def url(url_proc)
       @klasses.each do |target_klass|
         Eventifier::EventTracking.url_mappings[target_klass.name.underscore.to_sym] = url_proc
       end
@@ -36,4 +36,4 @@ module Eventifier
       @url_mapppings ||= {}
     end
   end
-end
+end

data/lib/eventifier/event_translator.rb

@@ -1,11 +1,13 @@
-class EventTranslator
+class Eventifier::EventTranslator
   def initialize(*args)
     @event = ActiveSupport::Notifications::Event.new *args
   end
 
   def translate
+    return unless conditional_call
+
     Eventifier::EventBuilder.store payload[:object], user, payload[:event],
-      groupable, payload[:options]
+      groupable, options.except(:if, :unless)
   end
 
   private
@@ -14,10 +16,28 @@ class EventTranslator
 
   delegate :payload, to: :event
 
+  def conditional
+    options[:if] || options[:unless]
+  end
+
+  def conditional_call
+    if options[:if]
+      conditional.call payload[:object]
+    elsif options[:unless]
+      !conditional.call payload[:object]
+    else
+      true
+    end
+  end
+
   def groupable
     payload[:group_by] ? relationship(payload[:group_by]) : payload[:object]
   end
 
+  def options
+    payload[:options] || {}
+  end
+
   def relationship(key)
     Eventifier::Relationship.new(payload[:object], key).users.first
   end

data/lib/eventifier/tracker.rb

@@ -1,6 +1,6 @@
 module Eventifier
   class Tracker
-    def initialize klasses, methods, options
+    def initialize(klasses, methods, options)
       @klasses   = klasses
       methods    = methods.kind_of?(Array) ? methods : [methods]
       raise 'No events defined to track' if methods.compact.empty?

data/spec/eventifier/event_translator_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Eventifier::EventTranslator do
+  let(:event)        { double payload: {object: eventable, event: :update,
+   options: {foo: :bar}} }
+  let(:eventable)    { double 'Eventable', user: user }
+  let(:user)         { double 'User' }
+  let(:relationship) { double 'Relationship', users: [group] }
+  let(:group)        { double 'Group' }
+
+  before :each do
+    allow(ActiveSupport::Notifications::Event).to receive(:new).and_return event
+    allow(Eventifier::EventBuilder).to receive(:store).and_return(true)
+    allow(Eventifier::Relationship).to receive(:new).and_return(relationship)
+  end
+
+  describe '#translate' do
+    it 'builds a new event' do
+      expect(Eventifier::EventBuilder).to receive(:store).with(
+        eventable, user, :update, eventable, {foo: :bar}
+      )
+
+      Eventifier::EventTranslator.new.translate
+    end
+
+    it 'calculates the groupable object if a group_by option is provided' do
+      event.payload[:group_by] = :groupable
+
+      expect(Eventifier::EventBuilder).to receive(:store).with(
+        eventable, user, :update, group, {foo: :bar}
+      )
+
+      Eventifier::EventTranslator.new.translate
+    end
+
+    it 'finds the user via an association if provided' do
+      event.payload[:user] = :person
+
+      expect(Eventifier::EventBuilder).to receive(:store).with(
+        eventable, group, :update, eventable, {foo: :bar}
+      )
+
+      Eventifier::EventTranslator.new.translate
+    end
+
+    it "creates an event when :if is set and returns true" do
+      event.payload[:options][:if] = Proc.new { |object| true }
+
+      expect(Eventifier::EventBuilder).to receive(:store).with(
+        eventable, user, :update, eventable, {foo: :bar}
+      )
+
+      Eventifier::EventTranslator.new.translate
+    end
+
+    it "does not create an event when :if is set and returns false" do
+      event.payload[:options][:if] = Proc.new { |object| false }
+
+      expect(Eventifier::EventBuilder).to_not receive(:store)
+
+      Eventifier::EventTranslator.new.translate
+    end
+
+    it "creates an event when :unless is set and returns false" do
+      event.payload[:options][:unless] = Proc.new { |object| false }
+
+      expect(Eventifier::EventBuilder).to receive(:store).with(
+        eventable, user, :update, eventable, {foo: :bar}
+      )
+
+      Eventifier::EventTranslator.new.translate
+    end
+
+    it "does not create an event when :unless is set and returns true" do
+      event.payload[:options][:unless] = Proc.new { |object| true }
+
+      expect(Eventifier::EventBuilder).to_not receive(:store)
+
+      Eventifier::EventTranslator.new.translate
+    end
+  end
+end

data/spec/eventifier/notification_translator_spec.rb

@@ -31,7 +31,7 @@ describe Eventifier::NotificationTranslator do
       translator.translate
     end
 
-    it "does not create an event for the originator's user" do
+    it "does not create a notification for the originator's user" do
       event.stub user: user_a
 
       Eventifier::Notification.should_not_receive(:create).
@@ -55,7 +55,7 @@ describe Eventifier::NotificationTranslator do
       translator.translate
     end
 
-    it "creates an event when :if is set and returns true" do
+    it "creates a notification when :if is set and returns true" do
       options[:if] = Proc.new { |event, user| true }
 
       Eventifier::Notification.should_receive(:create).
@@ -66,7 +66,7 @@ describe Eventifier::NotificationTranslator do
       translator.translate
     end
 
-    it "does not create an event when :if is set and returns false" do
+    it "does not create a notification when :if is set and returns false" do
       options[:if] = Proc.new { |event, user| false }
 
       Eventifier::Notification.should_not_receive(:create).
@@ -77,7 +77,7 @@ describe Eventifier::NotificationTranslator do
       translator.translate
     end
 
-    it "creates an event when :unless is set and returns false" do
+    it "creates a notification when :unless is set and returns false" do
       options[:unless] = Proc.new { |event, user| false }
 
       Eventifier::Notification.should_receive(:create).
@@ -88,7 +88,7 @@ describe Eventifier::NotificationTranslator do
       translator.translate
     end
 
-    it "does not create an event when :unless is set and returns true" do
+    it "does not create a notification when :unless is set and returns true" do
       options[:unless] = Proc.new { |event, user| true }
 
       Eventifier::Notification.should_not_receive(:create).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventifier
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nathan Sampimon
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,28 +100,28 @@ dependencies:
   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: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.4
 - !ruby/object:Gem::Dependency
@@ -262,6 +262,7 @@ files:
 - spec/controllers/eventifier/preferences_controller_spec.rb
 - spec/event_tracking_spec.rb
 - spec/eventifier/delivery_spec.rb
+- spec/eventifier/event_translator_spec.rb
 - spec/eventifier/notification_translator_spec.rb
 - spec/eventifier/preferences_spec.rb
 - spec/eventifier/relationship_spec.rb
@@ -324,6 +325,7 @@ test_files:
 - spec/controllers/eventifier/preferences_controller_spec.rb
 - spec/event_tracking_spec.rb
 - spec/eventifier/delivery_spec.rb
+- spec/eventifier/event_translator_spec.rb
 - spec/eventifier/notification_translator_spec.rb
 - spec/eventifier/preferences_spec.rb
 - spec/eventifier/relationship_spec.rb