chillout 0.2.1 → 0.2.2

data/lib/chillout/client.rb

@@ -7,6 +7,8 @@ require 'chillout/config'
 require 'chillout/error'
 require 'chillout/event_data_builder'
 require 'chillout/prefixed_logger'
+require 'chillout/worker'
+require 'thread'
 
 module Chillout
   class Client
@@ -16,6 +18,7 @@ module Chillout
 
     attr_reader :config
     attr_reader :logger
+    attr_reader :queue
 
     def initialize(config_or_api_key, options = {})
       build_config(config_or_api_key, options)
@@ -27,14 +30,26 @@ module Chillout
       @http_client = HttpClient.new(@config, logger)
       @event_data_builder = EventDataBuilder.new(@config)
       @server_side = ServerSide.new(@event_data_builder, @http_client)
-      @filter      = ErrorFilter.new
-      @dispatcher  = Dispatcher.new(@filter, @server_side)
+      @filter = ErrorFilter.new
+      @dispatcher = Dispatcher.new(@filter, @server_side)
+      @queue = Queue.new
     end
 
     def send_exception(exception, environment = {})
       send_error(Error.new(exception, environment))
     end
 
+    def enqueue(creations)
+      @queue << creations
+    end
+
+    def start_worker
+      thread = Thread.new do
+        worker = Worker.new(@dispatcher, @queue, @logger)
+        worker.run
+      end
+    end
+
     private
     def build_config(config_or_api_key, options)
       case config_or_api_key

data/lib/chillout/creations_container.rb

@@ -4,18 +4,28 @@ module Chillout
       @container = Hash.new {|hash, key| hash[key] = 0}
     end
 
-    def increment!(class_name)
-      key = class_name.to_sym
-      @container[key] += 1
+    def increment!(class_name, value=1)
+      key = key(class_name)
+      @container[key] += value
     end
 
     def [](name)
-      key = name.to_sym
+      key = key(name)
       @container[key]
     end
 
+    def key(name)
+      name.to_sym
+    end
+
     def resource_keys
       @container.keys
     end
+
+    def merge(other_container)
+      for key in other_container.resource_keys
+        increment!(key, other_container[key])
+      end
+    end
   end
 end

data/lib/chillout/middleware/creations_monitor.rb

@@ -8,8 +8,9 @@ module Chillout
 
       def call(env)
         response = @app.call(env)
+      ensure
         if Thread.current[:creations]
-          @client.send_creations(Thread.current[:creations])
+          @client.enqueue(Thread.current[:creations])
           Thread.current[:creations] = nil
         end
         response

data/lib/chillout/railtie.rb

@@ -15,6 +15,8 @@ module Chillout
 
         app.middleware.use Middleware::ExceptionMonitor, client
         app.middleware.use Middleware::CreationsMonitor, client
+
+        client.start_worker
       end
     end
   end

data/lib/chillout/version.rb

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

data/lib/chillout/worker.rb

@@ -0,0 +1,31 @@
+module Chillout
+  class Worker
+    attr_reader :dispatcher, :queue, :logger
+
+    def initialize(dispatcher, queue, logger)
+      @dispatcher = dispatcher
+      @queue = queue
+      @logger = logger
+    end
+
+    def run
+      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)
+        end
+        dispatcher.send_creations(creations_container)
+        logger.info "Sending metrics"
+        sleep 5
+      end
+    end
+  end
+end

data/test/creations_container_test.rb

@@ -3,10 +3,25 @@ require 'chillout/creations_container'
 
 module Chillout
   class CreationsContainerTest < ChilloutTestCase
+    def setup
+      @creations_container = CreationsContainer.new
+    end
+
     def test_increment_model
-      creations_container = CreationsContainer.new
-      creations_container.increment!("User")
-      assert_equal 1, creations_container[:User]
+      @creations_container.increment!("User")
+      assert_equal 1, @creations_container[:User]
+    end
+
+    def test_merge
+      @first_to_merge = CreationsContainer.new
+      @first_to_merge.increment!("User", 2)
+      @second_to_merge = CreationsContainer.new
+      @second_to_merge.increment!("User")
+      @second_to_merge.increment!("Entity")
+      @creations_container.merge(@first_to_merge)
+      @creations_container.merge(@second_to_merge)
+      assert_equal 3, @creations_container[:User]
+      assert_equal 1, @creations_container[:Entity]
     end
   end
 end

data/test/integration/creations_monitor_rack_test.rb

@@ -11,6 +11,7 @@ module Chillout
       @config = Chillout::Config.new(api_key)
       @config.ssl = false
       @client = Chillout::Client.new(@config)
+      @client.start_worker
     end
 
     def app
@@ -29,6 +30,7 @@ module Chillout
 
     def test_creations_values
       get "/"
+      Thread.pass
       assert_equal 2, request_body["content"]["creations"]["User"]
       assert_equal 3, request_body["content"]["creations"]["Cart"]
     end

data/test/middleware/creations_monitor_test.rb

@@ -18,14 +18,13 @@ module Chillout
         end
 
         def test_behaves_like_rack_middleware
-          @client.stubs(:send_creations)
+          @client.stubs(:enqueue)
           response = @middleware.call(@env)
-
           assert_equal [200, @env, ['hello']], response
         end
 
-        def test_dispatch_creations_from_thread_current
-          @client.expects(:send_creations).with(:creations)
+        def test_clients_queue_receive_creations
+          @client.expects(:enqueue).with(:creations)
 
           @middleware.call(@env)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chillout
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -139,6 +139,7 @@ files:
 - lib/chillout/railtie.rb
 - lib/chillout/server_side.rb
 - lib/chillout/version.rb
+- lib/chillout/worker.rb
 - test/client_test.rb
 - test/config_test.rb
 - test/creations_container_test.rb
@@ -168,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2687289254798822553
+      hash: -4082367495555425928
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2687289254798822553
+      hash: -4082367495555425928
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25