chillout 0.5.0 → 0.5.1

data/chillout.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "json", "~> 1.7.0"
   gem.add_development_dependency "minitest", "~>3.2.0"
   gem.add_development_dependency "rake",  "~> 0.9.2"
-  gem.add_development_dependency "mocha", "~> 0.12.7"
+  gem.add_development_dependency "mocha", "0.12.8"
   gem.add_development_dependency "contest", "~> 0.1.3"
   gem.add_development_dependency "rack-test", "~> 0.6.2"
   gem.add_development_dependency "webmock", "~> 1.8.11"

data/lib/chillout/client.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
-require 'chillout/server_side'
-require 'chillout/http_client'
-require 'chillout/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'
@@ -29,7 +29,7 @@ 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
-      @dispatcher = Dispatcher.new(@filter, @server_side).freeze
+      @dispatcher = Dispatcher.new(@server_side).freeze
       @queue = Queue.new
     end
 

data/lib/chillout/railtie.rb

@@ -3,24 +3,47 @@ require 'chillout/creation_listener'
 module Chillout
   class Railtie < Rails::Railtie
     config.chillout = ActiveSupport::OrderedOptions.new
-    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]]}
-        options = Hash[options_list].merge(:logger => Rails.logger)
+    initializer "chillout.creations_listener_initialization" do |rails_app|
+      chillout_config = rails_app.config.chillout
+      return if chillout_config.empty?
+      RailsInitializer.new(rails_app, chillout_config, Rails.logger).start
+    end
+
+    rake_tasks do
+      load "chillout/tasks.rb"
+    end
+  end
 
-        client = Client.new(app.config.chillout[:secret], options)
+  class RailsInitializer
+    
+    def initialize(rails_app, chillout_config, rails_logger)
+      @rails_app = rails_app
+      @chillout_config = chillout_config
+      @rails_logger = rails_logger
+    end
 
-        ActiveRecord::Base.extend(CreationListener)
+    def start
+      @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_app.middleware.use Middleware::CreationsMonitor, client
+      @rails_logger.info "[Chillout] creation monitor enabled"
+      client.start_worker
+      @rails_logger.info "[Chillout] worker started"
+    end
 
-        app.middleware.use Middleware::CreationsMonitor, client
+    def options
+      Hash[options_list].merge(:logger => @rails_logger)
+    end
 
-        client.start_worker
-      end
+    def options_list
+      existing_option_keys.map{|key| [key, @chillout_config[key]]}
     end
 
-    rake_tasks do
-      load "chillout/tasks.rb"
+    def existing_option_keys
+      [:port, :hostname, :ssl].select{|key| @chillout_config.has_key?(key)}
     end
+
   end
 end

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

@@ -3,8 +3,7 @@ module Chillout
     class SendCreationsFailed < StandardError
     end
 
-    def initialize(filter, server_side)
-      @filter      = filter
+    def initialize(server_side)
       @server_side = server_side
     end
 

data/lib/chillout/version.rb

@@ -1,3 +1,3 @@
 module Chillout
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/chillout.rb

@@ -1,9 +1,9 @@
 require "chillout/version"
 require "chillout/config"
 require "chillout/middleware/creations_monitor"
-require "chillout/dispatcher"
-require "chillout/server_side"
-require "chillout/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/dispatcher_test.rb

@@ -2,12 +2,10 @@ require 'test_helper'
 
 class DispatcherTest < ChilloutTestCase
   def test_send_creations
-    filter = mock("Filter")
-
     server_side = mock("ServerSide")
     server_side.expects(:send_creations).with(:creations)
 
-    dispatcher = Chillout::Dispatcher.new(filter, server_side)
+    dispatcher = Chillout::Dispatcher.new(server_side)
     dispatcher.send_creations(:creations)
   end
 
@@ -15,7 +13,7 @@ class DispatcherTest < ChilloutTestCase
     server_side = stub()
     server_side.stubs(:send_creations).raises(Chillout::HttpClient::NotSent.new(:http_error))
 
-    dispatcher = Chillout::Dispatcher.new(mock, server_side)
+    dispatcher = Chillout::Dispatcher.new(server_side)
 
     assert_raises Chillout::Dispatcher::SendCreationsFailed do
       dispatcher.send_creations(:creations)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chillout
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-29 00:00:00 Z
+date: 2013-04-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -72,14 +72,14 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 63
         segments: 
         - 0
         - 12
-        - 7
-        version: 0.12.7
+        - 8
+        version: 0.12.8
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -155,13 +155,13 @@ files:
 - lib/chillout/config.rb
 - lib/chillout/creation_listener.rb
 - lib/chillout/creations_container.rb
-- lib/chillout/dispatcher.rb
 - lib/chillout/event_data_builder.rb
-- lib/chillout/http_client.rb
 - lib/chillout/middleware/creations_monitor.rb
 - lib/chillout/prefixed_logger.rb
 - lib/chillout/railtie.rb
-- lib/chillout/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