exceptioner 0.0.4 → 0.0.5

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+.rvmrc

data/CHANGELOG.rdoc

@@ -0,0 +1,8 @@
+= CHANGELOG
+
+== 0.0.5 (13.01.2011)
+* fixed environment variables formatting
+* got rid of jeweler in favour of bundler
+* provide String#camelize if not available already
+* dispatch when rack.exception given
+* tests for mail and jabber transports

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    exceptioner (0.0.5)
+      mail (~> 2.2)
+      xmpp4r (~> 0.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.3)
+    i18n (0.5.0)
+    mail (2.2.14)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mocha (0.9.10)
+      rake
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rake (0.8.7)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    xmpp4r (0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  exceptioner!
+  mail (~> 2.2)
+  mocha
+  rack-test
+  xmpp4r (~> 0.5)

data/Rakefile

@@ -1,48 +1,13 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "exceptioner"
-    gem.summary = %Q{Be notified about exceptions by various transports Email, Jabber, RSS. Choose the option you want}
-    gem.description = %Q{The most common use is to use Exceptioner as rack middleware and send notifications when an exception occur in you web application. It may be used with Rails, Sinatra or any other rack citizen. 
-      Exceptioner may be also used with any ruby code you want. Just configure delivery methods and don't miss any exception.}
-    gem.email = "michal@lomnicki.com.pl"
-    gem.homepage = "http://github.com/mlomnicki/exceptioner"
-    gem.authors = ["Michał Łomnicki"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "mail", "~> 2.2"
-    gem.add_dependency "xmpp4r", "~> 0.5"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "exceptioner #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require 'bundler'
+require 'rake/testtask'
+Bundler::GemHelper.install_tasks
+
+task :default => :test
+
+desc 'Run Exceptioner unit tests.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
 end

data/exceptioner.gemspec

@@ -1,79 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "exceptioner/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{exceptioner}
-  s.version = "0.0.4"
+  s.name        = "exceptioner"
+  s.version     = Exceptioner::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Michał Łomnicki"]
+  s.email       = ["michal.lomnicki@gmail.com"]
+  s.homepage    = "https://github.com/mlomnicki/exceptioner"
+  s.summary     = "Stay notified of exceptions raised by your application. Choose from various notification methods like Email, Jabber or IRC"
+  s.description = "Exceptioner is meant to be for hoptoad, exception_notification or getexceptional. It's fully customizable and works with each kind of ruby application"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Micha\305\202 \305\201omnicki"]
-  s.date = %q{2010-12-16}
-  s.description = %q{The most common use is to use Exceptioner as rack middleware and send notifications when an exception occur in you web application. It may be used with Rails, Sinatra or any other rack citizen. 
-      Exceptioner may be also used with any ruby code you want. Just configure delivery methods and don't miss any exception.}
-  s.email = %q{michal@lomnicki.com.pl}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "exceptioner.gemspec",
-     "init.rb",
-     "lib/exceptioner.rb",
-     "lib/exceptioner/action_controller.rb",
-     "lib/exceptioner/core_ext/class/attribute.rb",
-     "lib/exceptioner/core_ext/kernel/singleton_class.rb",
-     "lib/exceptioner/core_ext/module/attribute_accessors.rb",
-     "lib/exceptioner/core_ext/module/remove_method.rb",
-     "lib/exceptioner/middleware.rb",
-     "lib/exceptioner/notifier.rb",
-     "lib/exceptioner/railtie.rb",
-     "lib/exceptioner/transport/base.rb",
-     "lib/exceptioner/transport/helper.rb",
-     "lib/exceptioner/transport/jabber/jabber.rb",
-     "lib/exceptioner/transport/mail/mail.rb",
-     "lib/exceptioner/transport/templates/exception.erb",
-     "lib/generators/exceptioner/USAGE",
-     "lib/generators/exceptioner/install_generator.rb",
-     "lib/generators/exceptioner/templates/exceptioner.rb",
-     "spec/exceptioner_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/mlomnicki/exceptioner}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.rubyforge_project = "exceptioner"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Be notified about exceptions by various transports Email, Jabber, RSS. Choose the option you want}
-  s.test_files = [
-    "spec/exceptioner_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency("mail", ["~> 2.2"])
+  s.add_dependency("xmpp4r", ["~> 0.5"])
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<mail>, ["~> 2.2"])
-      s.add_runtime_dependency(%q<xmpp4r>, ["~> 0.5"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<mail>, ["~> 2.2"])
-      s.add_dependency(%q<xmpp4r>, ["~> 0.5"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<mail>, ["~> 2.2"])
-    s.add_dependency(%q<xmpp4r>, ["~> 0.5"])
-  end
+  s.add_development_dependency("rack-test")
+  s.add_development_dependency("mocha")
 end
-

data/lib/exceptioner.rb

@@ -1,5 +1,7 @@
 require 'exceptioner/core_ext/class/attribute'
 require 'exceptioner/core_ext/module/attribute_accessors'
+require 'exceptioner/core_ext/string/inflections'
+require 'exceptioner/version'
 require 'exceptioner/railtie' if defined?(Rails::Railtie)
 
 module Exceptioner
@@ -8,6 +10,7 @@ module Exceptioner
 
   autoload :Middleware,       'exceptioner/middleware'
   autoload :ActionController, 'exceptioner/action_controller'
+  autoload :Notifier,         'exceptioner/notifier'
   
   module Transport
     autoload :Mail, 'exceptioner/transport/mail/mail'

data/lib/exceptioner/core_ext/string/inflections.rb

@@ -0,0 +1,7 @@
+class String
+
+  def camelize
+    gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+  end unless method_defined?(:camelize)
+
+end

data/lib/exceptioner/middleware.rb

@@ -9,11 +9,16 @@ module Exceptioner
 
     def call(env)
       begin
-        @app.call(env)
+        response = @app.call(env)
       rescue Exception => exception
         Notifier.dispatch(exception, :controller => env['action_controller.instance'], :env => env)
         raise exception
       end
+      if env['rack.exception']
+        Notifier.dispatch(env['rack.exception'], :controller => env['action_controller.instance'], :env => env)
+      end
+      
+      response
     end
 
   end

data/lib/exceptioner/transport/helper.rb

@@ -6,9 +6,9 @@ module Exceptioner::Transport
       unless env.empty?
         max_length = env.keys.max_by { |key| key.to_s.size }.size
         env.keys.sort.collect do |key|
-          "* #{"%-*s: %s" % [max_length, key, env[key].to_s.strip[0..50]]}\n\t"
+          "* #{"%-*s: %s" % [max_length, key, env[key].to_s.strip[0..50]]}"
         end
-      end
+      end.join("\n\t")
     end
 
     def title(text)

data/lib/exceptioner/version.rb

@@ -0,0 +1,3 @@
+module Exceptioner
+  VERSION = "0.0.5"
+end

data/test/helper.rb

@@ -0,0 +1,27 @@
+require 'test/unit'
+require 'mocha'
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+
+require 'exceptioner'
+require 'rack'
+require 'mock_smtp'
+
+class Test::Unit::TestCase
+
+  def get_exception
+    raise
+  rescue => exception
+    exception
+  end
+
+  def config
+    Exceptioner
+  end
+
+  def mail_system
+    MockSMTP
+  end
+
+end

data/test/mock_smtp.rb

@@ -0,0 +1,50 @@
+# Original mockup from ActionMailer
+require 'net/smtp'
+class MockSMTP
+  
+  def self.deliveries
+    @@deliveries
+  end
+
+  def initialize
+    @@deliveries = []
+  end
+
+  def sendmail(body, from, to)
+    @@deliveries << Mail.new(:from => from, :to => to, :body => body)
+  end
+
+  def start(*args)
+    yield self
+  end
+  
+  def self.clear_deliveries
+    @@deliveries = []
+  end
+  
+  # in the standard lib: net/smtp.rb line 577
+  #   a TypeError is thrown unless this arg is a
+  #   kind of OpenSSL::SSL::SSLContext
+  def enable_tls(context = nil)
+    if context && context.kind_of?(OpenSSL::SSL::SSLContext)
+      true
+    elsif context
+      raise TypeError,
+        "wrong argument (#{context.class})! "+
+        "(Expected kind of OpenSSL::SSL::SSLContext)"
+    end
+  end
+
+  def enable_starttls_auto
+    true
+  end
+  
+end
+
+class Net::SMTP
+  def self.new(*args)
+    MockSMTP.new
+  end
+end
+
+

data/test/notifier_test.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require 'xmpp4r'
+
+class NotifierTest < Test::Unit::TestCase
+
+  def setup
+    Exceptioner::Notifier.stubs(:dispatch_exception).returns(true)
+    config.mail.recipients = %w[michal@example.net]
+    config.jabber.jabber_id = %w[jabber@example.net]
+    config.jabber.password = 'secret'
+    config.jabber.recipients = %w[michal@example.net]
+  end
+
+  def test_deliver_exception_by_email
+    exception = get_exception
+    Exceptioner::Notifier.stubs(:transports).returns([:mail])
+    Exceptioner::Notifier.dispatch(exception)
+    assert_equal mail_system.deliveries.size, 1
+
+  end
+
+  def test_deliver_exception_by_jabber
+    exception = get_exception
+    Exceptioner::Notifier.stubs(:transports).returns([:jabber])
+    Jabber::Client.any_instance.expects(:connect).once
+    Jabber::Client.any_instance.expects(:auth).with(config.jabber.password).once
+    Jabber::Client.any_instance.expects(:send).once
+    Exceptioner::Notifier.dispatch(exception)
+  end
+
+end

data/test/rack_test.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class RackTest < Test::Unit::TestCase
+    
+  def test_should_dispatch_exception
+    exception = get_exception
+    app = lambda { |env| raise exception  }
+    environment = { 'key' => 'value' }
+
+    Exceptioner::Notifier.expects(:dispatch).with(exception, has_entry(:env, environment))
+    
+    begin
+      stack = Exceptioner::Middleware.new(app)
+      stack.call(environment)
+    rescue Exception => raised
+      assert_equal exception, raised
+    else
+      flunk "Didn't raise an exception"
+    end
+
+  end
+
+  def test_should_assign_exception_to_rack_exception
+    exception = get_exception
+    response = [200, {}, ['hello world']]
+    environment = { 'key' => 'value' }
+    app = lambda do |env| 
+      env['rack.exception'] = exception
+      response
+    end
+
+    Exceptioner::Notifier.expects(:dispatch).with(exception, has_entry(:env, environment))
+
+    stack = Exceptioner::Middleware.new(app)
+
+    actual_response = stack.call(environment)
+    assert_equal response, actual_response
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"
@@ -14,67 +14,81 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +01:00
+date: 2011-01-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: mail
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
-  type: :development
+        - 2
+        version: "2.2"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mail
+  name: xmpp4r
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 2
-        version: "2.2"
+        - 0
+        - 5
+        version: "0.5"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: xmpp4r
+  name: rack-test
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
-        version: "0.5"
-  type: :runtime
+        version: "0"
+  type: :development
   version_requirements: *id003
-description: |-
-  The most common use is to use Exceptioner as rack middleware and send notifications when an exception occur in you web application. It may be used with Rails, Sinatra or any other rack citizen. 
-        Exceptioner may be also used with any ruby code you want. Just configure delivery methods and don't miss any exception.
-email: michal@lomnicki.com.pl
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: Exceptioner is meant to be for hoptoad, exception_notification or getexceptional. It's fully customizable and works with each kind of ruby application
+email: 
+- michal.lomnicki@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - exceptioner.gemspec
 - init.rb
 - lib/exceptioner.rb
@@ -83,6 +97,7 @@ files:
 - lib/exceptioner/core_ext/kernel/singleton_class.rb
 - lib/exceptioner/core_ext/module/attribute_accessors.rb
 - lib/exceptioner/core_ext/module/remove_method.rb
+- lib/exceptioner/core_ext/string/inflections.rb
 - lib/exceptioner/middleware.rb
 - lib/exceptioner/notifier.rb
 - lib/exceptioner/railtie.rb
@@ -91,22 +106,28 @@ files:
 - lib/exceptioner/transport/jabber/jabber.rb
 - lib/exceptioner/transport/mail/mail.rb
 - lib/exceptioner/transport/templates/exception.erb
+- lib/exceptioner/version.rb
 - lib/generators/exceptioner/USAGE
 - lib/generators/exceptioner/install_generator.rb
 - lib/generators/exceptioner/templates/exceptioner.rb
 - spec/exceptioner_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- test/helper.rb
+- test/mock_smtp.rb
+- test/notifier_test.rb
+- test/rack_test.rb
 has_rdoc: true
-homepage: http://github.com/mlomnicki/exceptioner
+homepage: https://github.com/mlomnicki/exceptioner
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -114,6 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -122,11 +144,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: exceptioner
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Be notified about exceptions by various transports Email, Jabber, RSS. Choose the option you want
-test_files: 
-- spec/exceptioner_spec.rb
-- spec/spec_helper.rb
+summary: Stay notified of exceptions raised by your application. Choose from various notification methods like Email, Jabber or IRC
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.0.4