chillout 0.2.2 → 0.2.3

data/lib/chillout/client.rb

@@ -27,18 +27,14 @@ module Chillout
 
       @logger = PrefixedLogger.new("Chillout", @config.logger)
 
-      @http_client = HttpClient.new(@config, logger)
-      @event_data_builder = EventDataBuilder.new(@config)
-      @server_side = ServerSide.new(@event_data_builder, @http_client)
+      @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)
+      @dispatcher = Dispatcher.new(@filter, @server_side).freeze
       @queue = Queue.new
     end
 
-    def send_exception(exception, environment = {})
-      send_error(Error.new(exception, environment))
-    end
-
     def enqueue(creations)
       @queue << creations
     end

data/lib/chillout/dispatcher.rb

@@ -1,5 +1,7 @@
 module Chillout
   class Dispatcher
+    class SendCreationsFailed < StandardError
+    end
 
     def initialize(filter, server_side)
       @filter      = filter
@@ -20,6 +22,7 @@ module Chillout
     def send_creations(creations)
       @server_side.send_creations(creations)
     rescue HttpClient::NotSent
+      raise SendCreationsFailed.new
     end
   end
 end

data/lib/chillout/version.rb

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

data/lib/chillout/worker.rb

@@ -2,28 +2,46 @@ module Chillout
   class Worker
     attr_reader :dispatcher, :queue, :logger
 
-    def initialize(dispatcher, queue, logger)
+    def initialize(dispatcher, queue, logger, container_class=CreationsContainer)
       @dispatcher = dispatcher
       @queue = queue
       @logger = logger
+      @container_class = container_class
     end
 
-    def run
+    def get_all_containers_to_process
+      all_containers = [queue.pop]
       loop do
-        containers_to_merge = [queue.pop]
-        loop do
-          begin
-            containers_to_merge << queue.pop(true)
-          rescue ThreadError
-            break
-          end
-        end
-        creations_container = CreationsContainer.new
-        for container in containers_to_merge
-          creations_container.merge(container)
+        begin
+          all_containers << queue.pop(true)
+        rescue ThreadError
+          break
         end
-        dispatcher.send_creations(creations_container)
-        logger.info "Sending metrics"
+      end
+      all_containers
+    end
+
+    def merge_containers(containers_to_merge)
+      creations_container = @container_class.new
+      for container in containers_to_merge
+        creations_container.merge(container)
+      end
+      creations_container
+    end
+
+    def send_creations(creations_container)
+      dispatcher.send_creations(creations_container)
+      logger.info "Sending metrics"
+    rescue Dispatcher::SendCreationsFailed
+      queue << creations_container
+      logger.error "Sending metrics failed"
+    end
+
+    def run
+      loop do
+        containers_to_merge = get_all_containers_to_process
+        creations_container = merge_containers(containers_to_merge)
+        send_creations(creations_container)
         sleep 5
       end
     end

data/test/dispatcher_test.rb

@@ -56,13 +56,15 @@ class DispatcherTest < ChilloutTestCase
     dispatcher.send_creations(:creations)
   end
 
-  def test_send_creations_ignore_not_sent_exception
+  def test_send_creations_raise_exception_if_server_side_failed_to_send_request
     server_side = stub()
     server_side.stubs(:send_creations).raises(Chillout::HttpClient::NotSent.new(:http_error))
 
     dispatcher = Chillout::Dispatcher.new(mock, server_side)
 
-    assert_nil dispatcher.send_creations(:creations)
+    assert_raises Chillout::Dispatcher::SendCreationsFailed do
+      dispatcher.send_creations(:creations)
+    end
   end
 
 end

data/test/worker_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+module Chillout
+  class WorkerTest < ChilloutTestCase
+    def setup
+      @dispatcher = stub
+      @queue = stub
+      @container = stub
+      @logger = stub(info: "", error: "")
+      @container_class = stub(new: @container)
+      @worker = Worker.new(@dispatcher, @queue, @logger, @container_class)
+    end
+
+    def test_get_all_containers_to_process_pops_all_existings_jobs_from_queue
+      @queue.expects(:pop).times(3).returns(:container1, :container2).then.raises(ThreadError)
+      all_jobs = @worker.get_all_containers_to_process
+      assert_equal 2, all_jobs.count
+      assert_includes all_jobs, :container1
+      assert_includes all_jobs, :container2
+    end
+
+    def test_merge_containers_to_one
+      @container.expects(:merge).with(:container1)
+      @container.expects(:merge).with(:container2)
+      result = @worker.merge_containers([:container1, :container2])
+      assert_equal @container, result
+    end
+
+    def test_send_creations_just_send_creations_with_dispatcher
+      @dispatcher.expects(:send_creations).with(:creations_container)
+      @worker.send_creations(:creations_container)
+    end
+
+    def test_send_creations_with_interuption
+      @dispatcher.stubs(:send_creations).raises(Dispatcher::SendCreationsFailed)
+      @queue.expects(:<<).with(:creations_container)
+      @worker.send_creations(:creations_container)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chillout
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -149,12 +149,12 @@ files:
 - test/http_client_test.rb
 - test/integration/creations_monitor_rack_test.rb
 - test/integration/exception_monitor_rack_test.rb
-- test/integration/standalone_client_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
+- test/worker_test.rb
 homepage: http://chillout.io/
 licenses: []
 post_install_message: 
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4082367495555425928
+      hash: 111791620312850416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4082367495555425928
+      hash: 111791620312850416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -195,9 +195,9 @@ test_files:
 - test/http_client_test.rb
 - test/integration/creations_monitor_rack_test.rb
 - test/integration/exception_monitor_rack_test.rb
-- test/integration/standalone_client_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
+- test/worker_test.rb

data/test/integration/standalone_client_test.rb

@@ -1,61 +0,0 @@
-require 'test_helper'
-require 'webmock/minitest'
-
-class StandaloneClientTest < ChilloutTestCase
-
-  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)
-    @error  = build_error(NameError, "FooBar is not defined")
-  end
-
-  def test_request_headers_contain_content_type
-    send_error
-    assert_request_headers 'events', 'Content-Type' => 'application/vnd.chillout.v1+json'
-  end
-
-  def test_request_body_contains_exception_class
-    send_error
-    assert_equal "NameError", request_body["content"]["class"]
-  end
-
-  def test_request_body_contains_exception_message
-    send_error
-    assert_equal "FooBar is not defined", request_body["content"]["message"]
-  end
-
-  def test_request_body_contains_event_type
-    send_error
-    assert_equal "exception", request_body["event"]
-  end
-
-  def test_request_body_contains_notifier_name
-    send_error
-    assert_equal "Chillout", request_body["notifier"]["name"]
-  end
-
-  def test_request_body_contains_notifier_version
-    send_error
-    assert_equal Chillout::VERSION, request_body["notifier"]["version"]
-  end
-
-  def test_allows_to_send_exceptions
-    exception = build_exception(ArgumentError, "wrong number of arguments")
-    @client.send_exception(exception)
-    assert_equal "ArgumentError", request_body["content"]["class"]
-    assert_equal "wrong number of arguments", request_body["content"]["message"]
-  end
-
-  private
-  def send_error
-    @client.send_error(@error)
-  end
-
-  def request_body
-    assert_request_body("events") { |body| return body }
-  end
-
-end