resque-noti-failure 0.1.0 → 0.2.0

data/Gemfile

@@ -15,5 +15,6 @@ group :development do
   gem "rdoc"
   gem "bundler"
   gem "jeweler"
+  gem "rack-test"
 end
 

data/Gemfile.lock

@@ -24,6 +24,8 @@ GEM
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rake (10.0.4)
     rdoc (4.0.1)
       json (~> 1.4)
@@ -59,6 +61,7 @@ DEPENDENCIES
   jeweler
   mocha
   noti
+  rack-test
   rdoc
   resque
   shoulda

data/README.rdoc

@@ -1,6 +1,6 @@
 == Resque Noti Failure
 
-Sends resque failure to noti (http://notiapp.com), a tool allowing you to receive job failure directly on you desktop.
+Sends resque failure to noti (http://notiapp.com), a tool allowing you to receive notifications directly on you desktop.
 
 == Installation
 
@@ -22,11 +22,26 @@ Before using this gem, you'll need registering your application to noti (https:/
  
   Noti.app = 'your-api-key'
 
-Then you need to add a new failure backend to resque (more info about this on https://github.com/resque/resque/wiki/Failure-Backends) :
+You can configure the way Resque Noti Failure like this :
+
+  Resque::Plugins::NotiFailure::Failure.configure do |config|
+    config.failure_url = 'http://test.host/resque/failure'
+    config.failure_name = 'resque test'
+    config.failure_message = lambda{|payload| payload['class'].to_s}
+  end
+
+Finally, you have to add a new failure backend to resque (more info about this on https://github.com/resque/resque/wiki/Failure-Backends) :
+  
+  require 'resque/failure/multiple'
+  require 'resque/failure/redis'
+  require 'resque/plugins/noti_failure/failure'
 
   Resque::Failure::Multiple.classes = [Resque::Failure::Redis, Resque::Plugins::NotiFailure::Failure]
   Resque::Failure.backend = Resque::Failure::Multiple
 
+== Subscribe to notifications
+
+Once configured, you can subscribe to failure notifications through resque-web interface.
 
 == Build status
 

data/Rakefile

@@ -17,13 +17,11 @@ Jeweler::Tasks.new do |gem|
   gem.name = "resque-noti-failure"
   gem.homepage = "https://github.com/jpl/resque-noti-failure"
   gem.license = "MIT"
-  gem.summary = %Q{Send noti (https://notiapp.com/) notification from resque failure}
+  gem.summary = %Q{Send resque failure to noti (https://notiapp.com/) notification}
   # gem.description = %Q{TODO: longer description of your gem}
   gem.email = "jpl@idol.io"
   gem.authors = ["Jean-Philippe Lecaille"]
   # dependencies defined in Gemfile
-  gem.add_dependency 'noti'
-  gem.add_dependency 'resque'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/resque-noti-failure.rb

@@ -4,6 +4,7 @@ require 'resque'
 module Resque
   module Plugins
     module NotiFailure
+      require 'resque/plugins/noti_failure/configuration'
       require 'resque/plugins/noti_failure/server'
       require 'resque/plugins/noti_failure/failure'
     end

data/lib/resque/plugins/noti_failure/configuration.rb

@@ -0,0 +1,19 @@
+module Resque
+  module Plugins
+    module NotiFailure
+      class Configuration
+        attr_accessor :failure_name
+        attr_accessor :failure_url
+        attr_accessor :failure_message
+
+        def failure_name
+          @failure_name ||= 'resque'
+        end
+
+        def failure_message
+          @failure_message ||= Proc.new {|payload| "#{payload['class'].to_s}\n#{payload['args'].inspect}" }
+        end
+      end
+    end
+  end
+end

data/lib/resque/plugins/noti_failure/failure.rb

@@ -2,6 +2,14 @@ module Resque
   module Plugins
     module NotiFailure
       class Failure < Resque::Failure::Base
+        def self.configuration
+          @configuration ||= Resque::Plugins::NotiFailure::Configuration.new
+        end
+
+        def self.configure
+          yield(configuration)
+        end
+
         def self.count(queue = nil, class_name = nil)
             # We can't get the total # of errors from Noti so we fake it
             # by asking Resque how many errors it has seen.
@@ -10,15 +18,17 @@ module Resque
 
         def save
           notification        = ::Noti::Notification.new
-          notification.title  = 'resque'
-          notification.text   = "#{payload['class'].to_s}\n#{payload['args'].inspect}"
-          notification.url    = Resque::Failure.url
+          notification.title  = Resque::Plugins::NotiFailure::Failure.configuration.failure_name
+          notification.url    = Resque::Plugins::NotiFailure::Failure.configuration.failure_url
+          notification.text   = Resque::Plugins::NotiFailure::Failure.configuration.failure_message.call(payload)
 
           Resque.redis.smembers('noti-users').each do |token|
             begin
               notification.deliver_to token
             rescue Noti::Errors::AccessDenied
               Resque.redis.srem('noti-users', token)
+            rescue => error
+              Resque.logger.warn("Error sending noti failure : #{error.message}")
             end
           end
         end

data/lib/resque/plugins/noti_failure/server.rb

@@ -8,52 +8,48 @@ module Resque
           File.join(File.dirname(__FILE__), 'server', 'views', filename)
         end
 
-        def self.included(base)
-          base.class_eval do
-            get '/noti/subscribe' do
-              token = ::Noti::Token.create_request_token(to('/noti/confirm'))
-              response.set_cookie('noti-request', token.request_token)
-              redirect token.redirect_url
-            end
-
-            get '/noti/confirm' do
-              cookie = request.cookies['noti-request']
-
-              unless cookie.nil?
-                access_token = ::Noti::Token.get_access_token(cookie)
-                Resque.redis.sadd('noti-users', access_token)
-                response.delete_cookie('noti-request')
-              end
+        def self.registered(app)
+          app.get '/noti/subscribe' do
+            token = ::Noti::Token.create_request_token(to('/noti/confirm'))
+            response.set_cookie('noti-request', token.request_token)
+            redirect token.redirect_url
+          end
 
-              redirect url_path('noti')
-            end
+          app.get '/noti/confirm' do
+            cookie = request.cookies['noti-request']
 
-            get '/noti' do
-              erb File.read(Resque::Plugins::NotiFailure::Server.erb_path('noti.erb'))
+            unless cookie.nil?
+              access_token = ::Noti::Token.get_access_token(cookie)
+              Resque.redis.sadd('noti-users', access_token)
+              response.delete_cookie('noti-request')
             end
 
-            get '/noti/test' do
-              puts "Failure url : #{Resque::Failure.url}"
+            redirect url_path('noti')
+          end
 
-              notification = Noti::Notification.new
-              notification.title    = 'Test from resque'
-              notification.text     = 'Some further information about this notification'
-              notification.url      = to('/failed')
-              notification.sound    = 'alert1'
-              notification.image    = 'example'
+          app.get '/noti' do
+            erb File.read(Resque::Plugins::NotiFailure::Server.erb_path('noti.erb'))
+          end
 
-              Resque.redis.smembers('noti-users').each do |token|
-                begin
-                  notification.deliver_to token
-                rescue Noti::Errors::AccessDenied
-                  Resque.redis.srem('noti-users', token)
-                end
+          app.get '/noti/test' do
+            puts "Failure url : #{Resque::Failure.url}"
+
+            notification = Noti::Notification.new
+            notification.title    = 'Test from resque'
+            notification.text     = 'Some further information about this notification'
+            notification.url      = to('/failed')
+            notification.sound    = 'alert1'
+            notification.image    = 'example'
+
+            Resque.redis.smembers('noti-users').each do |token|
+              begin
+                notification.deliver_to token
+              rescue Noti::Errors::AccessDenied
+                Resque.redis.srem('noti-users', token)
               end
-
-              redirect url_path('noti')
             end
-            
-            Resque::Server.tabs << 'Noti'
+
+            redirect url_path('noti')
           end
         end
       end
@@ -62,5 +58,6 @@ module Resque
 end
 
 Resque::Server.class_eval do
-  include Resque::Plugins::NotiFailure::Server
+  register Resque::Plugins::NotiFailure::Server
+  tabs << 'Noti'
 end

data/resque-noti-failure.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "resque-noti-failure"
-  s.version = "0.1.0"
+  s.name = %q{resque-noti-failure}
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean-Philippe Lecaille"]
-  s.date = "2013-03-31"
-  s.email = "jpl@idol.io"
+  s.date = %q{2013-04-06}
+  s.email = %q{jpl@idol.io}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -25,19 +25,22 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/resque-noti-failure.rb",
+    "lib/resque/plugins/noti_failure/configuration.rb",
     "lib/resque/plugins/noti_failure/failure.rb",
     "lib/resque/plugins/noti_failure/server.rb",
     "lib/resque/plugins/noti_failure/server/views/noti.erb",
     "resque-noti-failure.gemspec",
     "test/helper.rb",
     "test/redis-test.conf",
-    "test/test_failure.rb"
+    "test/test_configuration.rb",
+    "test/test_failure.rb",
+    "test/test_server.rb"
   ]
-  s.homepage = "https://github.com/jpl/resque-noti-failure"
+  s.homepage = %q{https://github.com/jpl/resque-noti-failure}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
-  s.summary = "Send noti (https://notiapp.com/) notification from resque failure"
+  s.rubygems_version = %q{1.5.3}
+  s.summary = %q{Send resque failure to noti (https://notiapp.com/) notification}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -50,8 +53,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<noti>, [">= 0"])
-      s.add_runtime_dependency(%q<resque>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
     else
       s.add_dependency(%q<noti>, [">= 0"])
       s.add_dependency(%q<resque>, [">= 0"])
@@ -60,8 +62,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<noti>, [">= 0"])
-      s.add_dependency(%q<resque>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
     end
   else
     s.add_dependency(%q<noti>, [">= 0"])
@@ -71,8 +72,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<noti>, [">= 0"])
-    s.add_dependency(%q<resque>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -42,7 +42,6 @@ unless ENV['TRAVIS']
 
     pid = `ps -A -o pid,command | grep [r]edis-test`.split(" ")[0]
     puts "Killing test redis server..."
-    `rm -f #{dir}/dump.rdb`
     Process.kill("KILL", pid.to_i)
     exit exit_code
   end

data/test/test_configuration.rb

@@ -0,0 +1,14 @@
+require 'helper'
+
+class TestConfiguration < Test::Unit::TestCase
+  should "configure failure url" do
+    configuration = Resque::Plugins::NotiFailure::Failure.configuration
+    configuration.expects(:failure_url=).with('http://test.host/resque/failure')
+    configuration.expects(:failure_name=).with('resque test')
+
+    Resque::Plugins::NotiFailure::Failure.configure do |config|
+      config.failure_url = 'http://test.host/resque/failure'
+      config.failure_name = 'resque test'
+    end
+  end
+end

data/test/test_failure.rb

@@ -3,6 +3,12 @@ require 'helper'
 class TestFailure < Test::Unit::TestCase
   context "Noti" do
     setup do
+      Resque::Plugins::NotiFailure::Failure.configure do |config|
+        config.failure_url = 'http://test.host/resque/failure'
+        config.failure_name = 'resque test'
+        config.failure_message = lambda{|payload| "Resque error : #{payload['class'].to_s}"}
+      end
+
       Resque.redis.sadd('noti-users', 'user1')
       Resque.redis.sadd('noti-users', 'user2')
     end
@@ -13,7 +19,9 @@ class TestFailure < Test::Unit::TestCase
       queue = "test"
       payload = {'class' => Object, 'args' => 66}
 
-      ::Noti::Notification.any_instance.expects(:text=).with(regexp_matches(/Object/))
+      ::Noti::Notification.any_instance.expects(:title=).with('resque test')
+      ::Noti::Notification.any_instance.expects(:url=).with('http://test.host/resque/failure')
+      ::Noti::Notification.any_instance.expects(:text=).with('Resque error : Object')
       ::Noti::Notification.any_instance.expects(:deliver_to).twice.with(any_of('user1', 'user2'))
 
       backend = Resque::Plugins::NotiFailure::Failure.new(exception, worker, queue, payload)

data/test/test_server.rb

@@ -0,0 +1,38 @@
+require 'helper'
+require 'rack/test'
+
+ENV['RACK_ENV'] = 'test'
+
+class TestServer < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def setup
+    Noti.app = 'fake-noti-app-id'
+  end
+
+  def app
+    Resque::Server
+  end
+
+  def test_it_get_index
+    get '/noti'
+    assert last_response.ok?
+    assert_match 'Subscribe', last_response.body
+  end
+
+  def test_it_subscribe
+    object = mock('noti-request-token')
+    object.expects(:request_token).returns('fake-token-id')
+    object.expects(:redirect_url).returns('http//notiapp.com/subscribe')
+
+    ::Noti::Token.expects(:create_request_token).returns(object)
+    get '/noti/subscribe'
+    assert last_response.redirect?
+  end
+
+  def test_it_confirm
+    get '/noti/confirm'
+    assert last_response.redirect?
+  end
+
+end

metadata

@@ -1,168 +1,145 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: resque-noti-failure
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Jean-Philippe Lecaille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: noti
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2013-04-06 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: noti
+  version_requirements: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: resque
+  version_requirements: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: shoulda
+  version_requirements: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: mocha
+  version_requirements: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rdoc
+  version_requirements: *id005
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: bundler
+  version_requirements: *id006
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
+  version_requirements: *id007
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: noti
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rack-test
+  version_requirements: *id008
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: jpl@idol.io
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .travis.yml
 - Gemfile
@@ -172,39 +149,49 @@ files:
 - Rakefile
 - VERSION
 - lib/resque-noti-failure.rb
+- lib/resque/plugins/noti_failure/configuration.rb
 - lib/resque/plugins/noti_failure/failure.rb
 - lib/resque/plugins/noti_failure/server.rb
 - lib/resque/plugins/noti_failure/server/views/noti.erb
 - resque-noti-failure.gemspec
 - test/helper.rb
 - test/redis-test.conf
+- test/test_configuration.rb
 - test/test_failure.rb
+- test/test_server.rb
+has_rdoc: true
 homepage: https://github.com/jpl/resque-noti-failure
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 2017228891349398639
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
-summary: Send noti (https://notiapp.com/) notification from resque failure
+summary: Send resque failure to noti (https://notiapp.com/) notification
 test_files: []
+