chillout 0.2.3 → 0.3.0

data/lib/chillout/client.rb

@@ -1,10 +1,8 @@
 require 'forwardable'
 require 'chillout/server_side'
 require 'chillout/http_client'
-require 'chillout/error_filter'
 require 'chillout/dispatcher'
 require 'chillout/config'
-require 'chillout/error'
 require 'chillout/event_data_builder'
 require 'chillout/prefixed_logger'
 require 'chillout/worker'
@@ -14,7 +12,7 @@ module Chillout
   class Client
     extend Forwardable
 
-    def_delegators :@dispatcher, :dispatch_error, :send_error, :send_creations
+    def_delegators :@dispatcher, :send_creations
 
     attr_reader :config
     attr_reader :logger
@@ -30,7 +28,6 @@ module Chillout
       @http_client = HttpClient.new(@config, logger).freeze
       @event_data_builder = EventDataBuilder.new(@config).freeze
       @server_side = ServerSide.new(@event_data_builder, @http_client).freeze
-      @filter = ErrorFilter.new
       @dispatcher = Dispatcher.new(@filter, @server_side).freeze
       @queue = Queue.new
     end

data/lib/chillout/dispatcher.rb

@@ -8,17 +8,6 @@ module Chillout
       @server_side = server_side
     end
 
-    def dispatch_error(error)
-      if @filter.deliver_error?(error)
-        send_error(error)
-      end
-    end
-
-    def send_error(error)
-      @server_side.send_error(error)
-    rescue HttpClient::NotSent
-    end
-
     def send_creations(creations)
       @server_side.send_creations(creations)
     rescue HttpClient::NotSent

data/lib/chillout/event_data_builder.rb

@@ -4,32 +4,6 @@ module Chillout
       @config = config
     end
 
-    def build_from_error(error, timestamp)
-      {
-        event: "exception",
-        timestamp: timestamp,
-        content: {
-          class: error.exception_class,
-          message: error.message,
-          backtrace: error.backtrace,
-          file: error.file,
-          environment: @config.environment,
-          context: {
-            platform: @config.platform,
-            controller: error.controller_name,
-            action: error.controller_action,
-            current_user: {
-              id: error.current_user_id,
-              email: error.current_user_email,
-              full_name: error.current_user_full_name
-            }
-          },
-          rack_environment: build_rack_environment(error)
-        },
-        notifier: build_notifier
-      }
-    end
-
     def build_from_creations_container(creations_container, timestamp)
       {
         metric: "creations",
@@ -56,11 +30,5 @@ module Chillout
         url: @config.notifier_url
       }
     end
-
-    def build_rack_environment(error)
-      Hash[error.environment.collect do |key, value|
-        [key, value.to_s]
-      end]
-    end
   end
 end

data/lib/chillout/railtie.rb

@@ -3,7 +3,7 @@ require 'chillout/creation_listener'
 module Chillout
   class Railtie < Rails::Railtie
     config.chillout = ActiveSupport::OrderedOptions.new
-    initializer "chillout.exceptions_listener_initialization" do |app|
+    initializer "chillout.creations_listener_initialization" do |app|
       if !app.config.chillout.empty?
         existing_option_keys = [:port, :hostname, :ssl].select{|key| app.config.chillout.has_key?(key)}
         options_list = existing_option_keys.map{|key| [key, app.config.chillout[key]]}
@@ -13,7 +13,6 @@ module Chillout
 
         ActiveRecord::Base.extend(CreationListener)
 
-        app.middleware.use Middleware::ExceptionMonitor, client
         app.middleware.use Middleware::CreationsMonitor, client
 
         client.start_worker

data/lib/chillout/server_side.rb

@@ -9,15 +9,6 @@ module Chillout
       @event_data_builder = event_data_builder
     end
 
-    def send_error(error)
-      event_data = @event_data_builder.build_from_error(error, timestamp)
-      send_event(event_data)
-    end
-
-    def send_event(data)
-      @http_client.post('/events', data)
-    end
-
     def send_creations(creations_container)
       event_data = @event_data_builder.build_from_creations_container(creations_container, timestamp)
       send_metric(event_data)

data/lib/chillout/version.rb

@@ -1,3 +1,3 @@
 module Chillout
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/chillout.rb

@@ -1,10 +1,7 @@
 require "chillout/version"
 require "chillout/config"
-require "chillout/middleware/exception_monitor"
 require "chillout/middleware/creations_monitor"
-require "chillout/error"
 require "chillout/dispatcher"
-require "chillout/error_filter"
 require "chillout/server_side"
 require "chillout/http_client"
 require "chillout/client"

data/test/dispatcher_test.rb

@@ -1,51 +1,6 @@
 require 'test_helper'
 
 class DispatcherTest < ChilloutTestCase
-
-  def test_error_dispatch
-    exception = build_exception(NameError)
-    env = {
-      "HTTP_USER_AGENT" => "Mozzila/4.0",
-      "rack.session" => {}
-    }
-    error = Chillout::Error.new(exception, env)
-
-    filter = mock("Filter")
-    filter.expects(:deliver_error?).with(error).returns(true)
-
-    server_side = mock("ServerSide")
-    server_side.expects(:send_error).with(error)
-
-    dispatcher = Chillout::Dispatcher.new(filter, server_side)
-    dispatcher.dispatch_error(error)
-  end
-
-  def test_ignored_error_dispatch
-    exception = build_exception(NameError)
-    env = {
-      "HTTP_USER_AGENT" => "Mozzila/4.0",
-      "rack.session" => {}
-    }
-    error = Chillout::Error.new(exception, env)
-
-    filter = mock("Filter")
-    filter.expects(:deliver_error?).with(error).returns(false)
-
-    server_side = mock("ServerSide")
-
-    dispatcher = Chillout::Dispatcher.new(filter, server_side)
-    dispatcher.dispatch_error(error)
-  end
-
-  def test_send_error_ignore_not_sent_exception
-    server_side = stub()
-    server_side.stubs(:send_error).raises(Chillout::HttpClient::NotSent.new(:http_error))
-
-    dispatcher = Chillout::Dispatcher.new(mock, server_side)
-
-    assert_nil dispatcher.send_error(:error)
-  end
-
   def test_send_creations
     filter = mock("Filter")
 

data/test/event_data_builder_test.rb

@@ -18,99 +18,6 @@ module Chillout
       @timestamp = Time.now.iso8601
     end
 
-    context "build from error" do
-      setup do
-        @event_data_builder = EventDataBuilder.new(@config)
-
-        @controller = mock("Controller")
-        @controller.stubs(:controller_name).returns("UsersController")
-        @controller.stubs(:action_name).returns("index")
-
-        @current_user = mock("User")
-        @current_user.stubs(:id).returns(123)
-        @current_user.stubs(:email).returns("john@example.com")
-        @current_user.stubs(:full_name).returns("john doe")
-
-        @exception = build_exception(NameError, "FooBar does not exists")
-        @env = {
-          'HTTP_USER_AGENT' => 'Mozilla/4.0',
-          'action_controller.instance' => @controller,
-          'current_user' => @current_user
-        }
-        @error = Chillout::Error.new(@exception, @env)
-        @event_data = @event_data_builder.build_from_error(@error, @timestamp)
-      end
-
-      def test_event_type
-        assert_param :event, 'exception'
-      end
-
-      def test_timestamp
-        assert_param :timestamp, @timestamp
-      end
-
-      def test_exception_class
-        assert_content :class, 'NameError'
-      end
-
-      def test_exception_message
-        assert_content :message, 'FooBar does not exists'
-      end
-
-      def test_backtrace
-        assert_content :backtrace, @exception.backtrace
-      end
-
-      def test_file
-        assert_content :file, @error.file
-      end
-
-      def test_environment
-        assert_content :environment, "development"
-      end
-
-      def test_platform
-        assert_context :platform, "rails"
-      end
-
-      def test_controller
-        assert_context :controller, "UsersController"
-      end
-
-      def test_action
-        assert_context :controller, "UsersController"
-      end
-
-      def test_current_user_id
-        assert_current_user :id, 123
-      end
-
-      def test_current_user_email
-        assert_current_user :email, "john@example.com"
-      end
-
-      def test_current_user_full_name
-        assert_current_user :full_name, "john doe"
-      end
-
-      def test_rack_environment
-        expected_value = Hash[@env.collect { |k,v| [k, v.to_s] }]
-        assert_content :rack_environment, expected_value
-      end
-
-      def test_notifier_name
-        assert_notifier :name, "chillout"
-      end
-
-      def test_notifier_version
-        assert_notifier :version, "0.1"
-      end
-
-      def test_notifier_url
-        assert_notifier :url, "http://github.com/arkency/chillout"
-      end
-    end
-
     context "build from creations container" do
       setup do
         @creations_container = CreationsContainer.new
@@ -166,18 +73,10 @@ module Chillout
       assert_equal value, event_data[:content][key]
     end
 
-    def assert_context(key, value)
-      assert_equal value, event_data[:content][:context][key]
-    end
-
     def assert_creations(key, value)
       assert_equal value, event_data[:content][:creations][key]
     end
 
-    def assert_current_user(key, value)
-      assert_equal value, event_data[:content][:context][:current_user][key]
-    end
-
     def assert_notifier(key, value)
       assert_equal value, event_data[:notifier][key]
     end

data/test/server_side_test.rb

@@ -9,18 +9,6 @@ class ServerSideTest < ChilloutTestCase
     @server_side = Chillout::ServerSide.new(@event_data_builder, @http_client)
   end
 
-  def test_send_error_use_event_data_builder
-    @event_data_builder.expects(:build_from_error).with(:error, anything).returns(:event_data_from_builder)
-    @http_client.stubs(:post)
-    @server_side.send_error(:error)
-  end
-
-  def test_send_error_use_http_client
-    @event_data_builder.stubs(:build_from_error).returns(:event_data_from_builder)
-    @http_client.expects(:post).with('/events', :event_data_from_builder)
-    @server_side.send_error(:error)
-  end
-
   def test_send_creations_use_event_data_builder
     @event_data_builder.expects(:build_from_creations_container).with(:creations_container, anything).returns(:event_data_from_builder)
     @http_client.stubs(:post)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chillout
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -129,12 +129,9 @@ files:
 - lib/chillout/creation_listener.rb
 - lib/chillout/creations_container.rb
 - lib/chillout/dispatcher.rb
-- lib/chillout/error.rb
-- lib/chillout/error_filter.rb
 - lib/chillout/event_data_builder.rb
 - lib/chillout/http_client.rb
 - lib/chillout/middleware/creations_monitor.rb
-- lib/chillout/middleware/exception_monitor.rb
 - lib/chillout/prefixed_logger.rb
 - lib/chillout/railtie.rb
 - lib/chillout/server_side.rb
@@ -144,13 +141,10 @@ files:
 - test/config_test.rb
 - test/creations_container_test.rb
 - test/dispatcher_test.rb
-- test/error_test.rb
 - test/event_data_builder_test.rb
 - test/http_client_test.rb
 - test/integration/creations_monitor_rack_test.rb
-- test/integration/exception_monitor_rack_test.rb
 - test/middleware/creations_monitor_test.rb
-- test/middleware/exception_monitor_test.rb
 - test/prefixed_logger_test.rb
 - test/server_side_test.rb
 - test/test_helper.rb
@@ -169,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 111791620312850416
+      hash: 4186506627613896564
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 111791620312850416
+      hash: 4186506627613896564
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -190,13 +184,10 @@ test_files:
 - test/config_test.rb
 - test/creations_container_test.rb
 - test/dispatcher_test.rb
-- test/error_test.rb
 - test/event_data_builder_test.rb
 - test/http_client_test.rb
 - test/integration/creations_monitor_rack_test.rb
-- test/integration/exception_monitor_rack_test.rb
 - test/middleware/creations_monitor_test.rb
-- test/middleware/exception_monitor_test.rb
 - test/prefixed_logger_test.rb
 - test/server_side_test.rb
 - test/test_helper.rb

data/lib/chillout/error.rb

@@ -1,60 +0,0 @@
-require 'ostruct'
-
-module Chillout
-  class Error
-
-    attr_reader :exception
-    attr_reader :environment
-
-    def initialize(exception, environment = {})
-      @exception   = exception
-      @environment = environment
-      @nullObject  = OpenStruct.new
-    end
-
-    def exception_class
-      exception.class.name
-    end
-
-    def message
-      exception.message
-    end
-
-    def backtrace
-      exception.backtrace
-    end
-
-    def file
-      backtrace.first.split(":").first rescue nil
-    end
-
-    def controller
-      environment['action_controller.instance'] || @nullObject
-    end
-
-    def controller_name
-      controller.controller_name
-    end
-
-    def controller_action
-      controller.action_name
-    end
-
-    def current_user
-      environment['current_user'] || @nullObject
-    end
-
-    def current_user_id
-      current_user.id if current_user.respond_to?(:id)
-    end
-
-    def current_user_email
-      current_user.email if current_user.respond_to?(:email)
-    end
-
-    def current_user_full_name
-      current_user.full_name if current_user.respond_to?(:full_name)
-    end
-
-  end
-end

data/lib/chillout/error_filter.rb

@@ -1,9 +0,0 @@
-module Chillout
-  class ErrorFilter
-
-    def deliver_error?(error)
-      true
-    end
-
-  end
-end

data/lib/chillout/middleware/exception_monitor.rb

@@ -1,25 +0,0 @@
-module Chillout
-  module Middleware
-    class ExceptionMonitor
-      def initialize(app, client)
-        @app    = app
-        @client = client
-      end
-
-      def call(env)
-        begin
-          response = @app.call(env)
-        rescue Exception => exception
-          @client.dispatch_error(Chillout::Error.new(exception, env))
-          raise exception
-        end
-
-        if env['rack.exception']
-          @client.dispatch_error(Chillout::Error.new(env['rack.exception'], env))
-        end
-
-        response
-      end
-    end
-  end
-end

data/test/error_test.rb

@@ -1,115 +0,0 @@
-require 'test_helper'
-
-class ErrorTest < ChilloutTestCase
-
-  def setup
-    @exception = build_exception(ArgumentError)
-    @env = { 'charset' => 'utf-8' }
-    @error = Chillout::Error.new(@exception, @env)
-  end
-
-  def test_exception_class
-    assert_equal "ArgumentError", @error.exception_class
-  end
-
-  def test_backtrace
-    assert_kind_of Array, @error.backtrace
-  end
-
-  def test_file
-    file = File.expand_path('../test_helper.rb', __FILE__)
-    assert_equal file, @error.file
-  end
-
-  context "controller is not given" do
-
-    def test_controller_name
-      assert_nil @error.controller_name
-    end
-
-    def test_controller_action
-      assert_nil @error.controller_action
-    end
-
-  end
-
-  context "controller is given" do
-
-    setup do
-      @controller = mock("controller")
-      @env['action_controller.instance'] = @controller
-    end
-
-    def test_controller_action_when_controller_is_set
-      @controller.expects(:action_name).returns("index")
-      assert_equal "index", @error.controller_action
-    end
-
-    def test_controller_name_when_controller_is_set
-      @controller.expects(:controller_name).returns("ApplicationController")
-      assert_equal "ApplicationController", @error.controller_name
-    end
-
-  end
-
-  context "current user is not given" do
-
-    def test_current_user_id
-      assert_nil @error.current_user_id
-    end
-
-    def test_current_user_email
-      assert_nil @error.current_user_email
-    end
-
-    def test_current_user_full_name
-      assert_nil @error.current_user_full_name
-    end
-
-  end
-
-  context "current user is given" do
-
-    setup do
-      @user = mock("user")
-      @env['current_user'] = @user
-    end
-
-    def test_current_user_id
-      @user.expects(:id).returns(123)
-      assert_equal 123, @error.current_user_id
-    end
-
-    def test_current_user_email
-      @user.expects(:email).returns("john@example.net")
-      assert_equal "john@example.net", @error.current_user_email
-    end
-
-    def test_current_user_full_name
-      @user.expects(:full_name).returns("john doe")
-      assert_equal "john doe", @error.current_user_full_name
-    end
-  end
-
-  context "current user is given but does not respond to expected methods" do
-
-    setup do
-      @user = mock("user")
-      @env['current_user'] = @user
-    end
-
-    def test_current_user_id
-      assert_nil @error.current_user_id
-    end
-
-    def test_current_user_email
-      assert_nil @error.current_user_email
-    end
-
-    def test_current_user_full_name
-      assert_nil @error.current_user_full_name
-    end
-
-  end
-
-end

data/test/integration/exception_monitor_rack_test.rb

@@ -1,51 +0,0 @@
-require 'test_helper'
-
-class ExceptionMonitorRackTest < ChilloutTestCase
-  include Rack::Test::Methods
-
-  def setup
-    api_key = "xyz123"
-    stub_api_request(api_key, "events")
-    @config = Chillout::Config.new(api_key)
-    @config.ssl = false
-    @client = Chillout::Client.new(@config)
-  end
-
-  def app
-    client = @client # Only local variable can be passed to the block below
-    Rack::Builder.new do
-      use Chillout::Middleware::ExceptionMonitor, client
-      run(lambda { |env| raise ChilloutTestException.new("Something went wrong") })
-    end
-  end
-
-  def test_exception_class
-    trigger_error
-    assert_equal "ChilloutTestException", request_body["content"]["class"]
-  end
-
-  def test_exception_message
-    trigger_error
-    assert_equal "Something went wrong", request_body["content"]["message"]
-  end
-
-  def test_rack_environment
-    trigger_error
-    assert_request_body "events" do |body|
-      assert_equal last_request.env.keys, body["content"]["rack_environment"].keys
-    end
-  end
-
-  private
-  def trigger_error
-    begin
-      get "/"
-    rescue ChilloutTestException
-    end
-  end
-
-  def request_body
-    assert_request_body("events"){ |body| return body }
-  end
-
-end

data/test/middleware/exception_monitor_test.rb

@@ -1,54 +0,0 @@
-require 'test_helper'
-
-module Chillout
-  module Middleware
-    class ExceptionMonitorTest < ChilloutTestCase
-
-      class DummyError < StandardError; end
-
-      def test_behaves_like_rack_middleware
-        env        = { 'HOST' => 'example.net' }
-        app        = lambda { |env| [200, env, ['hello']] }
-        middleware = ExceptionMonitor.new(app, mock)
-
-        response = middleware.call(env)
-
-        assert_equal [200, env, ['hello']], response
-      end
-
-      def test_exception_is_raised
-        exception = build_exception(DummyError)
-        env = { 'HOST' => 'example.net' }
-        app = lambda do |env|
-          raise exception
-        end
-        dispatcher = mock("Dispatcher")
-        dispatcher.expects(:dispatch_error).with do |error|
-          error.exception == exception && error.environment == env
-        end
-
-        middleware = ExceptionMonitor.new(app, dispatcher)
-        assert_raises DummyError do
-          middleware.call(env)
-        end
-      end
-
-      def test_exception_is_found_in_rack_environment
-        exception = build_exception(DummyError)
-        env = { 'HOST' => 'example.net' }
-        app = lambda do |env|
-          env['rack.exception'] = exception
-          [200, env, ['hello']]
-        end
-        dispatcher = mock("Dispatcher")
-        dispatcher.expects(:dispatch_error).with do |error|
-          error.exception == exception && error.environment == env
-        end
-
-        middleware = ExceptionMonitor.new(app, dispatcher)
-        middleware.call(env)
-      end
-
-    end
-  end
-end