errornot_notifier 1.0.2 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+Version 1.1.0 -
+
+ Errornot is now compatible to Rails 3
+
 Version 1.0.1 -
 ===============================================================================
 

data/README.rdoc

@@ -17,6 +17,19 @@ In your config/environment* files, remove all references to ExceptionNotifier
 
 Remove the vendor/plugins/exception_notifier directory.
 
+=== Rails 3.x
+
+Add the errornot_notifier gem to your Gemfile.  In Gemfile:
+
+  gem 'errornot_notifier'
+
+Then from your project's RAILS_ROOT, run:
+
+  bundle install
+  script/rails generate errornot --api-key your_key_here --server your_host
+
+That's it!
+
 === Rails 2.x
 
 Add the errornot_notifier gem to your app. In config/environment.rb:
@@ -26,11 +39,8 @@ Add the errornot_notifier gem to your app. In config/environment.rb:
 Then from your project's RAILS_ROOT, run:
 
   rake gems:install
-  script/generate errornot --api-key your_key_here --server your_host
-
-Once installed, you should vendor the errornot_notifier gem.
-
   rake gems:unpack GEM=errornot_notifier
+  script/generate errornot --api-key your_key_here --server your_host
 
 As always, if you choose not to vendor the errornot_notifier gem, make sure
 every server you deploy to has the gem installed or your application won't start.
@@ -300,6 +310,18 @@ Please open up a support ticket on Tender ( http://help.Errornotapp.com ) if
 you're using a version of Rails that is not listed above and the notifier is
 not working properly.
 
+== Javascript Notifer
+
+To automatically include the Javascript node on every page, set the
+:js_notifier to true:
+
+  ErrornotNotifier.configure do |config|
+    config.js_notifier = true
+  end
+
+It automatically uses the API key, host, and port specified in the
+configuration.
+
 == Thanks
 
 Thanks to Eugene Bolshakov for the excellent write-up on GOING BEYOND

data/Rakefile

@@ -195,10 +195,10 @@ def define_rails_cucumber_tasks(additional_cucumber_args = '')
   namespace :rails do
     RAILS_VERSIONS.each do |version|
       desc "Test integration of the gem with Rails #{version}"
-      task version do
+      task version => [:gemspec, :vendor_test_gems] do
         puts "Testing Rails #{version}"
         ENV['RAILS_VERSION'] = version
-        system("cucumber --format progress #{additional_cucumber_args} features/rails.feature")
+        system("cucumber --format #{ENV['CUCUMBER_FORMAT'] || 'progress'} #{additional_cucumber_args} features/rails.feature features/rails_with_js_notifier.feature")
       end
     end
 

data/SUPPORTED_RAILS_VERSIONS

@@ -6,3 +6,5 @@
 2.3.2
 2.3.4
 2.3.5
+2.3.8
+3.0.0.rc

data/generators/errornot/errornot_generator.rb

@@ -5,11 +5,12 @@ class ErrornotGenerator < Rails::Generator::Base
   def add_options!(opt)
     opt.on('-k', '--api-key=key', String, "Your ErrorNot API key") {|v| options[:api_key] = v}
     opt.on('-s', '--server=host', String, "Your host with errorNot is installed") {|v| options[:host] = v}
+    opt.on('-h', '--heroku',              "Use the Heroku addon to provide your Hoptoad API key") {|v| options[:heroku]  = v}
   end
 
   def manifest
-    if !api_key_configured? && !options[:api_key]
-      puts "Must pass --api-key or create config/initializers/errornot.rb"
+    if !api_key_configured? && !options[:api_key] && !options[:heroku]
+      puts "Must pass --api-key or --heroku or create config/initializers/errornot.rb"
       exit
     end
 
@@ -23,22 +24,30 @@ class ErrornotGenerator < Rails::Generator::Base
       if ['config/deploy.rb', 'Capfile'].all? { |file| File.exists?(file) }
         m.append_to 'config/deploy.rb', capistrano_hook
       end
-      if options[:api_key]
+      if api_key_expression
         if use_initializer?
           m.template 'initializer.rb', 'config/initializers/errornot.rb',
-            :assigns => {:api_key => options[:api_key],
+            :assigns => {:api_key => api_key_expression,
           :host => options[:host]}
         else
           m.template 'initializer.rb', 'config/errornot.rb',
-            :assigns => {:api_key => options[:api_key],
+            :assigns => {:api_key => api_key_expression,
           :host => options[:host]}
           m.append_to 'config/environment.rb', "require 'config/errornot'"
         end
       end
-      m.rake "errornot:test", :generate_only => true
+      m.rake "errornot:test --trace", :generate_only => true
     end
   end
 
+  def api_key_expression
+    s = if options[:api_key]
+          "'#{options[:api_key]}'"
+        elsif options[:heroku]
+          "ENV['HOPTOAD_API_KEY']"
+        end
+  end
+
   def use_initializer?
     Rails::VERSION::MAJOR > 1
   end

data/generators/errornot/templates/errornot_notifier_tasks.rake

@@ -6,5 +6,18 @@ unless ARGV.any? {|a| a =~ /^gems/}
     $: << File.join(vendored_notifier, 'lib')
   end
 
-  require 'errornot_notifier/tasks'
+  begin
+    require 'errornot_notifier/tasks'
+  rescue LoadError => exception
+    namespace :errornot do
+      %w(test log_stdout).each do |task_name|
+        desc "Missing dependency for errornot:#{task_name}"
+        task task_name do
+          $stderr.puts "Failed to run errornot:#{task_name} because of missing dependency."
+          $stderr.puts "You probably need to run `rake gems:install` to install the errornot_notifier gem"
+          abort exception.inspect
+        end
+      end
+    end
+  end
 end

data/generators/errornot/templates/initializer.rb

@@ -1,7 +1,7 @@
-<% if Rails::VERSION::MINOR < 2 -%>
+<% if Rails::VERSION::MAJOR < 3 && Rails::VERSION::MINOR < 2 -%>
 require 'errornot_notifier/rails'
 <% end -%>
 ErrornotNotifier.configure do |config|
-  config.api_key = '<%= api_key %>'
-  config.host = '<%= host %>'
+  config.api_key = <%= api_key_expression %>
+  config.host = '<%= options[:server] %>'
 end

data/lib/errornot_notifier.rb

@@ -9,6 +9,9 @@ require 'errornot_notifier/sender'
 require 'errornot_notifier/backtrace'
 require 'errornot_notifier/rack'
 
+#TODO: Not sure if this needs to be removed to support 2.x or not
+require 'errornot_notifier/railtie' if defined?(Rails::Railtie)
+
 # Gem for applications to automatically post errors to the Errornot of their choice.
 module ErrornotNotifier
 
@@ -125,7 +128,7 @@ module ErrornotNotifier
     def build_notice_for(exception, opts = {})
       exception = unwrap_exception(exception)
       if exception.respond_to?(:to_hash)
-        opts = opts.merge(exception)
+        opts = opts.merge(exception.to_hash)
       else
         opts = opts.merge(:exception => exception)
       end

data/lib/errornot_notifier/configuration.rb

@@ -7,7 +7,7 @@ module ErrornotNotifier
         :http_open_timeout, :http_read_timeout, :ignore, :ignore_by_filters,
         :ignore_user_agent, :notifier_name, :notifier_url, :notifier_version,
         :params_filters, :project_root, :port, :protocol, :proxy_host,
-        :proxy_pass, :proxy_port, :proxy_user, :secure, :framework].freeze
+        :proxy_pass, :proxy_port, :proxy_user, :secure, :framework, :js_notifier].freeze
 
     # The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -62,6 +62,9 @@ module ErrornotNotifier
     # +true+ if you want to check for production errors matching development errors, +false+ otherwise.
     attr_accessor :development_lookup
 
+    # +true+ if you want to enable the JavaScript notifier in production environments
+    attr_accessor :js_notifier
+
     # The name of the environment the application is running in
     attr_accessor :environment_name
 
@@ -124,6 +127,7 @@ module ErrornotNotifier
       @development_environments = %w(development test cucumber)
       @development_lookup       = true
       @notifier_name            = 'Errornot Notifier'
+      @js_notifier              = false
       @notifier_version         = VERSION
       @framework                = 'Standalone'
     end

data/lib/errornot_notifier/notice.rb

@@ -1,3 +1,5 @@
+require 'builder'
+
 module ErrornotNotifier
   class Notice
 
@@ -78,9 +80,12 @@ module ErrornotNotifier
       self.ignore_by_filters   = args[:ignore_by_filters]   || []
       self.backtrace_filters   = args[:backtrace_filters]   || []
       self.params_filters      = args[:params_filters]      || []
-      self.parameters          = args[:parameters]          || rack_env(:params) || {}
-      self.component           = args[:component] || args[:controller]
-      self.action              = args[:action]
+      self.parameters          = args[:parameters] ||
+                                   action_dispatch_params ||
+                                   rack_env(:params) ||
+                                   {}
+      self.component           = args[:component] || args[:controller] || parameters['controller']
+      self.action              = args[:action] || parameters['action']
 
       self.environment_name = args[:environment_name]
       self.cgi_data         = args[:cgi_data] || args[:rack_env]
@@ -90,8 +95,10 @@ module ErrornotNotifier
         "#{exception.class.name}: #{exception.message}"
       end
 
+      also_use_rack_params_filters
       find_session_data
       clean_params
+      clean_rack_request_data
     end
 
     # Converts the given notice to XML
@@ -114,15 +121,15 @@ module ErrornotNotifier
           'component' => controller,
           'action' => action}
 
-        unless parameters.blank?
+        unless parameters.nil? || parameters.empty?
           error['request']['params'] = parameters
         end
 
-        unless session_data.blank?
+        unless session_data.nil? || session_data.empty?
           error['session'] = session_data
         end
 
-        unless cgi_data.blank?
+        unless cgi_data.nil? || cgi_data.empty?
           error['request']['cgi-data'] = cgi_data
         end
         error['environment'] = {'root' => project_root,
@@ -226,6 +233,13 @@ module ErrornotNotifier
       end
       if session_data
         clean_unserializable_data_from(:session_data)
+        filter(session_data)
+      end
+    end
+
+    def clean_rack_request_data
+      if cgi_data
+        cgi_data.delete("rack.request.form_vars")
       end
     end
 
@@ -243,12 +257,12 @@ module ErrornotNotifier
 
     def filter_key?(key)
       params_filters.any? do |filter|
-        key.to_s.include?(filter)
+        key.to_s.include?(filter.to_s)
       end
     end
 
     def find_session_data
-      self.session_data = args[:session_data] || args[:session] || {}
+      self.session_data = args[:session_data] || args[:session] || rack_session || {}
       self.session_data = session_data[:data] if session_data[:data]
     end
 
@@ -283,5 +297,20 @@ module ErrornotNotifier
         ::Rack::Request.new(args[:rack_env])
       end
     end
+
+    def action_dispatch_params
+      args[:rack_env]['action_dispatch.request.parameters'] if args[:rack_env]
+    end
+
+    def rack_session
+      args[:rack_env]['rack.session'] if args[:rack_env]
+    end
+
+    def also_use_rack_params_filters
+      if args[:rack_env]
+        self.params_filters += rack_request.env["action_dispatch.parameter_filter"] || []
+      end
+    end
+
   end
 end

data/lib/errornot_notifier/rails.rb

@@ -2,6 +2,7 @@ require 'errornot_notifier'
 require 'errornot_notifier/rails/controller_methods'
 require 'errornot_notifier/rails/action_controller_catcher'
 require 'errornot_notifier/rails/error_lookup'
+require 'errornot_notifier/rails/javascript_notifier'
 
 module ErrornotNotifier
   module Rails
@@ -10,6 +11,7 @@ module ErrornotNotifier
         ActionController::Base.send(:include, ErrornotNotifier::Rails::ActionControllerCatcher)
         ActionController::Base.send(:include, ErrornotNotifier::Rails::ErrorLookup)
         ActionController::Base.send(:include, ErrornotNotifier::Rails::ControllerMethods)
+        ActionController::Base.send(:include, ErrornotNotifier::Rails::JavascriptNotifier)
       end
 
       rails_logger = if defined?(::Rails.logger)
@@ -20,7 +22,7 @@ module ErrornotNotifier
 
       if defined?(::Rails.configuration) && ::Rails.configuration.respond_to?(:middleware)
         ::Rails.configuration.middleware.insert_after 'ActionController::Failsafe',
-                                                      ErrornotNotifier::Rack
+          ErrornotNotifier::Rack
       end
 
       ErrornotNotifier.configure(true) do |config|
@@ -34,4 +36,3 @@ module ErrornotNotifier
 end
 
 ErrornotNotifier::Rails.initialize
-

data/lib/errornot_notifier/rails/controller_methods.rb

@@ -19,7 +19,7 @@ module ErrornotNotifier
 
       def errornot_request_data
         { :parameters       => errornot_filter_if_filtering(params.to_hash),
-          :session_data     => errornot_session_data,
+          :session_data     => errornot_filter_if_filtering(errornot_session_data),
           :controller       => params[:controller],
           :action           => params[:action],
           :url              => errornot_request_url,
@@ -27,6 +27,8 @@ module ErrornotNotifier
       end
 
       def errornot_filter_if_filtering(hash)
+        return hash if ! hash.is_a?(Hash)
+
         if respond_to?(:filter_parameters)
           filter_parameters(hash) rescue hash
         else

data/lib/errornot_notifier/rails/javascript_notifier.rb

@@ -0,0 +1,43 @@
+module ErrornotNotifier
+  module Rails
+    module JavascriptNotifier
+      def self.included(base) #:nodoc:
+        base.send(:after_filter, :insert_errornot_javascript_notifier)
+      end
+
+      private
+
+      def insert_errornot_javascript_notifier
+        return unless ErrornotNotifier.configuration.public?
+        return unless ErrornotNotifier.configuration.js_notifier
+
+        path = File.join(File.dirname(__FILE__), '..', '..', 'templates', 'javascript_notifier.erb')
+        host = ErrornotNotifier.configuration.host.dup
+        port = ErrornotNotifier.configuration.port
+        host << ":#{port}" unless [80, 443].include?(port)
+
+        options = {
+          :file          => path,
+          :layout        => false,
+          :use_full_path => false,
+          :locals        => {
+            :host        => host,
+            :secure      => ErrornotNotifier.configuration.secure,
+            :api_key     => ErrornotNotifier.configuration.api_key,
+            :environment => ErrornotNotifier.configuration.environment_name
+          }
+        }
+
+        if @template
+          javascript = @template.render(options)
+        else
+          javascript = render_to_string(options)
+        end
+
+        if response.body.respond_to?(:gsub)
+          response.body = response.body.gsub(/<(head)>/i, "<\\1>\n" + javascript)
+        end
+      end
+    end
+  end
+end

data/lib/errornot_notifier/rails3_tasks.rb

@@ -0,0 +1,86 @@
+require 'errornot_notifier'
+
+namespace :errornot do
+  desc "Notify Errornot of a new deploy."
+  task :deploy => :environment do
+    raise NotImplemented.new
+  end
+
+  desc "Verify your gem installation by sending a test exception to the errornot service"
+  task :test => [:environment] do
+    Rails.logger = Logger.new(STDOUT)
+    Rails.logger.level = Logger::DEBUG
+    ErrornotNotifier.configure(true) do |config|
+      config.logger = Rails.logger
+    end
+
+    require 'app/controllers/application_controller'
+
+    class ErrornotTestingException < RuntimeError; end
+
+    unless ErrornotNotifier.configuration.api_key
+      puts "Errornot needs an API key configured! Check the README to see how to add it."
+      exit
+    end
+
+    ErrornotNotifier.configuration.development_environments = []
+
+    puts "Configuration:"
+    ErrornotNotifier.configuration.to_hash.each do |key, value|
+      puts sprintf("%25s: %s", key.to_s, value.inspect.slice(0, 55))
+    end
+
+    unless defined?(ApplicationController)
+      puts "No ApplicationController found"
+      exit
+    end
+
+    puts 'Setting up the Controller.'
+    class ApplicationController
+      # This is to bypass any filters that may prevent access to the action.
+      prepend_before_filter :test_errornot
+      def test_errornot
+        puts "Raising '#{exception_class.name}' to simulate application failure."
+        raise exception_class.new, 'Testing errornot via "rake errornot:test". If you can see this, it works.'
+      end
+
+      # def rescue_action(exception)
+      #   rescue_action_in_public exception
+      # end
+
+      # Ensure we actually have an action to go to.
+      def verify; end
+
+      # def consider_all_requests_local
+      #   false
+      # end
+
+      # def local_request?
+      #   false
+      # end
+
+      def exception_class
+        exception_name = ENV['EXCEPTION'] || "ErrornotTestingException"
+        Object.const_get(exception_name)
+      rescue
+        Object.const_set(exception_name, Class.new(Exception))
+      end
+
+      def logger
+        nil
+      end
+    end
+    class ErrornotVerificationController < ApplicationController; end
+
+    Rails.application.routes_reloader.execute_if_updated
+    Rails.application.routes.draw do
+      match 'verify' => 'application#verify', :as => 'verify'
+    end
+
+    puts 'Processing request.'
+    env = Rack::MockRequest.env_for("/verify")
+
+    Rails.application.call(env)
+  end
+end
+

data/lib/errornot_notifier/railtie.rb

@@ -0,0 +1,31 @@
+require 'errornot_notifier'
+require 'rails'
+
+module ErrornotNotifier
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      require "errornot_notifier/rails3_tasks"
+    end
+
+    initializer "errornot.use_rack_middleware" do |app|
+      config.app_middleware.use "ErrornotNotifier::Rack"
+    end
+
+    config.after_initialize do
+      ErrornotNotifier.configure(true) do |config|
+        config.logger           = Rails.logger
+        config.environment_name = Rails.env
+        config.project_root     = Rails.root
+        config.framework        = "Rails: #{::Rails::VERSION::STRING}"
+      end
+
+      if defined?(::ActionController::Base)
+        require 'errornot_notifier/rails/javascript_notifier'
+
+        ::ActionController::Base.send(:include, ErrornotNotifier::Rails::JavascriptNotifier)
+      end
+    end
+
+
+  end
+end

data/lib/errornot_notifier/version.rb

@@ -1,3 +1,3 @@
 module ErrornotNotifier
-  VERSION = "1.0.2".freeze
+  VERSION = "1.1.0".freeze
 end

data/lib/errornot_tasks.rb

@@ -31,7 +31,13 @@ module ErrornotTasks
     opts.each {|k,v| params["deploy[#{k}]"] = v }
 
     url = URI.parse("http://#{ErrornotNotifier.configuration.host}/deploys")
-    response = Net::HTTP.post_form(url, params)
+    proxy = Net::HTTP.Proxy(ErrornotNotifier.configuration.proxy_host,
+                            ErrornotNotifier.configuration.proxy_port,
+                            ErrornotNotifier.configuration.proxy_user,
+                            ErrornotNotifier.configuration.proxy_pass)
+
+    response = proxy.post_form(url, params)
+
     puts response.body
     return Net::HTTPSuccess === response
   end

data/lib/rails/generators/errornot/errornot_generator.rb

@@ -0,0 +1,51 @@
+require 'rails/generators'
+
+class ErrornotGenerator < Rails::Generators::Base
+
+  class_option :api_key, :aliases => "-k", :type => :string, :desc => "Your Errornot API key"
+  class_option :heroku, :type => :boolean, :desc => "Use the Heroku addon to provide your Hoptoad API key"
+  class_option :server, :type => :string, :desc => "Your host of Errornot"
+
+  def self.source_root
+    @_errornot_source_root ||= File.expand_path("../../../../../generators/errornot/templates", __FILE__)
+  end
+
+  def install
+    ensure_api_key_was_configured
+    generate_initializer unless api_key_configured?
+    test_errornot
+  end
+
+  private
+
+  def ensure_api_key_was_configured
+    if !options[:api_key] && !options[:heroku] && !api_key_configured?
+      puts "Must pass --api-key or --heroku or create config/initializers/errornot.rb"
+      exit
+    end
+    if !options[:server] && !api_key_configured?
+      puts "Must pass --server or create config/initializers/errornot.rb"
+      exit
+    end
+  end
+
+  def api_key_expression
+    s = if options[:api_key]
+          "'#{options[:api_key]}'"
+        elsif options[:heroku]
+          "ENV['HOPTOAD_API_KEY']"
+        end
+  end
+
+  def generate_initializer
+    template 'initializer.rb', 'config/initializers/errornot.rb'
+  end
+
+  def api_key_configured?
+    File.exists?('config/initializers/errornot.rb')
+  end
+
+  def test_errornot
+    puts run("rake errornot:test --trace")
+  end
+end

data/lib/templates/javascript_notifier.erb

@@ -0,0 +1,6 @@
+<script type="text/javascript" src="http<%= 's' if secure %>://<%= host %>/javascripts/notifier.js"></script>
+<script type="text/javascript">
+  Errornot.setKey('<%= api_key %>');
+  Errornot.setHost('<%= host %>');
+  Errornot.setEnvironment('<%= environment %>');
+</script>

data/test/catcher_test.rb

@@ -214,10 +214,12 @@ class ActionControllerCatcherTest < Test::Unit::TestCase
     assert_sent_request_info_for controller.request
   end
 
-  should "use standard rails logging filters on params and env" do
+  should "use standard rails logging filters on params and session and env" do
     filtered_params = { "abc" => "123",
                         "def" => "456",
                         "ghi" => "[FILTERED]" }
+    filtered_session = { "abc" => "123",
+                         "ghi" => "[FILTERED]" }
     ENV['ghi'] = 'abc'
     filtered_env = { 'ghi' => '[FILTERED]' }
     filtered_cgi = { 'REQUEST_METHOD' => '[FILTERED]' }
@@ -225,10 +227,12 @@ class ActionControllerCatcherTest < Test::Unit::TestCase
     process_action_with_automatic_notification(:filters => [:ghi, :request_method],
                                                :params => { "abc" => "123",
                                                             "def" => "456",
-                                                            "ghi" => "789" })
-    assert_equal filtered_params, last_sent_notice_document['error']['request']['params']
-    assert last_sent_notice_document['error']['request']['cgi-data'].include?('REQUEST_METHOD')
-    assert_equal '[FILTERED]', last_sent_notice_document['error']['request']['cgi-data']['REQUEST_METHOD']
+                                                            "ghi" => "789" },
+                                               :session => { "abc" => "123",
+                                                             "ghi" => "789" })
+    assert_sent_hash filtered_params, '/notice/request/params'
+    assert_sent_hash filtered_cgi, '/notice/request/cgi-data'
+    assert_sent_hash filtered_session, '/notice/request/session'
   end
 
   context "for a local error with development lookup enabled" do

data/test/configuration_test.rb

@@ -27,6 +27,7 @@ class ConfigurationTest < Test::Unit::TestCase
                           ErrornotNotifier::Configuration::IGNORE_DEFAULT
     assert_config_default :development_lookup, true
     assert_config_default :framework, 'Standalone'
+    assert_config_default :js_notifier, false
   end
 
   should "provide default values for secure connections" do
@@ -82,7 +83,7 @@ class ConfigurationTest < Test::Unit::TestCase
      :http_read_timeout, :ignore, :ignore_by_filters, :ignore_user_agent,
      :notifier_name, :notifier_url, :notifier_version, :params_filters,
      :project_root, :port, :protocol, :proxy_host, :proxy_pass, :proxy_port,
-     :proxy_user, :secure, :development_lookup].each do |option|
+     :proxy_user, :secure, :development_lookup, :js_notifier].each do |option|
       assert_equal config[option], hash[option], "Wrong value for #{option}"
     end
   end

data/test/errornot_tasks_test.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/helper'
+require 'rubygems'
+
+require File.dirname(__FILE__) + '/../lib/errornot_tasks'
+require 'fakeweb'
+
+FakeWeb.allow_net_connect = false
+
+class ErrornotTasksTest < Test::Unit::TestCase
+  def successful_response(body = "")
+    response = Net::HTTPSuccess.new('1.2', '200', 'OK')
+    response.stubs(:body).returns(body)
+    return response
+  end
+
+  def unsuccessful_response(body = "")
+    response = Net::HTTPClientError.new('1.2', '200', 'OK')
+    response.stubs(:body).returns(body)
+    return response
+  end
+
+  context "being quiet" do
+    setup { ErrornotTasks.stubs(:puts) }
+
+    context "in a configured project" do
+      setup { ErrornotNotifier.configure { |config| config.api_key = "1234123412341234" } }
+
+
+      context "given an optional HTTP proxy and valid options" do
+        setup do
+          @response   = stub("response", :body => "stub body")
+          @http_proxy = stub("proxy", :post_form => @response)
+
+          Net::HTTP.expects(:Proxy).
+            with(ErrornotNotifier.configuration.proxy_host,
+                 ErrornotNotifier.configuration.proxy_port,
+                 ErrornotNotifier.configuration.proxy_user,
+                 ErrornotNotifier.configuration.proxy_pass).
+            returns(@http_proxy)
+
+          @options    = { :rails_env => "staging" }
+        end
+      end
+    end
+
+  end
+end

data/test/notice_test.rb

@@ -164,6 +164,20 @@ class NoticeTest < Test::Unit::TestCase
     assert_filters_hash(:cgi_data)
   end
 
+  should "filter session" do
+    assert_filters_hash(:session_data)
+  end
+
+  should "remove rack.request.form_vars" do
+    original = {
+      "rack.request.form_vars" => "story%5Btitle%5D=The+TODO+label",
+      "abc" => "123"
+    }
+
+    notice = build_notice(:cgi_data => original)
+    assert_equal({"abc" => "123"}, notice.cgi_data)
+  end
+
   context "a Notice turned into XML" do
     setup do
       ErrornotNotifier.configure do |config|
@@ -320,9 +334,6 @@ class NoticeTest < Test::Unit::TestCase
   end
 
   should "extract data from a rack environment hash" do
-    # TODO: extract session data
-    # TODO: extract controller
-    # TODO: extract action
     url = "https://subdomain.happylane.com:100/test/file.rb?var=value&var2=value2"
     parameters = { 'var' => 'value', 'var2' => 'value2' }
     env = Rack::MockRequest.env_for(url)
@@ -334,6 +345,35 @@ class NoticeTest < Test::Unit::TestCase
     assert_equal 'GET', notice.cgi_data['REQUEST_METHOD']
   end
 
+  should "extract data from a rack environment hash with action_dispatch info" do
+    params = { 'controller' => 'users', 'action' => 'index', 'id' => '7' }
+    env = Rack::MockRequest.env_for('/', { 'action_dispatch.request.parameters' => params })
+
+    notice = build_notice(:rack_env => env)
+
+    assert_equal params, notice.parameters
+    assert_equal params['controller'], notice.component
+    assert_equal params['action'], notice.action
+  end
+
+  should "extract session data from a rack environment" do
+    session_data = { 'something' => 'some value' }
+    env = Rack::MockRequest.env_for('/', 'rack.session' => session_data)
+
+    notice = build_notice(:rack_env => env)
+
+    assert_equal session_data, notice.session_data
+  end
+
+  should "prefer passed session data to rack session data" do
+    session_data = { 'something' => 'some value' }
+    env = Rack::MockRequest.env_for('/')
+
+    notice = build_notice(:rack_env => env, :session_data => session_data)
+
+    assert_equal session_data, notice.session_data
+  end
+
   def assert_accepts_exception_attribute(attribute, args = {}, &block)
     exception = build_exception
     block ||= lambda { exception.send(attribute) }
@@ -375,7 +415,7 @@ class NoticeTest < Test::Unit::TestCase
   end
 
   def assert_filters_hash(attribute)
-    filters  = %w(abc def)
+    filters  = ["abc", :def]
     original = { 'abc' => "123", 'def' => "456", 'ghi' => "789", 'nested' => { 'abc' => '100' } }
     filtered = { 'abc'    => "[FILTERED]",
                  'def'    => "[FILTERED]",

data/test/sender_test.rb

@@ -39,7 +39,7 @@ class SenderTest < Test::Unit::TestCase
     proxy    = stub(:new => http)
     Net::HTTP.stubs(:Proxy => proxy)
 
-    url = "http://hoptoadapp.com:80#{ErrornotNotifier::Sender::NOTICES_URI}"
+    url = "http://shingara.fr:80#{ErrornotNotifier::Sender::NOTICES_URI}"
     uri = URI.parse(url)
 
     proxy_host = 'some.host'
@@ -61,7 +61,7 @@ class SenderTest < Test::Unit::TestCase
 
   should "post to the right url for non-ssl" do
     http = stub_http
-    url = "http://hoptoadapp.com:80#{ErrornotNotifier::Sender::NOTICES_URI}"
+    url = "http://shingara.fr:80#{ErrornotNotifier::Sender::NOTICES_URI}"
     uri = URI.parse(url)
     send_exception(:secure => false)
     assert_received(http, :post) {|expect| expect.with(uri.path, anything, ErrornotNotifier::HEADERS) }

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: errornot_notifier
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - thoughtbot, inc, Cyril Mougel
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 +01:00
+date: 2010-09-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: actionpack
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,9 +64,11 @@ dependencies:
   name: jferris-mocha
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,9 +78,11 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -81,9 +92,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,46 +111,52 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- SUPPORTED_RAILS_VERSIONS
-- MIT-LICENSE
 - CHANGELOG
+- INSTALL
+- MIT-LICENSE
 - Rakefile
 - README.rdoc
-- INSTALL
+- SUPPORTED_RAILS_VERSIONS
 - TESTING.rdoc
 - generators/errornot/errornot_generator.rb
+- generators/errornot/lib/insert_commands.rb
+- generators/errornot/lib/rake_commands.rb
 - generators/errornot/templates/capistrano_hook.rb
 - generators/errornot/templates/errornot_notifier_tasks.rake
 - generators/errornot/templates/initializer.rb
-- generators/errornot/lib/rake_commands.rb
-- generators/errornot/lib/insert_commands.rb
-- lib/errornot_notifier.rb
+- lib/errornot_notifier/backtrace.rb
 - lib/errornot_notifier/capistrano.rb
+- lib/errornot_notifier/configuration.rb
+- lib/errornot_notifier/notice.rb
+- lib/errornot_notifier/rack.rb
 - lib/errornot_notifier/rails/action_controller_catcher.rb
 - lib/errornot_notifier/rails/controller_methods.rb
 - lib/errornot_notifier/rails/error_lookup.rb
-- lib/errornot_notifier/notice.rb
-- lib/errornot_notifier/version.rb
-- lib/errornot_notifier/sender.rb
-- lib/errornot_notifier/rack.rb
+- lib/errornot_notifier/rails/javascript_notifier.rb
 - lib/errornot_notifier/rails.rb
+- lib/errornot_notifier/rails3_tasks.rb
+- lib/errornot_notifier/railtie.rb
+- lib/errornot_notifier/sender.rb
 - lib/errornot_notifier/tasks.rb
-- lib/errornot_notifier/backtrace.rb
-- lib/errornot_notifier/configuration.rb
+- lib/errornot_notifier/version.rb
+- lib/errornot_notifier.rb
 - lib/errornot_tasks.rb
+- lib/rails/generators/errornot/errornot_generator.rb
+- test/backtrace_test.rb
 - test/catcher_test.rb
 - test/configuration_test.rb
-- test/backtrace_test.rb
 - test/erronot_tasks_test.rb
-- test/rails_initializer_test.rb
+- test/errornot_tasks_test.rb
 - test/helper.rb
+- test/logger_test.rb
 - test/notice_test.rb
 - test/notifier_test.rb
 - test/rack_test.rb
-- test/logger_test.rb
+- test/rails_initializer_test.rb
 - test/sender_test.rb
 - rails/init.rb
 - script/integration_test.rb
+- lib/templates/javascript_notifier.erb
 - lib/templates/rescue.erb
 has_rdoc: true
 homepage: http://github.com/shingara/errornot_notifier
@@ -151,34 +170,39 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Send your application errors to a hosted service and reclaim your inbox.
 test_files: 
+- test/backtrace_test.rb
 - test/catcher_test.rb
 - test/configuration_test.rb
-- test/backtrace_test.rb
 - test/erronot_tasks_test.rb
-- test/rails_initializer_test.rb
+- test/errornot_tasks_test.rb
+- test/logger_test.rb
 - test/notice_test.rb
 - test/notifier_test.rb
 - test/rack_test.rb
-- test/logger_test.rb
+- test/rails_initializer_test.rb
 - test/sender_test.rb