errplane 0.4.3 → 0.4.4

data/.gitignore

@@ -2,6 +2,7 @@
 .rvmrc
 *.gem
 Gemfile.lock
+gemfiles/*.lock
 pkg/*
-spec/app/log
-spec/rails2/log
+spec/support/rails2/log/*
+spec/support/rails3/log/*

data/README.md

@@ -38,6 +38,27 @@ In your `config/deploy.rb`, add the following line:
 
 This will automatically pull your API key from the Rails initializer and notify Errplane of every deployment.
 
+Sinatra Integration
+--------------------
+Here is a simple sinatra example app. With Sinatra you need to create an application first in the [web site](http://errplane.com/exceptions)
+
+```
+require 'sinatra'
+require 'errplane'
+
+Errplane.configure do |config|
+  config.api_key = "<API KEY HERE>"
+  config.application_id = "<APP KEY HERE>"
+  config.ignored_environments = ["development"]
+end
+
+
+get '/test_error' do
+  raise "hello"
+  "Hello World!"
+end
+````
+
 Resque Integration With Multiple Failure Backends
 -------------------------------------------------
 

data/errplane.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'json'
 
-  s.add_development_dependency 'activesupport', ['>= 2.3.14']
-  s.add_development_dependency 'actionpack', ['>= 2.3.14']
+  s.add_dependency 'activesupport', ['>= 2.3.14']
+  s.add_dependency 'actionpack', ['>= 2.3.14']
   s.add_development_dependency 'bundler', ['>= 1.0.0']
   s.add_development_dependency 'fakeweb', ['>= 0']
   s.add_development_dependency 'guard', ['>= 0']

data/lib/errplane.rb

@@ -13,7 +13,6 @@ require "errplane/backtrace"
 require "errplane/rack"
 
 require "errplane/railtie" if defined?(Rails::Railtie)
-require "errplane/sinatra" if defined?(Sinatra::Request)
 
 module Errplane
   class << self
@@ -95,3 +94,6 @@ module Errplane
     end
   end
 end
+
+require "errplane/sinatra" if defined?(Sinatra::Request)
+

data/lib/errplane/rails.rb

@@ -6,10 +6,8 @@ require 'errplane/rails/air_traffic_controller'
 module Errplane
   module Rails
     def self.initialize
-      # if defined? Rails::ActionController::Base
       ActionController::Base.send(:include, Errplane::Rails::AirTrafficController)
       ActionController::Base.send(:include, Errplane::Rails::Middleware::HijackRescueActionEverywhere)
-      # end
 
       ::Rails.configuration.middleware.insert_after 'ActionController::Failsafe', Errplane::Rack
 

data/lib/errplane/sinatra.rb

@@ -1,5 +1,5 @@
 Errplane.configure(true) do |config|
-  config.logger                ||= logger
+  config.logger                ||= ENV['rack.logger']
   config.rails_environment     ||= settings.environment
   config.application_root            ||= settings.root
   config.framework               = "Sinatra"

data/lib/errplane/version.rb

@@ -1,3 +1,3 @@
 module Errplane
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/spec/spec_helper.rb

@@ -18,7 +18,6 @@ else
     @@configuration = Configuration.new
   end
   require 'initializer'
-  RAILS_ROOT = "#{File.dirname(__FILE__)}/rails2"
 end
 
 require 'bundler/setup'
@@ -30,17 +29,16 @@ FakeWeb.allow_net_connect = false
 if defined? Rails
   puts "Loading Rails v#{Rails.version}..."
 
-  unless Rails.version.to_f < 3.0
-    require "app/rails3"
-    require "rspec/rails"
-  else
-    require "rails2/config/environment"
+  if Rails.version.to_f < 3.0
+    RAILS_ROOT = "#{File.dirname(__FILE__)}/support/rails2"
+    require "#{RAILS_ROOT}/config/environment"
     require "spec/rails"
+  else
+    require "support/rails3/app"
+    require "rspec/rails"
   end
 end
+
 if defined? Sinatra
   require 'spec_helper_for_sinatra'
 end
-
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-

data/spec/support/rails2/app/controllers/application_controller.rb

@@ -0,0 +1,4 @@
+class ApplicationController < ActionController::Base
+  helper :all
+  protect_from_forgery
+end

data/spec/{rails2 → support/rails2}/app/controllers/widgets_controller.rb

@@ -2,4 +2,3 @@ class WidgetsController < ApplicationController
   def index; render :nothing => true; end
   def new; return 1/0; end
 end
-

data/spec/support/rails2/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/support/rails2/app/helpers/widgets_helper.rb

@@ -0,0 +1,2 @@
+module WidgetsHelper
+end

data/spec/support/rails2/config/environment.rb

@@ -0,0 +1,4 @@
+Rails::Initializer.run do |config|
+  config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
+  config.time_zone = 'UTC'
+end

data/spec/support/rails2/config/initializers/cookie_verification_secret.rb

@@ -0,0 +1 @@
+ActionController::Base.cookie_verifier_secret = '171a91942320ec70c77a53d50cf62835b06a9e9e3ee8e9f045d4fe195965b9d5b30ceed7570ac6d77c20ca561229625be0cf987e8342b14f499033a271480970';

data/spec/support/rails2/config/initializers/new_rails_defaults.rb

@@ -0,0 +1,8 @@
+if defined?(ActiveRecord)
+  ActiveRecord::Base.include_root_in_json = true
+  ActiveRecord::Base.store_full_sti_class = true
+end
+
+ActionController::Routing.generate_best_match = false
+ActiveSupport.use_standard_json_time_format = true
+ActiveSupport.escape_html_entities_in_json = false

data/spec/support/rails2/config/initializers/session_store.rb

@@ -0,0 +1,4 @@
+ActionController::Base.session = {
+  :key         => '_rails-2.3_session',
+  :secret      => '76cc9f32d38e9b6227bd663076edcf28cc915dc3021da204763a73dbd0d2741f6f7074af21400d4f8f9ef6c4db72487c467edf4a1dfec732835c5674a9846dd7'
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -35,7 +35,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -51,7 +51,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -203,13 +203,9 @@ files:
 - config.ru
 - errplane.gemspec
 - gemfiles/Gemfile.rails-2.3.x
-- gemfiles/Gemfile.rails-2.3.x.lock
 - gemfiles/Gemfile.rails-3.0.x
-- gemfiles/Gemfile.rails-3.0.x.lock
 - gemfiles/Gemfile.rails-3.1.x
-- gemfiles/Gemfile.rails-3.1.x.lock
 - gemfiles/Gemfile.rails-3.2.x
-- gemfiles/Gemfile.rails-3.2.x.lock
 - generators/errplane/errplane_generator.rb
 - generators/errplane/templates/initializer.rb
 - lib/errplane.rb
@@ -232,61 +228,23 @@ files:
 - lib/rails/generators/errplane/errplane_generator.rb
 - lib/rails/generators/errplane/templates/initializer.rb
 - rails/init.rb
-- spec/app/rails2.rb
-- spec/app/rails3.rb
 - spec/controllers/widgets_controller_spec.rb
 - spec/integration/exceptions_spec.rb
 - spec/integration/integration_helper.rb
-- spec/rails2/README
-- spec/rails2/Rakefile
-- spec/rails2/app/controllers/application_controller.rb
-- spec/rails2/app/controllers/widgets_controller.rb
-- spec/rails2/app/helpers/application_helper.rb
-- spec/rails2/app/helpers/widgets_helper.rb
-- spec/rails2/config/boot.rb
-- spec/rails2/config/database.yml
-- spec/rails2/config/environment.rb
-- spec/rails2/config/environments/development.rb
-- spec/rails2/config/environments/production.rb
-- spec/rails2/config/environments/test.rb
-- spec/rails2/config/initializers/backtrace_silencers.rb
-- spec/rails2/config/initializers/cookie_verification_secret.rb
-- spec/rails2/config/initializers/errplane.rb
-- spec/rails2/config/initializers/inflections.rb
-- spec/rails2/config/initializers/mime_types.rb
-- spec/rails2/config/initializers/new_rails_defaults.rb
-- spec/rails2/config/initializers/session_store.rb
-- spec/rails2/config/locales/en.yml
-- spec/rails2/config/routes.rb
-- spec/rails2/lib/tasks/rspec.rake
-- spec/rails2/public/404.html
-- spec/rails2/public/422.html
-- spec/rails2/public/500.html
-- spec/rails2/public/favicon.ico
-- spec/rails2/public/images/rails.png
-- spec/rails2/public/index.html
-- spec/rails2/public/javascripts/application.js
-- spec/rails2/public/javascripts/controls.js
-- spec/rails2/public/javascripts/dragdrop.js
-- spec/rails2/public/javascripts/effects.js
-- spec/rails2/public/javascripts/prototype.js
-- spec/rails2/public/robots.txt
-- spec/rails2/script/about
-- spec/rails2/script/autospec
-- spec/rails2/script/console
-- spec/rails2/script/dbconsole
-- spec/rails2/script/destroy
-- spec/rails2/script/generate
-- spec/rails2/script/performance/benchmarker
-- spec/rails2/script/performance/profiler
-- spec/rails2/script/plugin
-- spec/rails2/script/runner
-- spec/rails2/script/server
-- spec/rails2/script/spec
-- spec/rails2/test/performance/browsing_test.rb
-- spec/rails2/test/test_helper.rb
 - spec/spec_helper.rb
 - spec/suite.sh
+- spec/support/rails2/app/controllers/application_controller.rb
+- spec/support/rails2/app/controllers/widgets_controller.rb
+- spec/support/rails2/app/helpers/application_helper.rb
+- spec/support/rails2/app/helpers/widgets_helper.rb
+- spec/support/rails2/config/environment.rb
+- spec/support/rails2/config/environments/test.rb
+- spec/support/rails2/config/initializers/cookie_verification_secret.rb
+- spec/support/rails2/config/initializers/errplane.rb
+- spec/support/rails2/config/initializers/new_rails_defaults.rb
+- spec/support/rails2/config/initializers/session_store.rb
+- spec/support/rails2/config/routes.rb
+- spec/support/rails3/app.rb
 - spec/unit/backtrace_spec.rb
 - spec/unit/black_box_spec.rb
 - spec/unit/configuration_spec.rb
@@ -312,66 +270,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: errplane
-rubygems_version: 1.8.24
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Rails exception reporting for Errplane.
 test_files:
-- spec/app/rails2.rb
-- spec/app/rails3.rb
 - spec/controllers/widgets_controller_spec.rb
 - spec/integration/exceptions_spec.rb
 - spec/integration/integration_helper.rb
-- spec/rails2/README
-- spec/rails2/Rakefile
-- spec/rails2/app/controllers/application_controller.rb
-- spec/rails2/app/controllers/widgets_controller.rb
-- spec/rails2/app/helpers/application_helper.rb
-- spec/rails2/app/helpers/widgets_helper.rb
-- spec/rails2/config/boot.rb
-- spec/rails2/config/database.yml
-- spec/rails2/config/environment.rb
-- spec/rails2/config/environments/development.rb
-- spec/rails2/config/environments/production.rb
-- spec/rails2/config/environments/test.rb
-- spec/rails2/config/initializers/backtrace_silencers.rb
-- spec/rails2/config/initializers/cookie_verification_secret.rb
-- spec/rails2/config/initializers/errplane.rb
-- spec/rails2/config/initializers/inflections.rb
-- spec/rails2/config/initializers/mime_types.rb
-- spec/rails2/config/initializers/new_rails_defaults.rb
-- spec/rails2/config/initializers/session_store.rb
-- spec/rails2/config/locales/en.yml
-- spec/rails2/config/routes.rb
-- spec/rails2/lib/tasks/rspec.rake
-- spec/rails2/public/404.html
-- spec/rails2/public/422.html
-- spec/rails2/public/500.html
-- spec/rails2/public/favicon.ico
-- spec/rails2/public/images/rails.png
-- spec/rails2/public/index.html
-- spec/rails2/public/javascripts/application.js
-- spec/rails2/public/javascripts/controls.js
-- spec/rails2/public/javascripts/dragdrop.js
-- spec/rails2/public/javascripts/effects.js
-- spec/rails2/public/javascripts/prototype.js
-- spec/rails2/public/robots.txt
-- spec/rails2/script/about
-- spec/rails2/script/autospec
-- spec/rails2/script/console
-- spec/rails2/script/dbconsole
-- spec/rails2/script/destroy
-- spec/rails2/script/generate
-- spec/rails2/script/performance/benchmarker
-- spec/rails2/script/performance/profiler
-- spec/rails2/script/plugin
-- spec/rails2/script/runner
-- spec/rails2/script/server
-- spec/rails2/script/spec
-- spec/rails2/test/performance/browsing_test.rb
-- spec/rails2/test/test_helper.rb
 - spec/spec_helper.rb
 - spec/suite.sh
+- spec/support/rails2/app/controllers/application_controller.rb
+- spec/support/rails2/app/controllers/widgets_controller.rb
+- spec/support/rails2/app/helpers/application_helper.rb
+- spec/support/rails2/app/helpers/widgets_helper.rb
+- spec/support/rails2/config/environment.rb
+- spec/support/rails2/config/environments/test.rb
+- spec/support/rails2/config/initializers/cookie_verification_secret.rb
+- spec/support/rails2/config/initializers/errplane.rb
+- spec/support/rails2/config/initializers/new_rails_defaults.rb
+- spec/support/rails2/config/initializers/session_store.rb
+- spec/support/rails2/config/routes.rb
+- spec/support/rails3/app.rb
 - spec/unit/backtrace_spec.rb
 - spec/unit/black_box_spec.rb
 - spec/unit/configuration_spec.rb

data/gemfiles/Gemfile.rails-2.3.x.lock

@@ -1,76 +0,0 @@
-PATH
-  remote: /Users/todd/Projects/errplane/gem
-  specs:
-    errplane (0.4.2)
-      json
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    fakeweb (1.3.0)
-    ffi (1.1.4)
-    guard (1.3.0)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-rspec (1.2.1)
-      guard (>= 1.1)
-    hoe (3.0.6)
-      rake (~> 0.8)
-    json (1.7.3)
-    listen (0.4.7)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
-    rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
-      ffi (>= 0.5.0)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (1.3.2)
-    rspec-rails (1.3.4)
-      rack (>= 1.0.0)
-      rspec (~> 1.3.1)
-    test-unit (1.2.3)
-      hoe (>= 1.5.1)
-    thor (0.15.4)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (>= 2.3.14)
-  activesupport (>= 2.3.14)
-  bundler (>= 1.0.0)
-  errplane!
-  fakeweb
-  guard
-  guard-rspec
-  rails (~> 2.3.14)
-  rake
-  rdoc
-  rspec (~> 1.3)
-  rspec-rails (~> 1.3)
-  test-unit (= 1.2.3)
-  tzinfo