chillout 0.5.4 → 0.6.0

data/README.md

@@ -14,11 +14,11 @@ And then execute:
 
     $ bundle
 
-And configure in config/environments/production.rb:
+And run Rails generator:
 
-```ruby
-config.chillout = { secret: '<YOUR_SECRET>' }
-```
+    $ rails g chillout:install EMAIL EMAIL2...
+
+And that's all! You can find whole configuration in config/environments/production.rb under ```chillout``` key.
 
 Check if everything is ok:
 

data/lib/chillout/client.rb

@@ -35,7 +35,7 @@ module Chillout
     end
 
     def enqueue(creations)
-      ensure_worker_running
+      start_worker
       @logger.info "Creations were enqueued."
       @queue << creations
     end
@@ -44,22 +44,23 @@ module Chillout
       @worker_thread && @worker_thread.alive?
     end
 
-    private
     def start_worker
-      @worker_thread = Thread.new do
-        worker = Worker.new(@dispatcher, @queue, @logger)
-        worker.run
-      end
-    end
-
-    def ensure_worker_running
       return if worker_running?
       @worker_mutex.synchronize do
         return if worker_running?
-        start_worker
+        @worker_thread = Thread.new do
+          begin
+            worker = Worker.new(@dispatcher, @queue, @logger)
+            worker.run
+          ensure
+            @logger.flush
+          end
+        end
       end
     end
 
+    private
+
     def build_config(config_or_api_key, options)
       case config_or_api_key
       when Config

data/lib/chillout/generators/install.rb

@@ -0,0 +1,26 @@
+require 'chillout/registration'
+
+module Chillout
+  class Install < ::Rails::Generators::Base
+    argument :emails, :required => true, :type => :array, :banner => "EMAIL1 EMAIL2..."
+
+    desc "Installs chillout in your app"
+    def install_chillout
+      project_name = File.basename(Rails.root)
+      registration = Registration.new
+      api_key = registration.register(project_name, emails)
+      application nil, :env => :production do
+        "config.chillout = { :secret => '#{api_key}' }"
+      end
+      puts "Chillout installed - you can find its configuration in config/environments/production.rb."
+    rescue Registration::NotRegisteredByLimit
+      puts "Chillout not installed - we're currently out of limit for new projects. Please try again later or send us email on info@chillout.io."
+    rescue Registration::NotRegisteredByInvalidData
+      puts "Chillout not installed - you've passed incorrect data."
+    rescue Registration::NotRegisteredByAccident
+      puts "Chillout not installed - our API returned a silly response. Please send us email on info@chillout.io."
+    rescue Registration::NotRegisteredByCommunicationError
+      puts "Chillout not installed - we couldn't get response from our API. Please check if you can access https://chillout.io/ with your browser."
+    end
+  end
+end

data/lib/chillout/prefixed_logger.rb

@@ -1,5 +1,11 @@
+require 'forwardable'
+
 module Chillout
   class PrefixedLogger
+    extend Forwardable
+
+    def_delegators :@logger, :flush
+
     attr_reader :prefix
 
     def initialize(prefix, logger)

data/lib/chillout/railtie.rb

@@ -13,6 +13,10 @@ module Chillout
     rake_tasks do
       load "chillout/tasks.rb"
     end
+
+    generators do
+      require "chillout/generators/install"
+    end
   end
 
   class RailsInitializer
@@ -30,6 +34,7 @@ module Chillout
       @rails_logger.info "[Chillout] Creation listener attached"
       @rails_app.middleware.use Middleware::CreationsMonitor, client
       @rails_logger.info "[Chillout] Creation monitor enabled"
+      client.start_worker
     end
 
     def options

data/lib/chillout/registration.rb

@@ -0,0 +1,33 @@
+require 'chillout/server_side/plain_http_client'
+
+module Chillout
+  class Registration
+    class NotRegisteredByLimit < StandardError; end
+    class NotRegisteredByInvalidData < StandardError; end
+    class NotRegisteredByAccident < StandardError; end
+    class NotRegisteredByCommunicationError < StandardError; end
+
+    def initialize(http_client=PlainHttpClient.new)
+      @http_client = http_client
+    end
+
+    def register(name, emails)
+      data = {
+        :name => name,
+        :emails => emails
+      }
+      response_body = @http_client.post("/projects", data)
+      response_body["api_key"].strip
+    rescue PlainHttpClient::NotCreated => e
+      if e.code == "403"
+        raise NotRegisteredByLimit.new
+      elsif e.code == "400"
+        raise NotRegisteredByInvalidData.new
+      else
+        raise NotRegisteredByAccident.new
+      end
+    rescue PlainHttpClient::CommunicationError => e
+      raise NotRegisteredByCommunicationError.new
+    end
+  end
+end

data/lib/chillout/server_side/plain_http_client.rb

@@ -0,0 +1,46 @@
+require 'net/https'
+
+module Chillout
+  class PlainHttpClient
+    class NotCreated < StandardError
+      attr_reader :response
+
+      def initialize(response)
+        @response = response
+      end
+
+      def code
+        @response.code
+      end
+    end
+
+    class CommunicationError < StandardError
+      attr_reader :original_exception
+
+      def initialize(exception)
+        @original_exception = exception
+      end
+    end
+
+    MEDIA_TYPE = "application/vnd.chillout.v1+json"
+
+    def post(path, data)
+      begin
+        http = Net::HTTP.new("api.chillout.io", 443)
+        http.use_ssl = true
+        request_spec = Net::HTTP::Post.new(path)
+        request_spec.body = MultiJson.dump(data)
+        request_spec.content_type = MEDIA_TYPE
+        response = http.start do
+          http.request(request_spec)
+        end
+        raise NotCreated.new(response) if response.code != "201"
+        MultiJson.load(response.body)
+      rescue NotCreated
+        raise
+      rescue => e
+        raise CommunicationError.new(e)
+      end
+    end
+  end
+end

data/lib/chillout/version.rb

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

data/lib/chillout/worker.rb

@@ -53,6 +53,7 @@ module Chillout
         containers_to_merge = get_all_containers_to_process
         creations_container = merge_containers(containers_to_merge)
         send_creations(creations_container)
+        logger.flush
         sleep 5
       end
     end

data/test/plain_http_client_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+require 'chillout/server_side/plain_http_client'
+
+module Chillout
+  class PlainHttpClientTest < ChilloutTestCase
+    def setup
+      @client = PlainHttpClient.new
+      WebMock.reset!
+    end
+
+    def test_post_returns_response_body_json_as_hash
+      stub_request(:post, "https://api.chillout.io/projects").to_return(:status => 201, :body => MultiJson.dump(:api_key => "123-123-123"))
+      assert_equal "123-123-123", @client.post("/projects", {
+        :name => "name"
+      })["api_key"]
+    end
+
+    def test_post_raises_exception_when_status_code_is_not_201
+      stub_request(:post, "https://api.chillout.io/projects").to_return(:status => 403, :body => MultiJson.dump({}))
+      assert_raises PlainHttpClient::NotCreated do
+        @client.post("/projects", {
+          :name => "name"
+        })
+      end
+    end
+
+    def test_post_raises_exception_when_there_is_unpredicted_exception
+      stub_request(:post, "https://api.chillout.io/projects").to_raise("great cornholio ate api")
+      assert_raises PlainHttpClient::CommunicationError do
+        @client.post("/projects", {
+          :name => "name"
+        })
+      end
+    end
+  end
+end

data/test/prefixed_logger_test.rb

@@ -9,5 +9,12 @@ module Chillout
       prefixed_logger.error "Someone is wrong on the internet"
       assert_includes output.string, "[Chillout] Someone is wrong on the internet"
     end
+
+    def test_responds_to_flush
+      logger = mock("logger")
+      logger.expects(:flush)
+      prefixed_logger = PrefixedLogger.new("Chillout", logger)
+      prefixed_logger.flush
+    end
   end
 end

data/test/registration_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+require 'chillout/registration'
+
+module Chillout
+  class RegistrationTest < ChilloutTestCase
+    def setup
+      @http_client = mock("http_client")
+      @registration = Registration.new(@http_client)
+    end
+
+    def test_register_send_name_and_emails
+      @http_client.expects(:post).with("/projects", has_entries(:name => "name of project", :emails => ["kaka@dada.com", "dada@kaka.com"])).returns({"api_key" => "123-123-123"})
+      @registration.register("name of project", ["kaka@dada.com", "dada@kaka.com"])
+    end
+
+    def test_register_returns_stripped_response_body_as_result
+      @http_client.stubs(:post).returns({"api_key" => "   123-123-123  "})
+      assert_equal "123-123-123", @registration.register("name of project", ["kaka@dada.com", "dada@kaka.com"])
+    end
+
+    def test_raises_exception_when_it_receives_info_about_crossed_limit
+      exception = stub_not_created("403")
+      @http_client.stubs(:post).raises(exception)
+      assert_raises Registration::NotRegisteredByLimit do
+        @registration.register("name of project", ["kaka@dada.com", "dada@kaka.com"])
+      end
+    end
+
+    def test_raises_exception_when_it_receives_info_about_invalid_data
+      exception = stub_not_created("400")
+      @http_client.stubs(:post).raises(exception)
+      assert_raises Registration::NotRegisteredByInvalidData do
+        @registration.register("name of project", ["kaka@dada.com", "dada@kaka.com"])
+      end
+    end
+
+    def test_raises_exception_when_it_receives_other_failure_response
+      exception = stub_not_created("402")
+      @http_client.stubs(:post).raises(exception)
+      assert_raises Registration::NotRegisteredByAccident do
+        @registration.register("name of project", ["kaka@dada.com", "dada@kaka.com"])
+      end
+    end
+
+    def test_raises_exception_when_commucation_error_occures
+      exception = PlainHttpClient::CommunicationError.new(:e)
+      @http_client.stubs(:post).raises(exception)
+      assert_raises Registration::NotRegisteredByCommunicationError do
+        @registration.register("name of project", ["kaka@dada.com", "dada@kaka.com"])
+      end
+    end
+
+    def stub_not_created(code)
+      response = stub(:code => code)
+      PlainHttpClient::NotCreated.new(response)
+    end
+  end
+end

metadata

@@ -1,140 +1,148 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: chillout
-version: !ruby/object:Gem::Version
-  version: 0.5.4
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
-authors:
-- Michał Łomnicki
+authors: 
+- "Micha\xC5\x82 \xC5\x81omnicki"
 - Jan Filipowski
-- Paweł Pacana
+- "Pawe\xC5\x82 Pacana"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 2
+        - 0
         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: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.8
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 12
+        - 8
         version: 0.12.8
-- !ruby/object:Gem::Dependency
-  name: contest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: contest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 1
+        - 3
         version: 0.1.3
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.2
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 6
+        - 2
         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: *id006
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 1
+        - 8
+        - 11
         version: 1.8.11
+  type: :development
+  version_requirements: *id007
 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
@@ -149,11 +157,14 @@ files:
 - lib/chillout/creation_listener.rb
 - lib/chillout/creations_container.rb
 - lib/chillout/event_data_builder.rb
+- lib/chillout/generators/install.rb
 - lib/chillout/middleware/creations_monitor.rb
 - lib/chillout/prefixed_logger.rb
 - lib/chillout/railtie.rb
+- lib/chillout/registration.rb
 - lib/chillout/server_side/dispatcher.rb
 - lib/chillout/server_side/http_client.rb
+- lib/chillout/server_side/plain_http_client.rb
 - lib/chillout/server_side/server_side.rb
 - lib/chillout/tasks.rb
 - lib/chillout/version.rb
@@ -169,41 +180,46 @@ files:
 - test/integration/creations_monitor_rack_test.rb
 - test/integration/worker_test.rb
 - test/middleware/creations_monitor_test.rb
+- test/plain_http_client_test.rb
 - test/prefixed_logger_test.rb
+- test/registration_test.rb
 - test/server_side_test.rb
 - test/test_helper.rb
 - 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 3188055463774447782
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 3188055463774447782
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.15
 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
@@ -215,7 +231,9 @@ test_files:
 - test/integration/creations_monitor_rack_test.rb
 - test/integration/worker_test.rb
 - test/middleware/creations_monitor_test.rb
+- test/plain_http_client_test.rb
 - test/prefixed_logger_test.rb
+- test/registration_test.rb
 - test/server_side_test.rb
 - test/test_helper.rb
 - test/worker_test.rb