lookout-rack-utils 3.5.0.28 → 3.6.0.30

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODJiODZkOTMzNDk3NWM2N2FmM2M4MzAwOTA2NmY1YjVjYTVkMGZmMA==
+    NTZkYmI0YjdiZjQ0YjAyZDFmYzA1YTk3M2ZmZTEyMmMzYmEwODJiNg==
   data.tar.gz: !binary |-
-    OGI0MGUwODRmZDY3YmJkOTVlZGEzZGExZTE0ZGE2ZDE0MzRmYmU2NA==
+    MTljOWE4N2Q4ZjAwN2YzMTJiNjZhZDgyMjAzNjllOTBkY2YzZGIwYQ==
 SHA512:
   metadata.gz: !binary |-
-    OTE3MDBhZTIzYzcwMTRkMjA2YjQ4Yzg2YWRhMjNiMTFmYTRjNjMxMTdlZDI5
-    MTZiYTBhZDA1OGZjYTE5MWYyYjEzZDAwYzYxZjdlYTJiNDk2ZmQwMWZkMzY4
-    NDJkOGU4MzVlYWJlN2NiNzkzZTQ2NWI1N2M2OGExNGYxZTNiYTI=
+    OGRlOGUzZTU1NTA4ZTIxYzFiYWI4YzllMzY2OThlMjMxY2ZjODY1MTFjZmMx
+    NzQ5OTMzM2Q3MDc0ZGQ2MDg3NDI1Yjk3NTM5ODA1ZmVlM2UwNzI5ZjAxNzk5
+    NDlmODM4ZDA1YTE2ZDRmNjg0NDJlZDFmNGMwZWY3MTc4MzZkZWY=
   data.tar.gz: !binary |-
-    ODk0YjJkMjIyODVkY2VmNmQ4MDIxYzE3NjcxM2JlOWZiMGQ1NjFkNTRjYWMx
-    MmE2OGE4Y2E1NjJiYzk5M2JlMGNmNDgyYmFiMmY4NjAzOWU4YzAxMzRhN2Vi
-    YTI5M2E2NGFiZjg3OGQxOTczMzI4ZGVkMjFjNTQ4N2UzYWNkODU=
+    ZWZmODY1MDYzY2VkZWVjZDgwZWI1NmRmMDM3Y2JlYTM1M2FiY2I2NTJjMjQ2
+    MjFjNjNhNzU5NDIyYzIyNDY3ZTM2MTZmYzNlZTFkNDE0MGEyOTg5ODI4MjNk
+    OWMxOWY2YjgyNGUyMTQyZGViOGUyMmY5NWE3ZDY4NWUzNGI4MDE=

data/README.md

@@ -33,9 +33,15 @@ Or install it yourself as:
   end
   ```
 
-  You will also need to prime the instance before using it by calling
+You will also need to prime the instance before using it by calling
 `Lookout::Rack::Utils::Graphite.instance`.
 
+If you want to use a different Statsd implementation than
+lookout-statsd, you can. Call +Lookout::Statsd.set_instance+ BEFORE
+referencing the +Lookout::Rack::Utils::Graphite.instance+ in order to
+use a different Statsd implementation. You'll need to configure the
+Statsd object manually in that case.
+
 ### Lookout::Rack::Utils::I18n
   You'll need configatron set up:
 

data/lib/lookout/rack/utils/graphite.rb

@@ -1,12 +1,16 @@
 require 'singleton'
 require 'configatron'
-require 'statsd'
+require 'lookout/statsd'
 
 require 'lookout/rack/utils'
 
 module Lookout::Rack::Utils
   # Statsd proxy.  This class initializes the Statsd client and
-  # delegates all stats related calls to it.
+  # delegates all stats related calls to it. It uses Lookout's statsd
+  # (https://github.com/lookout/statsd) as a wrapper, which can be
+  # setup to use another implementation under the hood. Call
+  # +Lookout::Statsd.set_instance+ BEFORE referencing the +instance+
+  # here in order to use a different Statsd implementation.
   #
   # Use as:
   #   Lookout::Rack::Utils::Graphite.increment('device.associated')
@@ -16,25 +20,36 @@ module Lookout::Rack::Utils
   #   end
   #
   class Graphite
-    include Singleton
-
+    # Private Constructor -- treat this class like the Singleton it used to be
     def initialize
-      prefix = configatron.statsd.prefix
-      unless ENV['RACK_ENV'] == 'production'
-        prefix = "dev.#{ENV['USER']}.#{prefix}"
+      if !Lookout::Statsd.instance_set?
+        prefix = configatron.statsd.prefix
+        unless ENV['RACK_ENV'] == 'production'
+          prefix = "dev.#{ENV['USER']}.#{prefix}"
+        end
+
+        Lookout::Statsd.create_instance(:host => configatron.statsd.host,
+                                        :port => configatron.statsd.port,
+                                        :prefix => prefix)
       end
+    end
+
+    # Provide same interface as old Singleton, but in test-friendly manner
+    def self.instance
+      @instance ||= new
+    end
 
-      ::Statsd.create_instance(:host => configatron.statsd.host,
-                               :port => configatron.statsd.port,
-                               :prefix => prefix)
+    # Clear instance, for use in testing only
+    def self.clear_instance
+      @instance = nil
     end
 
     def self.method_missing(meth, *args, &block)
-      self.instance && ::Statsd.instance.send(meth, *args, &block)
+      self.instance && Lookout::Statsd.instance.send(meth, *args, &block)
     end
 
     def self.respond_to?(method, include_private = false)
-      super || (self.instance && ::Statsd.instance.respond_to?(method, include_private))
+      super || (self.instance && Lookout::Statsd.instance.respond_to?(method, include_private))
     end
   end
 end

data/lib/lookout/rack/utils/version.rb

@@ -1,7 +1,7 @@
 module Lookout
   module Rack
     module Utils
-      VERSION = "3.5.0"
+      VERSION = "3.6.0"
     end
   end
 end

data/lookout-rack-utils.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rack-graphite", '~> 1.1'
   spec.add_dependency "configatron", '~> 2.13'
   spec.add_dependency "log4r"
-  spec.add_dependency "lookout-statsd", '~> 2.0.0'
+  spec.add_dependency "lookout-statsd", '~> 3.0'
 end

data/spec/graphite_spec.rb

@@ -2,38 +2,85 @@ require 'spec_helper'
 require 'lookout/rack/utils/graphite'
 
 describe Lookout::Rack::Utils::Graphite do
+  let(:statsd_instance) { nil }
   subject(:graphite) { described_class }
 
   before :each do
-    graphite.instance # Initialize statsd singleton
     configatron.statsd.stub(:prefix).and_return('test')
+    Lookout::Statsd.clear_instance
+    described_class.clear_instance
+    Lookout::Statsd.set_instance(statsd_instance)
+    graphite.instance # Initialize statsd singleton
   end
 
-  context 'offers statsd methods' do
-    it { should respond_to :increment }
-    it { should respond_to :decrement }
-    it { should respond_to :timing }
-    it { should respond_to :update_counter }
+  after :each do
+    Lookout::Statsd.clear_instance
+    described_class.clear_instance
   end
 
-  it 'should delegate to statsd' do
-    Statsd.instance.should_receive(:increment).once.with('device.associated')
-    Lookout::Rack::Utils::Graphite.increment('device.associated')
+  context "without configuring statsd_instance" do
+    context 'offers statsd methods' do
+      it { should respond_to :increment }
+      it { should respond_to :decrement }
+      it { should respond_to :timing }
+      it { should respond_to :update_counter }
+    end
+
+    it 'should delegate to statsd' do
+      Lookout::Statsd.instance.should_receive(:increment).once.with('device.associated')
+      Lookout::Rack::Utils::Graphite.increment('device.associated')
+    end
+
+    describe '#timing' do
+      it 'should delegate the block to statsd' do
+        expect { |block|
+          Lookout::Statsd.instance.should_receive(:timing).once.with('device.became_aware', &block)
+          Lookout::Rack::Utils::Graphite.timing('device.became_aware', &block)
+        }.to yield_control
+      end
+
+      it 'should delegate the sample rate and block to statsd' do
+        expect { |block|
+          Lookout::Statsd.instance.should_receive(:timing).once.with('device.became_aware', 0.05, &block)
+          Lookout::Rack::Utils::Graphite.timing('device.became_aware', 0.05, &block)
+        }.to yield_control
+      end
+    end
   end
 
-  describe '#timing' do
-    it 'should delegate the block to statsd' do
-      expect { |block|
-        Statsd.instance.should_receive(:timing).once.with('device.became_aware', &block)
-        Lookout::Rack::Utils::Graphite.timing('device.became_aware', &block)
-      }.to yield_control
+  context "setting statsd_instance" do
+    let(:statsd_instance) { double('Statsd',
+                                   :increment => true,
+                                   :decrement => true,
+                                   :timing => true,
+                                   :update_counter => true) }
+
+    context 'offers statsd methods' do
+      it { should respond_to :increment }
+      it { should respond_to :decrement }
+      it { should respond_to :timing }
+      it { should respond_to :update_counter }
     end
 
-    it 'should delegate the sample rate and block to statsd' do
-      expect { |block|
-        Statsd.instance.should_receive(:timing).once.with('device.became_aware', 0.05, &block)
-        Lookout::Rack::Utils::Graphite.timing('device.became_aware', 0.05, &block)
-      }.to yield_control
+    it 'should delegate to statsd' do
+      expect(statsd_instance).to receive(:increment).once.with('device.associated')
+      Lookout::Rack::Utils::Graphite.increment('device.associated')
+    end
+
+    describe '#timing' do
+      it 'should delegate the block to statsd' do
+        expect { |block|
+          expect(statsd_instance).to receive(:timing).once.with('device.became_aware', &block)
+          Lookout::Rack::Utils::Graphite.timing('device.became_aware', &block)
+        }.to yield_control
+      end
+
+      it 'should delegate the sample rate and block to statsd' do
+        expect { |block|
+          expect(statsd_instance).to receive(:timing).once.with('device.became_aware', 0.05, &block)
+          Lookout::Rack::Utils::Graphite.timing('device.became_aware', 0.05, &block)
+        }.to yield_control
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookout-rack-utils
 version: !ruby/object:Gem::Version
-  version: 3.5.0.28
+  version: 3.6.0.30
 platform: ruby
 authors:
 - Ian Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.0'
 description: A collection of rack utils.
 email:
 - ian.smith@lookout.com