captivus 0.0.3 → 0.0.5

data/spec/integration/events_from_rack_spec.rb

@@ -1,94 +1,132 @@
 require 'spec_helper'
-require 'captivus'
+require 'captivus/rack_capturer'
 
-describe 'Reporting from a rack app' do
+describe 'Reporting from a rack app - when installed as middleware in a Rack app' do
   include Rack::Test::Methods
 
   before do
     Captivus.configure do |config|
       config.api_key = 'api-key'
       config.api_secret_key = 'secret'
+      config.environment = 'production'
     end
+    Timecop.freeze Time.utc(2012, 8, 23, 16, 34, 19)
   end
+  after { Timecop.return }
 
-  context "when installed as middleware in a Rack app" do
-    def app
-      Rack::Builder.app do
-        use Captivus::RackCapturer
-        run lambda { |env| raise StandardError, "Error from Rack app" }
-      end
+  def app
+    Rack::Builder.app do
+      use Captivus::RackCapturer
+      run lambda { |env| raise Exception, "Error from Rack app" }
     end
+  end
+
+  it "errors are raised as expected" do
+    expect { get '/' }.to raise_error Exception, "Error from Rack app"
+  end
 
-    it "errors are raised as expected" do
-      expect { get '/' }.to raise_error StandardError, "Error from Rack app"
+  it "reports errors to the Captivus API" do
+    begin
+      get '/', 'username' => 'austin', 'password' => 'secret'
+    rescue Exception
     end
 
-    it "reports errors to the Captivus API" do
-      Timecop.freeze Time.utc(2012, 8, 23, 16, 34, 19)
-
-      get '/' rescue nil
-
-      expect(captivus_api.requests.size).to eq 1
-
-      last_request = captivus_api.requests[0]
-
-      headers = {
-        "CONTENT_TYPE"=>"application/json; charset=UTF-8",
-        "HTTP_ACCEPT" => "*/*",
-        "HTTP_USER_AGENT" => "Ruby",
-        "HTTP_DATE" => "Thu, 23 Aug 2012 16:34:19 GMT",
-        "HTTP_AUTHORIZATION" => "Captivus api-key:syLWMLH8mJ4jTFGO2lVe+9PfgVo=",
-        "PATH_INFO" => "/events",
-        "QUERY_STRING" => "",
-        "REQUEST_METHOD"=>"POST",
-        "SCRIPT_NAME" => "",
-        "SERVER_NAME" => "api.captiv.us",
-        "SERVER_PORT" => "80",
-        "rack.url_scheme" => "http"
-      }
-
-      expect(last_request.values_at(*headers.keys)).to eq headers.values
-
-      MultiJson.load(last_request['rack.input'].read).tap do |payload|
-        expect(payload.keys).to match_array ['event', 'backtrace']
-
-        payload['event'].tap do |event|
-          expect(event.keys).to match_array ['type', 'message', 'timestamp']
-
-          expect(event['type']).to eq "StandardError"
-          expect(event['message']).to eq "Error from Rack app"
-          expect(event['timestamp']).to eq "2012-08-23 16:34:19 UTC"
-        end
-
-        expect(payload['backtrace'].size > 10).to be_true
-        expect(payload['backtrace'][0..2]).to eq [{
-          "file" => "/Users/austin/projects/captivus/gem/spec/integration/events_from_rack_spec.rb",
-          "number"=> 18,
-          "method" => "block (2 levels) in app"
-        }, {
-          "file" => "/Users/austin/projects/captivus/gem/lib/captivus/rack_capturer.rb",
-          "number"=> 13,
-          "method" => "call"
-        }, {
-          "file" => "/Users/austin/projects/captivus/gem/lib/captivus/rack_capturer.rb",
-          "number"=> 13,
-          "method" => "call"
-        }]
+    expect(captivus_api.requests.size).to eq 1
+
+    last_request = captivus_api.requests[0]
+
+    headers = {
+      "CONTENT_TYPE"=>"application/json; charset=UTF-8",
+      "HTTP_ACCEPT" => "*/*",
+      "HTTP_USER_AGENT" => "Ruby",
+      "HTTP_DATE" => "Thu, 23 Aug 2012 16:34:19 GMT",
+      "HTTP_AUTHORIZATION" => "Captivus api-key:syLWMLH8mJ4jTFGO2lVe+9PfgVo=",
+      "PATH_INFO" => "/events",
+      "QUERY_STRING" => "",
+      "REQUEST_METHOD"=>"POST",
+      "SCRIPT_NAME" => "",
+      "SERVER_NAME" => "api.captiv.us",
+      "SERVER_PORT" => "80",
+      "rack.url_scheme" => "http"
+    }
+
+    expect(last_request.values_at(*headers.keys)).to eq headers.values
+
+    json_to_hash(last_request['rack.input'].read).tap do |payload|
+      expect(payload.keys).to match_array %w[notifier event backtrace environment context]
+
+      payload['notifier'].tap do |notifier|
+        expect(notifier.keys).to match_array %w[name version language]
+
+        expect(notifier['name']).to eq 'captivus'
+        expect(notifier['version']).to eq Captivus::VERSION
+        expect(notifier['language']).to eq 'Ruby'
+      end
+
+      payload['event'].tap do |event|
+        expect(event.keys).to match_array %w[type message timestamp]
+
+        expect(event['type']).to eq 'Exception'
+        expect(event['message']).to eq 'Error from Rack app'
+        expect(event['timestamp']).to eq '2012-08-23T16:34:19Z'
       end
 
-      Timecop.return
-
-      # possible things to care about
-      # "GATEWAY_INTERFACE"=>"CGI/1.1",
-      # "REMOTE_ADDR"=>"127.0.0.1",
-      # "REMOTE_HOST"=>"localhost",
-      # "REQUEST_URI"=>"http://localhost:9293/events",
-      # "SERVER_PROTOCOL"=>"HTTP/1.1",
-      # "SERVER_SOFTWARE"=>"WEBrick/1.3.1 (Ruby/1.9.3/2012-04-20)",
-      # "HTTP_CONNECTION"=>"close",
-      # "HTTP_HOST"=>"localhost:9293",
-      # "HTTP_VERSION"=>"HTTP/1.1",
-      # "REQUEST_PATH"=>"/events"
+      expect(payload['backtrace'].size > 10).to be_true
+      expect(payload['backtrace'][0..2]).to eq [{
+        "file" => "/Users/austin/projects/captivus/gem/spec/integration/events_from_rack_spec.rb",
+        "number"=> 20,
+        "method" => "block (2 levels) in app"
+      }, {
+        "file" => "/Users/austin/projects/captivus/gem/lib/captivus/rack_capturer.rb",
+        "number"=> 10,
+        "method" => "call"
+      }, {
+        "file" => "/Users/austin/projects/captivus/gem/lib/captivus/rack_capturer.rb",
+        "number"=> 10,
+        "method" => "call"
+      }]
+
+      payload['environment'].tap do |environment|
+        expect(environment.keys).to match_array %w[name]
+
+        expect(environment['name']).to eq 'production'
+      end
+
+      payload['context'].tap do |context|
+        expect(context.keys).to match_array %w[params]
+
+        expect(context['params']).to eq({'username' => 'austin', 'password' => 'secret'})
+      end
+    end
+  end
+
+  it "by default, it doesn't report errors in development or test" do
+    Captivus.config.environment = 'review'
+    begin
+      get '/'
+    rescue Exception
+    end
+    expect(captivus_api.requests.size).to eq 1
+
+    Captivus.config.environment = 'demo'
+    begin
+      get '/'
+    rescue Exception
+    end
+    expect(captivus_api.requests.size).to eq 2
+
+    Captivus.config.environment = 'development'
+    begin
+      get '/'
+    rescue Exception
+    end
+    expect(captivus_api.requests.size).to eq 2
+
+    Captivus.config.environment = 'test'
+    begin
+      get '/'
+    rescue Exception
     end
+    expect(captivus_api.requests.size).to eq 2
   end
 end

data/spec/spec_helper.rb

@@ -2,35 +2,12 @@ require 'bundler/setup'
 require 'sham_rack'
 require 'rack/test'
 require 'timecop'
-require "delorean"
+require 'captivus/util'
 
-class CaptivusAPI
-  def call(env)
-    requests << env
-    [200, {}, ['']]
-  end
-
-  def requests
-    @requests ||= []
-  end
-
-  def clear_requests!
-    @requests = []
-  end
-end
-
-module Helpers
-  def captivus_api
-    @captivus_api ||= CaptivusAPI.new
-  end
-end
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[(File.dirname(__FILE__) + '/support/**/*.rb')].each {|f| require f}
 
 RSpec.configure do |config|
-  config.include Helpers
-  config.include Delorean
-
-  config.before do
-    ShamRack.mount captivus_api, "api.captiv.us"
-    captivus_api.clear_requests!
-  end
-end
+  config.include Captivus::Util
+end

data/spec/support/captivus_api.rb

@@ -0,0 +1,29 @@
+class CaptivusAPI
+  module Helpers
+    def captivus_api
+      @captivus_api ||= CaptivusAPI.new
+    end
+  end
+
+  def call(env)
+    requests << env
+    [200, {}, ['']]
+  end
+
+  def requests
+    @requests ||= []
+  end
+
+  def clear_requests!
+    @requests = []
+  end
+end
+
+RSpec.configure do |config|
+  config.include CaptivusAPI::Helpers
+
+  config.before do
+    ShamRack.mount captivus_api, "api.captiv.us"
+    captivus_api.clear_requests!
+  end
+end

data/spec/support/delorean.rb

@@ -0,0 +1,5 @@
+require "delorean"
+
+RSpec.configure do |config|
+  config.include Delorean
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captivus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: captivus-auth_hmac
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.10
 description: Captivus client gem
 email:
 - austinthecoder@gmail.com
@@ -76,18 +92,148 @@ files:
 - lib/captivus/backtrace.rb
 - lib/captivus/backtrace/line.rb
 - lib/captivus/configuration.rb
+- lib/captivus/notifier.rb
 - lib/captivus/payload.rb
 - lib/captivus/rack_capturer.rb
+- lib/captivus/rails_capturer.rb
+- lib/captivus/railtie.rb
+- lib/captivus/tasks/captivus.rake
+- lib/captivus/util.rb
 - lib/captivus/version.rb
 - lib/faraday/request/hmac_authentication.rb
+- rails-3.0-app/.rspec
+- rails-3.0-app/Gemfile
+- rails-3.0-app/README
+- rails-3.0-app/Rakefile
+- rails-3.0-app/app/controllers/application_controller.rb
+- rails-3.0-app/app/controllers/errors_controller.rb
+- rails-3.0-app/app/helpers/application_helper.rb
+- rails-3.0-app/app/views/layouts/application.html.erb
+- rails-3.0-app/config.ru
+- rails-3.0-app/config/application.rb
+- rails-3.0-app/config/boot.rb
+- rails-3.0-app/config/database.yml
+- rails-3.0-app/config/environment.rb
+- rails-3.0-app/config/environments/development.rb
+- rails-3.0-app/config/environments/production.rb
+- rails-3.0-app/config/environments/test.rb
+- rails-3.0-app/config/initializers/backtrace_silencers.rb
+- rails-3.0-app/config/initializers/captivus.rb
+- rails-3.0-app/config/initializers/inflections.rb
+- rails-3.0-app/config/initializers/mime_types.rb
+- rails-3.0-app/config/initializers/secret_token.rb
+- rails-3.0-app/config/initializers/session_store.rb
+- rails-3.0-app/config/locales/en.yml
+- rails-3.0-app/config/routes.rb
+- rails-3.0-app/db/seeds.rb
+- rails-3.0-app/public/404.html
+- rails-3.0-app/public/422.html
+- rails-3.0-app/public/500.html
+- rails-3.0-app/public/favicon.ico
+- rails-3.0-app/public/images/rails.png
+- rails-3.0-app/public/index.html
+- rails-3.0-app/public/javascripts/application.js
+- rails-3.0-app/public/javascripts/controls.js
+- rails-3.0-app/public/javascripts/dragdrop.js
+- rails-3.0-app/public/javascripts/effects.js
+- rails-3.0-app/public/javascripts/prototype.js
+- rails-3.0-app/public/javascripts/rails.js
+- rails-3.0-app/public/robots.txt
+- rails-3.0-app/script/rails
+- rails-3.0-app/spec/requests/events_from_rails_spec.rb
+- rails-3.0-app/spec/spec_helper.rb
+- rails-3.0-app/spec/support/captivus_api.rb
+- rails-3.1-app/.rspec
+- rails-3.1-app/Gemfile
+- rails-3.1-app/README
+- rails-3.1-app/Rakefile
+- rails-3.1-app/app/assets/images/rails.png
+- rails-3.1-app/app/assets/javascripts/application.js
+- rails-3.1-app/app/assets/stylesheets/application.css
+- rails-3.1-app/app/controllers/application_controller.rb
+- rails-3.1-app/app/controllers/errors_controller.rb
+- rails-3.1-app/app/helpers/application_helper.rb
+- rails-3.1-app/app/views/layouts/application.html.erb
+- rails-3.1-app/config.ru
+- rails-3.1-app/config/application.rb
+- rails-3.1-app/config/boot.rb
+- rails-3.1-app/config/database.yml
+- rails-3.1-app/config/environment.rb
+- rails-3.1-app/config/environments/development.rb
+- rails-3.1-app/config/environments/production.rb
+- rails-3.1-app/config/environments/test.rb
+- rails-3.1-app/config/initializers/backtrace_silencers.rb
+- rails-3.1-app/config/initializers/captivus.rb
+- rails-3.1-app/config/initializers/inflections.rb
+- rails-3.1-app/config/initializers/mime_types.rb
+- rails-3.1-app/config/initializers/secret_token.rb
+- rails-3.1-app/config/initializers/session_store.rb
+- rails-3.1-app/config/initializers/wrap_parameters.rb
+- rails-3.1-app/config/locales/en.yml
+- rails-3.1-app/config/routes.rb
+- rails-3.1-app/db/seeds.rb
+- rails-3.1-app/public/404.html
+- rails-3.1-app/public/422.html
+- rails-3.1-app/public/500.html
+- rails-3.1-app/public/favicon.ico
+- rails-3.1-app/public/index.html
+- rails-3.1-app/public/robots.txt
+- rails-3.1-app/script/rails
+- rails-3.1-app/spec/requests/events_from_rails_spec.rb
+- rails-3.1-app/spec/spec_helper.rb
+- rails-3.1-app/spec/support/captivus_api.rb
+- rails-3.2-app/.rspec
+- rails-3.2-app/Gemfile
+- rails-3.2-app/README.rdoc
+- rails-3.2-app/Rakefile
+- rails-3.2-app/app/assets/images/rails.png
+- rails-3.2-app/app/assets/javascripts/application.js
+- rails-3.2-app/app/assets/stylesheets/application.css
+- rails-3.2-app/app/controllers/application_controller.rb
+- rails-3.2-app/app/controllers/errors_controller.rb
+- rails-3.2-app/app/helpers/application_helper.rb
+- rails-3.2-app/app/views/layouts/application.html.erb
+- rails-3.2-app/config.ru
+- rails-3.2-app/config/application.rb
+- rails-3.2-app/config/boot.rb
+- rails-3.2-app/config/database.yml
+- rails-3.2-app/config/environment.rb
+- rails-3.2-app/config/environments/development.rb
+- rails-3.2-app/config/environments/production.rb
+- rails-3.2-app/config/environments/test.rb
+- rails-3.2-app/config/initializers/backtrace_silencers.rb
+- rails-3.2-app/config/initializers/captivus.rb
+- rails-3.2-app/config/initializers/inflections.rb
+- rails-3.2-app/config/initializers/mime_types.rb
+- rails-3.2-app/config/initializers/secret_token.rb
+- rails-3.2-app/config/initializers/session_store.rb
+- rails-3.2-app/config/initializers/wrap_parameters.rb
+- rails-3.2-app/config/locales/en.yml
+- rails-3.2-app/config/routes.rb
+- rails-3.2-app/db/schema.rb
+- rails-3.2-app/db/seeds.rb
+- rails-3.2-app/public/404.html
+- rails-3.2-app/public/422.html
+- rails-3.2-app/public/500.html
+- rails-3.2-app/public/favicon.ico
+- rails-3.2-app/public/index.html
+- rails-3.2-app/public/robots.txt
+- rails-3.2-app/script/rails
+- rails-3.2-app/spec/requests/events_from_rails_spec.rb
+- rails-3.2-app/spec/spec_helper.rb
+- rails-3.2-app/spec/support/captivus_api.rb
 - spec/captivus/backtrace/line_spec.rb
 - spec/captivus/backtrace_spec.rb
 - spec/captivus/configuration_spec.rb
+- spec/captivus/notifier_spec.rb
 - spec/captivus/payload_spec.rb
 - spec/captivus/rack_capturer_spec.rb
+- spec/captivus/rails_capturer_spec.rb
 - spec/captivus_spec.rb
 - spec/integration/events_from_rack_spec.rb
 - spec/spec_helper.rb
+- spec/support/captivus_api.rb
+- spec/support/delorean.rb
 homepage: http://captiv.us
 licenses: []
 post_install_message: 
@@ -116,8 +262,12 @@ test_files:
 - spec/captivus/backtrace/line_spec.rb
 - spec/captivus/backtrace_spec.rb
 - spec/captivus/configuration_spec.rb
+- spec/captivus/notifier_spec.rb
 - spec/captivus/payload_spec.rb
 - spec/captivus/rack_capturer_spec.rb
+- spec/captivus/rails_capturer_spec.rb
 - spec/captivus_spec.rb
 - spec/integration/events_from_rack_spec.rb
 - spec/spec_helper.rb
+- spec/support/captivus_api.rb
+- spec/support/delorean.rb