chillout 0.6.0 → 0.8.0

data/test/acceptance/sidekiq_workers_send_metrics_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+require 'sidekiq'
+
+class SidekiqWorkersSendMetricsTest < AcceptanceTestCase
+
+  def test_sidekiq_worker_sends_metrics
+    test_sidekiq_worker = TestSidekiqServer.new
+    test_endpoint = TestEndpoint.new(port: 8081)
+
+    test_endpoint.listen
+    test_sidekiq_worker.boot(chillout_port: 8081)
+    test_sidekiq_worker.push_job
+
+    if ENV['STRATEGY'] != 'active_job'
+      assert test_endpoint.has_received_information_about_startup
+    end
+    assert test_endpoint.has_one_creation_for_entity_resource
+  ensure
+    test_sidekiq_worker.shutdown if test_sidekiq_worker
+  end
+
+end if ENV['SIDEKIQ_SUPPORTED']

data/test/config_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'minitest/stub_const'
 
 class ConfigTest < ChilloutTestCase
 
@@ -23,4 +24,33 @@ class ConfigTest < ChilloutTestCase
     assert_equal @config.api_key, @config.authentication_password
   end
 
-end
+  def test_default_strategy_is_thread
+    assert_equal :thread, @config.strategy
+  end
+
+  def test_can_assign_thread
+    @config.strategy = "thread"
+    assert_equal :thread, @config.strategy
+  end
+
+  def test_cannot_assing_bullshit
+    assert_raises(ArgumentError) do
+      @config.strategy = "bullshit"
+    end
+  end
+
+  def test_can_assign_active_job_strategy
+    Object.stub_remove_const(:ActiveJob) do
+      refute defined?(ActiveJob)
+      assert_raises(ArgumentError) do
+        @config.strategy = :active_job
+      end
+    end
+
+    Object.stub_const(:ActiveJob, :WhatEver) do
+      @config.strategy = :active_job
+      assert_equal :active_job, @config.strategy
+    end
+  end
+
+end

data/test/custom_metric_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper' 
+
+class CustomMetricTest < ChilloutTestCase
+  def setup
+    @creations_container = MiniTest::Mock.new
+  end
+
+  def test_custom_creation
+    @creations_container.expect(:nil?, false, [])
+    @creations_container.expect(:increment!, nil, ['foo'])
+    @custom_metric = Chillout::CustomMetric.new(@creations_container)
+    @custom_metric.track('foo')
+    @creations_container.verify
+  end
+end

data/test/event_data_builder_test.rb

@@ -4,7 +4,8 @@ require 'chillout/creations_container'
 
 module Chillout
   class EventDataBuilderTest < ChilloutTestCase
-    setup do
+    def setup
+      super
       @shell_env = { 'PATH' => '/bin:/usr/bin' }
       @api_key = "s3cr3t"
 
@@ -18,46 +19,51 @@ module Chillout
       @timestamp = Time.now.iso8601
     end
 
-    context "build from creations container" do
-      setup do
-        @creations_container = CreationsContainer.new
-        5.times { @creations_container.increment!("User") }
-        3.times { @creations_container.increment!("Cart") }
-        8.times { @creations_container.increment!("CartItem") }
-
-        @event_data_builder = EventDataBuilder.new(@config)
-        @event_data = @event_data_builder.build_from_creations_container(@creations_container, @timestamp)
-      end
-
-      def test_metric_type
-        assert_param :metric, "creations"
-      end
-
-      def test_timestamp
-        assert_param :timestamp, @timestamp
-      end
-
-      def test_each_counter
-        assert_creations :User, 5
-        assert_creations :Cart, 3
-        assert_creations :CartItem, 8
-      end
-
-      def test_environment
-        assert_content :environment, "development"
-      end
-
-      def test_notifier_name
-        assert_notifier :name, "chillout"
-      end
-
-      def test_notifier_version
-        assert_notifier :version, "0.1"
-      end
-
-      def test_notifier_url
-        assert_notifier :url, "http://github.com/arkency/chillout"
-      end
+    def build_from_creations_container
+      @creations_container = CreationsContainer.new
+      5.times { @creations_container.increment!("User") }
+      3.times { @creations_container.increment!("Cart") }
+      8.times { @creations_container.increment!("CartItem") }
+
+      @event_data_builder = EventDataBuilder.new(@config)
+      @event_data = @event_data_builder.build_from_creations_container(@creations_container, @timestamp)
+    end
+
+    def test_metric_type
+      build_from_creations_container
+      assert_param :metric, "creations"
+    end
+
+    def test_timestamp
+      build_from_creations_container
+      assert_param :timestamp, @timestamp
+    end
+
+    def test_each_counter
+      build_from_creations_container
+      assert_creations :User, 5
+      assert_creations :Cart, 3
+      assert_creations :CartItem, 8
+    end
+
+    def test_environment
+      build_from_creations_container
+      assert_content :environment, "development"
+    end
+
+    def test_notifier_name
+      build_from_creations_container
+      assert_notifier :name, "chillout"
+    end
+
+    def test_notifier_version
+      build_from_creations_container
+      assert_notifier :version, "0.1"
+    end
+
+    def test_notifier_url
+      build_from_creations_container
+      assert_notifier :url, "http://github.com/arkency/chillout"
     end
 
     private

data/test/integration/client_test.rb

@@ -1,10 +1,15 @@
 require 'test_helper'
+require 'active_job'
+require 'active_job/test_helper'
 
 class ClientIntegrationTest < ChilloutTestCase
+  include ActiveJob::TestHelper
+
   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)
+    stub_request(:get, url).with(basic_auth: ['xyz123', 'xyz123']).
+      to_return(:body => "OK", :status => 200)
 
     client = Chillout::Client.new(@_api_key)
     check_result = client.check_api_connection
@@ -14,7 +19,8 @@ class ClientIntegrationTest < ChilloutTestCase
   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)
+    stub_request(:get, url).with(basic_auth: ['xyz123', 'xyz123']).
+      to_return(:body => "Not Found", :status => 404)
 
     client = Chillout::Client.new(@_api_key)
     check_result = client.check_api_connection
@@ -24,10 +30,78 @@ class ClientIntegrationTest < ChilloutTestCase
   def test_check_api_connection_with_raised_exception_on_request
     @_api_key = "xyz123"
     url = api_url("check")
-    stub_request(:get, url).to_raise(StandardError)
+    stub_request(:get, url).with(basic_auth: ['xyz123', 'xyz123']).
+      to_raise(StandardError)
 
     client = Chillout::Client.new(@_api_key)
     check_result = client.check_api_connection
     refute check_result.successful?, "Check was successful"
   end
-end
+
+  def test_client_creats_new_worker_thread_after_exception
+    @_api_key = "xyz123"
+    stub_request(:post, api_url("clients")).with(basic_auth: ['xyz123', 'xyz123']).
+      to_return(:body => "OK", :status => 200)
+    stub_request(:post, api_url("metrics")).with(basic_auth: ['xyz123', 'xyz123']).
+      to_return(:body => "OK", :status => 200)
+
+    client = Chillout::Client.new(@_api_key)
+    client.enqueue(Chillout::CreationsContainer.new)
+    assert client.worker_running?
+
+    client.enqueue(nil)
+    sleep(6)
+    refute client.worker_running?
+
+    client.enqueue(Chillout::CreationsContainer.new)
+    assert client.worker_running?
+
+    client.enqueue(nil)
+    sleep(6)
+    refute client.worker_running?
+  end
+
+  def test_active_job_queueing
+    assert_enqueued_jobs 0
+    client = Chillout::Client.new("xyz123", strategy: :active_job)
+    container = Chillout::CreationsContainer.new
+    container.increment!("User")
+
+    assert_enqueued_jobs 1, only: Chillout::Job, queue: "chillout" do
+      client.enqueue(container)
+    end
+  end
+
+  def test_active_job_performing
+    @_api_key = "xyz123"
+    stub_request(:post, api_url("metrics")).with(basic_auth: ['xyz123', 'xyz123']).
+      to_return(:body => "OK", :status => 200)
+
+    client = Chillout::Client.new("xyz123", strategy: :active_job)
+    container = Chillout::CreationsContainer.new
+    container.increment!("User")
+
+    perform_enqueued_jobs do
+      assert_performed_jobs 1, only: Chillout::Job do
+        client.enqueue(container)
+      end
+    end
+  end
+
+  private
+
+  def self.active_job_4_test_helper?
+    instance_method(:assert_performed_jobs).arity == 1 && instance_method(:assert_enqueued_jobs).arity == 1
+  end
+
+  if active_job_4_test_helper?
+    prepend(Module.new(){
+      def assert_performed_jobs(number, only: nil, &block)
+        super(number, &block)
+      end
+      def assert_enqueued_jobs(number, only: nil, queue: nil, &block)
+        super(number, &block)
+      end
+    })
+  end
+end

data/test/integration/worker_test.rb

@@ -15,7 +15,7 @@ class WorkerIntegrationTest < ChilloutTestCase
     client = Chillout::Client.new(@_api_key, :logger => null_logger)
     worker_check = Proc.new do
       client.enqueue(Chillout::CreationsContainer.new)
-      assert client.worker_running?
+      client.worker_running? ? Process.exit!(0) : Process.exit!(28)
     end
 
     assert_successful_exit Process.fork(&worker_check)
@@ -23,8 +23,9 @@ class WorkerIntegrationTest < ChilloutTestCase
 
   def test_worker_running_lazily
     client = Chillout::Client.new(@_api_key, :logger => null_logger)
-    client.enqueue(Chillout::CreationsContainer.new)
+    assert !client.worker_running?
 
+    client.enqueue(Chillout::CreationsContainer.new)
     assert client.worker_running?
   end
 

data/test/middleware/creations_monitor_test.rb

@@ -3,47 +3,46 @@ require 'test_helper'
 module Chillout
   module Middleware
     class CreationsMonitorTest < ChilloutTestCase
-      setup do
+      def setup
         @env = { 'HOST' => 'example.net' }
-        @logger = stub(:info => "")
-        @client = stub(:logger => @logger)
+        @logger = stub(info: "", debug: "")
+        @client = stub(logger: @logger)
       end
 
-      context "for call with model creation" do
-        setup do
-          @app = lambda do |env|
-            Thread.current[:creations] = :creations
-            [200, env, ['hello']]
-          end
-          @middleware = CreationsMonitor.new(@app, @client)
+      def call_with_model_creation
+        @app = lambda do |env|
+          Thread.current[:creations] = :creations
+          [200, env, ['hello']]
         end
+        @middleware = CreationsMonitor.new(@app, @client)
+      end
 
-        def test_behaves_like_rack_middleware
-          @client.stubs(:enqueue)
-          response = @middleware.call(@env)
-          assert_equal [200, @env, ['hello']], response
-        end
+      def test_behaves_like_rack_middleware
+        call_with_model_creation
+        @client.stubs(:enqueue)
+        response = @middleware.call(@env)
+        assert_equal [200, @env, ['hello']], response
+      end
 
-        def test_clients_queue_receive_creations
-          @client.expects(:enqueue).with(:creations)
+      def test_clients_queue_receive_creations
+        call_with_model_creation
+        @client.expects(:enqueue).with(:creations)
 
-          @middleware.call(@env)
-        end
+        @middleware.call(@env)
       end
 
-      context "for call without model creation" do
-        setup do
-          @app = lambda do |env|
-            [200, env, ['hello']]
-          end
-          @middleware = CreationsMonitor.new(@app, @client)
+      def call_without_model_creation
+        @app = lambda do |env|
+          [200, env, ['hello']]
         end
+        @middleware = CreationsMonitor.new(@app, @client)
+      end
 
-        def test_behaves_like_rack_middleware
-          response = @middleware.call(@env)
+      def test_behaves_like_rack_middleware
+        call_without_model_creation
+        response = @middleware.call(@env)
 
-          assert_equal [200, @env, ['hello']], response
-        end
+        assert_equal [200, @env, ['hello']], response
       end
     end
   end

data/test/middleware/sidekiq_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+require 'sidekiq/testing'
+require 'chillout/middleware/sidekiq'
+
+module Chillout
+  module Middleware
+    class SidekiqTest < ChilloutTestCase
+
+      def setup
+        @client = mock("Client")
+        @integration = Integrations::Sidekiq.new
+        @integration.enable(@client, ::Sidekiq::Testing)
+      end
+
+      def teardown
+        @integration.disable
+      end
+
+      class FakeJob
+        MOCK_CREATIONS = Object.new.freeze
+        include Sidekiq::Worker
+        def perform
+          Chillout.creations = MOCK_CREATIONS
+        end
+      end
+
+      def test_enqueues_and_clears_creations
+        @client.expects(:enqueue).with(FakeJob::MOCK_CREATIONS)
+        Sidekiq::Testing.inline! { FakeJob.perform_async }
+        assert_nil Chillout.creations
+      end
+
+      class EmptyJob
+        include Sidekiq::Worker
+        def perform; end
+      end
+
+      def test_does_nothing_when_no_creations
+        Sidekiq::Testing.inline! { EmptyJob.perform_async }
+        assert_nil Chillout.creations
+      end
+
+    end
+  end
+end

data/test/plain_http_client_test.rb

@@ -32,5 +32,18 @@ module Chillout
         })
       end
     end
+
+    def test_customized_host_port_and_ssl
+      ENV['CHILLOUT_CLIENT_HOST'] = 'localhost'
+      ENV['CHILLOUT_CLIENT_PORT'] = '8080'
+      ENV['CHILLOUT_CLIENT_SSL'] = 'false'
+      client = PlainHttpClient.new
+      assert_equal 'localhost', client.host
+      assert_equal 8080, client.port
+      assert_equal false, client.ssl
+      ENV.delete('CHILLOUT_CLIENT_HOST')
+      ENV.delete('CHILLOUT_CLIENT_PORT')
+      ENV.delete('CHILLOUT_CLIENT_SSL')
+    end
   end
 end

data/test/support/rails_3_2_13/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.13'
+gem 'sqlite3'
+gem 'chillout', :path => '../../../'

data/test/support/rails_3_2_13/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails3213::Application.load_tasks

data/test/support/rails_3_2_13/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  # protect_from_forgery
+end

data/test/support/rails_3_2_13/app/controllers/entities_controller.rb

@@ -0,0 +1,70 @@
+class EntitiesController < ApplicationController
+  def index
+    @entities = Entity.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render :json => @entities }
+    end
+  end
+
+  def show
+    @entity = Entity.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render :json => @entity }
+    end
+  end
+
+  def new
+    @entity = Entity.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render :json => @entity }
+    end
+  end
+
+  def edit
+    @entity = Entity.find(params[:id])
+  end
+
+  def create
+    @entity = Entity.new(params[:entity])
+
+    respond_to do |format|
+      if @entity.save
+        format.html { redirect_to @entity, :notice => 'Entity was successfully created.' }
+        format.json { render :json => @entity, :status => :created, :location => @entity }
+      else
+        format.html { render :action => "new" }
+        format.json { render :json => @entity.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  def update
+    @entity = Entity.find(params[:id])
+
+    respond_to do |format|
+      if @entity.update_attributes(params[:entity])
+        format.html { redirect_to @entity, :notice => 'Entity was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render :action => "edit" }
+        format.json { render :json => @entity.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  def destroy
+    @entity = Entity.find(params[:id])
+    @entity.destroy
+
+    respond_to do |format|
+      format.html { redirect_to entities_url }
+      format.json { head :no_content }
+    end
+  end
+end

data/test/support/rails_3_2_13/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/support/rails_3_2_13/app/models/entity.rb

@@ -0,0 +1,3 @@
+class Entity < ActiveRecord::Base
+  attr_accessible :name
+end

data/test/support/rails_3_2_13/app/views/entities/_form.html.erb

@@ -0,0 +1,21 @@
+<%= form_for(@entity) do |f| %>
+  <% if @entity.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@entity.errors.count, "error") %> prohibited this entity from being saved:</h2>
+
+      <ul>
+      <% @entity.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/test/support/rails_3_2_13/app/views/entities/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing entity</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @entity %> |
+<%= link_to 'Back', entities_path %>

data/test/support/rails_3_2_13/app/views/entities/index.html.erb

@@ -0,0 +1,23 @@
+<h1>Listing entities</h1>
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @entities.each do |entity| %>
+  <tr>
+    <td><%= entity.name %></td>
+    <td><%= link_to 'Show', entity %></td>
+    <td><%= link_to 'Edit', edit_entity_path(entity) %></td>
+    <td><%= link_to 'Destroy', entity, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Entity', new_entity_path %>

data/test/support/rails_3_2_13/app/views/entities/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New entity</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', entities_path %>

data/test/support/rails_3_2_13/app/views/entities/show.html.erb

@@ -0,0 +1,10 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Name:</b>
+  <%= @entity.name %>
+</p>
+
+
+<%= link_to 'Edit', edit_entity_path(@entity) %> |
+<%= link_to 'Back', entities_path %>

data/test/support/rails_3_2_13/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>SampleRailsApp</title>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>