chillout 0.3.0 → 0.4.0

data/lib/chillout/check_result.rb

@@ -0,0 +1,13 @@
+class CheckResult
+  def initialize(response)
+    @response = response
+  end
+
+  def successful?
+    @response.respond_to?(:code) && @response.code == "200"
+  end
+
+  def has_problem_with_authorization?
+    @response.respond_to?(:code) && @response.code == "401"
+  end
+end

data/lib/chillout/client.rb

@@ -6,13 +6,14 @@ require 'chillout/config'
 require 'chillout/event_data_builder'
 require 'chillout/prefixed_logger'
 require 'chillout/worker'
+require 'chillout/check_result'
 require 'thread'
 
 module Chillout
   class Client
     extend Forwardable
 
-    def_delegators :@dispatcher, :send_creations
+    def_delegators :@dispatcher, :send_creations, :check_api_connection
 
     attr_reader :config
     attr_reader :logger

data/lib/chillout/config.rb

@@ -6,7 +6,7 @@ module Chillout
   class Config
 
     DEFAULT_HOSTNAME      = "api.chillout.io"
-    DEFAULT_PORT          = 80
+    DEFAULT_PORT          = 443
     DEFAULT_NOTIFIER_NAME = "Chillout"
     DEFAULT_NOTIFIER_URL  = "http://github.com/chilloutio/chillout"
 
@@ -48,5 +48,13 @@ module Chillout
       @authentication_password || api_key
     end
 
+    def to_s
+      <<-eos
+ * hostname: #{hostname}
+ * port: #{port}
+ * ssl: #{ssl}
+      eos
+    end
+
   end
 end

data/lib/chillout/dispatcher.rb

@@ -13,5 +13,12 @@ module Chillout
     rescue HttpClient::NotSent
       raise SendCreationsFailed.new
     end
+
+    def check_api_connection
+      response = @server_side.send_check
+      CheckResult.new(response)
+    rescue HttpClient::NotReceived => e
+      CheckResult.new(e)
+    end
   end
 end

data/lib/chillout/http_client.rb

@@ -10,6 +10,14 @@ module Chillout
       end
     end
 
+    class NotReceived < StandardError
+      attr_reader :original_exception
+
+      def initialize(original_exception)
+        @original_exception = original_exception
+      end
+    end
+
     MEDIA_TYPE = "application/vnd.chillout.v1+json"
 
     def initialize(config, logger)
@@ -32,5 +40,18 @@ module Chillout
       raise NotSent.new(e)
     end
 
+    def get(path)
+      http = Net::HTTP.new(@config.hostname, @config.port)
+      http.use_ssl = @config.ssl
+      request_spec = Net::HTTP::Get.new(path)
+      request_spec.content_type = MEDIA_TYPE
+      request_spec.basic_auth @config.authentication_user, @config.authentication_password
+      http.start do
+        http.request(request_spec)
+      end
+    rescue => e
+      raise NotReceived.new(e)
+    end
+
   end
 end

data/lib/chillout/railtie.rb

@@ -18,5 +18,9 @@ module Chillout
         client.start_worker
       end
     end
+
+    rake_tasks do
+      load "chillout/tasks.rb"
+    end
   end
 end

data/lib/chillout/server_side.rb

@@ -18,6 +18,10 @@ module Chillout
       @http_client.post('/metrics', data)
     end
 
+    def send_check
+      @http_client.get('/check')
+    end
+
     private
       def timestamp
         Time.now.iso8601

data/lib/chillout/tasks.rb

@@ -0,0 +1,18 @@
+namespace :chillout do
+  desc "Check chillout integration"
+  task :check do
+    Rails.initialize!
+    config = Rails.configuration.chillout
+    client = Chillout::Client.new(config[:secret], config.reject{|x| x == :secret})
+    check_result = client.check_api_connection
+
+    if check_result.successful?
+      puts "Chillout API available."
+    elsif check_result.has_problem_with_authorization?
+      puts "Chillout API available, but project couldn't authorize."
+    else
+      puts "Chillout API not available for given configuration:"
+      puts client.config.to_s
+    end
+  end
+end

data/lib/chillout/version.rb

@@ -1,3 +1,3 @@
 module Chillout
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/check_result_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+class CheckResultTest < ChilloutTestCase
+  def test_successful_for_response_with_200_code
+    response = stub(code: "200")
+    check_result = CheckResult.new(response)
+    assert check_result.successful?
+  end
+
+  def test_not_successful_for_response_with_other_code
+    response = stub(code: "304")
+    check_result = CheckResult.new(response)
+    refute check_result.successful?
+  end
+
+  def test_not_successful_for_response_that_dont_respond_to_code
+    response = stub
+    check_result = CheckResult.new(response)
+    refute check_result.successful?
+  end
+
+  def test_dont_have_problem_with_authorization_for_response_with_200_code
+    response = stub(code: "200")
+    check_result = CheckResult.new(response)
+    refute check_result.has_problem_with_authorization?
+  end
+
+  def test_have_problem_with_authorization_for_response_with_401_code
+    response = stub(code: "401")
+    check_result = CheckResult.new(response)
+    assert check_result.has_problem_with_authorization?
+  end
+
+  def test_dont_have_problem_with_authorization_for_response_with_other_code
+    response = stub(code: "501")
+    check_result = CheckResult.new(response)
+    refute check_result.has_problem_with_authorization?
+  end
+
+  def test_dont_have_problem_with_authorization_for_response_that_dont_respond_to_code
+    response = stub
+    check_result = CheckResult.new(response)
+    refute check_result.has_problem_with_authorization?
+  end
+end

data/test/integration/client_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ClientIntegrationTest < ChilloutTestCase
+  def test_check_api_connection_with_200_ok_response
+    @_api_key = "xyz123"
+    url = api_url("check")
+    stub_request(:get, url).to_return(body: "OK", status: 200)
+
+    client = Chillout::Client.new(@_api_key)
+    check_result = client.check_api_connection
+    assert check_result.successful?, "Check was not successful"
+  end
+
+  def test_check_api_connection_with_other_response
+    @_api_key = "xyz123"
+    url = api_url("check")
+    stub_request(:get, url).to_return(body: "Not Found", status: 404)
+
+    client = Chillout::Client.new(@_api_key)
+    check_result = client.check_api_connection
+    refute check_result.successful?, "Check was successful"
+  end
+
+  def test_check_api_connection_with_raised_exception_on_request
+    @_api_key = "xyz123"
+    url = api_url("check")
+    stub_request(:get, url).to_raise(StandardError)
+
+    client = Chillout::Client.new(@_api_key)
+    check_result = client.check_api_connection
+    refute check_result.successful?, "Check was successful"
+  end
+end

data/test/integration/creations_monitor_rack_test.rb

@@ -9,7 +9,6 @@ module Chillout
       api_key = "xyz123"
       stub_api_request(api_key, "metrics")
       @config = Chillout::Config.new(api_key)
-      @config.ssl = false
       @client = Chillout::Client.new(@config)
       @client.start_worker
     end

data/test/test_helper.rb

@@ -38,7 +38,7 @@ class ChilloutTestCase < Test::Unit::TestCase
 
   def api_url(resource_name)
     raise "API KEY not set" unless @_api_key
-    "http://#{@_api_key}:#{@_api_key}@api.chillout.io/#{resource_name}"
+    "https://#{@_api_key}:#{@_api_key}@api.chillout.io/#{resource_name}"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chillout
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -124,6 +124,7 @@ files:
 - Rakefile
 - chillout.gemspec
 - lib/chillout.rb
+- lib/chillout/check_result.rb
 - lib/chillout/client.rb
 - lib/chillout/config.rb
 - lib/chillout/creation_listener.rb
@@ -135,14 +136,17 @@ files:
 - lib/chillout/prefixed_logger.rb
 - lib/chillout/railtie.rb
 - lib/chillout/server_side.rb
+- lib/chillout/tasks.rb
 - lib/chillout/version.rb
 - lib/chillout/worker.rb
+- test/check_result_test.rb
 - test/client_test.rb
 - test/config_test.rb
 - test/creations_container_test.rb
 - test/dispatcher_test.rb
 - test/event_data_builder_test.rb
 - test/http_client_test.rb
+- test/integration/client_test.rb
 - test/integration/creations_monitor_rack_test.rb
 - test/middleware/creations_monitor_test.rb
 - test/prefixed_logger_test.rb
@@ -163,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4186506627613896564
+      hash: 1830182422873723913
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4186506627613896564
+      hash: 1830182422873723913
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -180,12 +184,14 @@ signing_key:
 specification_version: 3
 summary: Chillout.io Ruby client
 test_files:
+- test/check_result_test.rb
 - test/client_test.rb
 - test/config_test.rb
 - test/creations_container_test.rb
 - test/dispatcher_test.rb
 - test/event_data_builder_test.rb
 - test/http_client_test.rb
+- test/integration/client_test.rb
 - test/integration/creations_monitor_rack_test.rb
 - test/middleware/creations_monitor_test.rb
 - test/prefixed_logger_test.rb