chillout 0.5.3 → 0.5.4

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rbx

data/.travis.yml

@@ -5,3 +5,7 @@ rvm:
   - 1.9.2
   - 1.8.7
   - ree
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode

data/README.md

@@ -1,6 +1,8 @@
 # Chillout
 
 [![Build Status](https://travis-ci.org/chilloutio/chillout.png)](https://travis-ci.org/chilloutio/chillout)
+[![Code Climate](https://codeclimate.com/github/chilloutio/chillout.png)](https://codeclimate.com/github/chilloutio/chillout)
+[![Gem Version](https://badge.fury.io/rb/chillout.png)](http://badge.fury.io/rb/chillout)
 
 ## Installation
 
@@ -15,12 +17,7 @@ And then execute:
 And configure in config/environments/production.rb:
 
 ```ruby
-config.chillout = {
-  secret: '<YOUR_SECRET>',
-  ssl: true,
-  port: 443,
-  hostname: 'api.chillout.io'
-}
+config.chillout = { secret: '<YOUR_SECRET>' }
 ```
 
 Check if everything is ok:

data/Rakefile

@@ -1,11 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 task :default => :test
 
 desc 'Run chillout unit tests.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
+  t.libs    = %w(lib test)
   t.pattern = 'test/**/*_test.rb'
 end

data/chillout.gemspec

@@ -6,8 +6,8 @@ require 'chillout/version'
 Gem::Specification.new do |gem|
   gem.name          = "chillout"
   gem.version       = Chillout::VERSION
-  gem.authors       = ["Michał Łomnicki", "Jan Filipowski"]
-  gem.email         = ["michal.lomnicki@gmail.com", "jachuf@gmail.com", "dev@arkency.com"]
+  gem.authors       = ["Michał Łomnicki", "Jan Filipowski", "Paweł Pacana"]
+  gem.email         = ["michal.lomnicki@gmail.com", "jachuf@gmail.com", "pawel.pacana@gmail.com", "dev@arkency.com"]
   gem.description   = "Chillout.io Ruby client"
   gem.summary       = "Chillout.io Ruby client"
   gem.homepage      = "http://chillout.io/"
@@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "json", "~> 1.7.0"
+  gem.add_dependency 'multi_json', '~> 1.4'
+
   gem.add_development_dependency "minitest", "~>3.2.0"
   gem.add_development_dependency "rake",  "~> 0.9.2"
   gem.add_development_dependency "mocha", "0.12.8"

data/lib/chillout/client.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
-require 'chillout/server-side/server_side'
-require 'chillout/server-side/http_client'
-require 'chillout/server-side/dispatcher'
+require 'chillout/server_side/server_side'
+require 'chillout/server_side/http_client'
+require 'chillout/server_side/dispatcher'
 require 'chillout/config'
 require 'chillout/event_data_builder'
 require 'chillout/prefixed_logger'
@@ -31,20 +31,35 @@ module Chillout
       @server_side = ServerSide.new(@event_data_builder, @http_client).freeze
       @dispatcher = Dispatcher.new(@server_side).freeze
       @queue = Queue.new
+      @worker_mutex = Mutex.new
     end
 
     def enqueue(creations)
+      ensure_worker_running
+      @logger.info "Creations were enqueued."
       @queue << creations
     end
 
+    def worker_running?
+      @worker_thread && @worker_thread.alive?
+    end
+
+    private
     def start_worker
-      thread = Thread.new do
+      @worker_thread = Thread.new do
         worker = Worker.new(@dispatcher, @queue, @logger)
         worker.run
       end
     end
 
-    private
+    def ensure_worker_running
+      return if worker_running?
+      @worker_mutex.synchronize do
+        return if worker_running?
+        start_worker
+      end
+    end
+
     def build_config(config_or_api_key, options)
       case config_or_api_key
       when Config

data/lib/chillout/middleware/creations_monitor.rb

@@ -7,13 +7,20 @@ module Chillout
       end
 
       def call(env)
-        response = @app.call(env)
+        dup._call(env)
+      end
+
+      def _call(env)
+        status, headers, body = @app.call(env)
+        return status, headers, body
       ensure
         if Thread.current[:creations]
+          @client.logger.info "Non-empty creations container found"
           @client.enqueue(Thread.current[:creations])
           Thread.current[:creations] = nil
         end
-        response
+
+        body.close if body && body.respond_to?(:close) && $!
       end
     end
   end

data/lib/chillout/prefixed_logger.rb

@@ -9,7 +9,7 @@ module Chillout
 
     [:error, :fatal, :warn, :info, :debug].each do |method_name|
       define_method method_name do |message|
-        @logger.send(method_name, "[Chillout] #{message}")
+        @logger.send(method_name, "[#{@prefix}] #{message}")
       end
     end
   end

data/lib/chillout/railtie.rb

@@ -16,7 +16,7 @@ module Chillout
   end
 
   class RailsInitializer
-    
+
     def initialize(rails_app, chillout_config, rails_logger)
       @rails_app = rails_app
       @chillout_config = chillout_config
@@ -24,14 +24,12 @@ module Chillout
     end
 
     def start
-      @rails_logger.info "[Chillout] railtie initializing"
+      @rails_logger.info "[Chillout] Railtie initializing"
       client = Client.new(@chillout_config[:secret], options)
       ActiveRecord::Base.extend(CreationListener)
-      @rails_logger.info "[Chillout] creation listener attached"
+      @rails_logger.info "[Chillout] Creation listener attached"
       @rails_app.middleware.use Middleware::CreationsMonitor, client
-      @rails_logger.info "[Chillout] creation monitor enabled"
-      client.start_worker
-      @rails_logger.info "[Chillout] worker started"
+      @rails_logger.info "[Chillout] Creation monitor enabled"
     end
 
     def options

data/lib/chillout/{server-side → server_side}/http_client.rb

@@ -1,6 +1,6 @@
 require 'net/http'
 require 'net/https'
-require 'json'
+require 'multi_json'
 
 module Chillout
   class HttpClient
@@ -30,7 +30,7 @@ module Chillout
       http = Net::HTTP.new(@config.hostname, @config.port)
       http.use_ssl = @config.ssl
       request_spec = Net::HTTP::Post.new(path)
-      request_spec.body = JSON.dump(data)
+      request_spec.body = MultiJson.dump(data)
       request_spec.content_type = MEDIA_TYPE
       request_spec.basic_auth @config.authentication_user, @config.authentication_password
       http.start do

data/lib/chillout/version.rb

@@ -1,3 +1,3 @@
 module Chillout
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/chillout/worker.rb

@@ -10,7 +10,9 @@ module Chillout
     end
 
     def get_all_containers_to_process
+      logger.info "Waiting for at least one container."
       all_containers = [queue.pop]
+      logger.info "Received at least one container."
       loop do
         begin
           all_containers << queue.pop(true)
@@ -18,6 +20,7 @@ module Chillout
           break
         end
       end
+      logger.info "Received containers to process: #{all_containers.count}"
       all_containers
     end
 
@@ -30,8 +33,9 @@ module Chillout
     end
 
     def send_creations(creations_container)
+      logger.info "Trying to send creations"
       dispatcher.send_creations(creations_container)
-      logger.info "Sending metrics"
+      logger.info "Metrics sent"
     rescue Dispatcher::SendCreationsFailed
       queue << creations_container
       logger.error "Sending metrics failed"
@@ -43,6 +47,7 @@ module Chillout
     end
 
     def run
+      logger.info "Worker started"
       send_startup_message
       loop do
         containers_to_merge = get_all_containers_to_process

data/lib/chillout.rb

@@ -1,9 +1,9 @@
 require "chillout/version"
 require "chillout/config"
 require "chillout/middleware/creations_monitor"
-require "chillout/server-side/dispatcher"
-require "chillout/server-side/server_side"
-require "chillout/server-side/http_client"
+require "chillout/server_side/dispatcher"
+require "chillout/server_side/server_side"
+require "chillout/server_side/http_client"
 require "chillout/client"
 
 module Chillout

data/test/integration/creations_monitor_rack_test.rb

@@ -10,8 +10,7 @@ module Chillout
       stub_api_request(api_key, "clients")
       stub_api_request(api_key, "metrics")
       @config = Chillout::Config.new(api_key)
-      @client = Chillout::Client.new(@config)
-      @client.start_worker
+      @client = Chillout::Client.new(@config, :logger => null_logger)
     end
 
     def app
@@ -31,6 +30,7 @@ module Chillout
     def test_creations_values
       get "/"
       Thread.pass
+      sleep 2
       assert_equal 2, request_body["content"]["creations"]["User"]
       assert_equal 3, request_body["content"]["creations"]["Cart"]
     end

data/test/integration/worker_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'chillout/creations_container'
+
+class WorkerIntegrationTest < ChilloutTestCase
+
+  def setup
+    @_api_key = "xyz123"
+    stub_request(:post, api_url('clients')).to_return(:body => "OK", :status => 200)
+    stub_request(:post, api_url('metrics')).to_return(:body => "OK", :status => 200)
+  end
+
+  def test_worker_running_after_fork_on_first_use
+    return if RUBY_PLATFORM == 'java'
+
+    client = Chillout::Client.new(@_api_key, :logger => null_logger)
+    worker_check = Proc.new do
+      client.enqueue(Chillout::CreationsContainer.new)
+      assert client.worker_running?
+    end
+
+    assert_successful_exit Process.fork(&worker_check)
+  end
+
+  def test_worker_running_lazily
+    client = Chillout::Client.new(@_api_key, :logger => null_logger)
+    client.enqueue(Chillout::CreationsContainer.new)
+
+    assert client.worker_running?
+  end
+
+end

data/test/middleware/creations_monitor_test.rb

@@ -5,7 +5,8 @@ module Chillout
     class CreationsMonitorTest < ChilloutTestCase
       setup do
         @env = { 'HOST' => 'example.net' }
-        @client = mock()
+        @logger = stub(:info => "")
+        @client = stub(:logger => @logger)
       end
 
       context "for call with model creation" do

data/test/prefixed_logger_test.rb

@@ -5,7 +5,7 @@ module Chillout
     def test_error_message_is_prefixed
       output = StringIO.new
       logger = Logger.new(output)
-      prefixed_logger = PrefixedLogger.new("[Chillout]", logger)
+      prefixed_logger = PrefixedLogger.new("Chillout", logger)
       prefixed_logger.error "Someone is wrong on the internet"
       assert_includes output.string, "[Chillout] Someone is wrong on the internet"
     end

data/test/test_helper.rb

@@ -17,17 +17,6 @@ class ChilloutTestCase < Test::Unit::TestCase
     assert collection.include?(object), message || "#{collection.inspect} expected to include #{object.inspect}."
   end
 
-  def build_exception(klass = Exception, message = "Test Exception")
-    raise klass.new(message)
-  rescue Exception => exception
-    exception
-  end
-
-  def build_error(klass, message = "Test Error", environment = {})
-    exception = build_exception(klass, message)
-    Chillout::Error.new(exception, environment)
-  end
-
   def stub_api_request(api_key, resource_name)
     @_api_key = api_key
     stub_request(:post, api_url(resource_name))
@@ -35,7 +24,7 @@ class ChilloutTestCase < Test::Unit::TestCase
 
   def assert_request_body(resource_name)
     assert_requested(:post, api_url(resource_name)) do |request|
-      yield JSON.parse(request.body)
+      yield MultiJson.load(request.body)
     end
   end
 
@@ -48,6 +37,15 @@ class ChilloutTestCase < Test::Unit::TestCase
     "https://#{@_api_key}:#{@_api_key}@api.chillout.io/#{resource_name}"
   end
 
+  def null_logger
+    Logger.new('/dev/null')
+  end
+
+  def assert_successful_exit(pid)
+    _, status = Process.wait2(pid)
+    assert_equal 0, status.exitstatus
+  end
+
 end
 
 class ChilloutTestException < Exception; end

metadata

@@ -1,147 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chillout
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.5.4
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 3
-  version: 0.5.3
 platform: ruby
-authors: 
-- "Micha\xC5\x82 \xC5\x81omnicki"
+authors:
+- Michał Łomnicki
 - Jan Filipowski
+- Paweł Pacana
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-04-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
-        version: 1.7.0
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 12
-        - 8
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.12.8
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: contest
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.8
+- !ruby/object:Gem::Dependency
+  name: contest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.1.3
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 6
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.6.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 33
-        segments: 
-        - 1
-        - 8
-        - 11
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.8.11
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.11
 description: Chillout.io Ruby client
-email: 
+email:
 - michal.lomnicki@gmail.com
 - jachuf@gmail.com
+- pawel.pacana@gmail.com
 - dev@arkency.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -159,9 +152,9 @@ files:
 - lib/chillout/middleware/creations_monitor.rb
 - lib/chillout/prefixed_logger.rb
 - lib/chillout/railtie.rb
-- lib/chillout/server-side/dispatcher.rb
-- lib/chillout/server-side/http_client.rb
-- lib/chillout/server-side/server_side.rb
+- lib/chillout/server_side/dispatcher.rb
+- lib/chillout/server_side/http_client.rb
+- lib/chillout/server_side/server_side.rb
 - lib/chillout/tasks.rb
 - lib/chillout/version.rb
 - lib/chillout/worker.rb
@@ -174,6 +167,7 @@ files:
 - test/http_client_test.rb
 - test/integration/client_test.rb
 - test/integration/creations_monitor_rack_test.rb
+- test/integration/worker_test.rb
 - test/middleware/creations_monitor_test.rb
 - test/prefixed_logger_test.rb
 - test/server_side_test.rb
@@ -181,38 +175,35 @@ files:
 - test/worker_test.rb
 homepage: http://chillout.io/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3188055463774447782
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3188055463774447782
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Chillout.io Ruby client
-test_files: 
+test_files:
 - test/check_result_test.rb
 - test/client_test.rb
 - test/config_test.rb
@@ -222,6 +213,7 @@ test_files:
 - test/http_client_test.rb
 - test/integration/client_test.rb
 - test/integration/creations_monitor_rack_test.rb
+- test/integration/worker_test.rb
 - test/middleware/creations_monitor_test.rb
 - test/prefixed_logger_test.rb
 - test/server_side_test.rb