lookout-rack-utils 3.8.0.39 → 4.0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 985e7bc06948f57cde0f79fe0f3bdeed9793efe5
-  data.tar.gz: ce78eb4d5170f7a919d841b04e5cfbca805b1751
+  metadata.gz: c8d885772670c69b20f26cad8eafdf9a09414556
+  data.tar.gz: 5dff0ce7ee50afd78f03766167f6983cb26984d7
 SHA512:
-  metadata.gz: fb0d246c500b6834c3520a1e8c701a257e00dfe57517825c5c64b65bcf13018db531db13ca2d64d1da27f489c6632daac1d3a1b596eda2724beb942f20df2ca6
-  data.tar.gz: 443aa8ec730c3404858e8ade9abcec2542088ff61a5e4948f6e18d6f48359c2571203da68986abef093ade19f0a5613e21692d0ecf7d722dc55c3c1d550aa565
+  metadata.gz: e8ace2cb4663df9464a78ad5d34611f1c64ac2d26dfc162ebf5e0aa88a876d6bc914aac86dcb5cf1d7c3ceecb80fea6166078e8ce15c4d004305e7f454bc9c9f
+  data.tar.gz: 5ed83519a13bd1f937c0a46f7d5a470feeea95c4b120a825af32f1c17683df18841f3b1e9a76c26921b2abfc3dd07b79df89bf17128aa51accb8dfc3a6b50299

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
 - jruby
-- 2.1
+- 2.3
 - 1.9.3
 deploy:
   provider: rubygems

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

@@ -1,7 +1,7 @@
 module Lookout
   module Rack
     module Utils
-      VERSION = "3.8.0"
+      VERSION = "4.0.0"
     end
   end
 end

data/lookout-rack-utils.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "sinatra"
@@ -28,9 +28,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "i18n"
 
-  spec.add_dependency "rack", '~> 1.5'
+  spec.add_dependency "rack"
   spec.add_dependency "rack-graphite", '~> 1.3'
-  spec.add_dependency "configatron", '~> 2.13'
+  spec.add_dependency "configatron"
   spec.add_dependency "log4r"
   spec.add_dependency "lookout-statsd", '~> 3.1'
 end

data/spec/graphite_spec.rb

@@ -5,8 +5,14 @@ describe Lookout::Rack::Utils::Graphite do
   let(:statsd_instance) { nil }
   subject(:graphite) { described_class }
 
+  around :each do |example|
+    configatron.temp do
+      configatron.statsd.prefix = 'test'
+      example.run
+    end
+  end
+
   before :each do
-    configatron.statsd.stub(:prefix).and_return('test')
     Lookout::Statsd.clear_instance
     described_class.clear_instance
     Lookout::Statsd.set_instance(statsd_instance)
@@ -28,21 +34,21 @@ describe Lookout::Rack::Utils::Graphite do
     end
 
     it 'should delegate to statsd' do
-      Lookout::Statsd.instance.should_receive(:increment).once.with('device.associated')
+      expect_any_instance_of(Lookout::StatsdClient).to receive(:increment).once.with('device.associated')
       Lookout::Rack::Utils::Graphite.increment('device.associated')
     end
 
     describe '#time' do
       it 'should delegate the block to statsd' do
         expect { |block|
-          Lookout::Statsd.instance.should_receive(:time).once.with('device.became_aware', &block)
+          expect_any_instance_of(Lookout::StatsdClient).to receive(:time).once.with('device.became_aware', &block)
           Lookout::Rack::Utils::Graphite.time('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(:time).once.with('device.became_aware', 0.05, &block)
+          expect_any_instance_of(Lookout::StatsdClient).to receive(:time).once.with('device.became_aware', 0.05, &block)
           Lookout::Rack::Utils::Graphite.time('device.became_aware', 0.05, &block)
         }.to yield_control
       end

data/spec/i18n_spec.rb

@@ -19,7 +19,7 @@ describe Lookout::Rack::Utils::I18n do
     let(:args) { double('mock arguments') }
 
     before :each do
-      ::I18n.should_receive(:t).with(args)
+      expect(::I18n).to receive(:t).with(args)
     end
 
     it 'should call out to ::I18n.t' do
@@ -32,40 +32,30 @@ describe Lookout::Rack::Utils::I18n do
 
     before :each do
       helper.request = Object.new
-      helper.request.stub(:env).and_return({'HTTP_ACCEPT_LANGUAGE' => accepted_langs})
+      expect(helper.request).to receive(:env).and_return({'HTTP_ACCEPT_LANGUAGE' => accepted_langs})
     end    
 
     context 'if HTTP_ACCEPT_LANGUAGE is not set' do
       let(:accepted_langs) { nil }
 
-      before :each do
-        helper.configatron = Object.new
-        helper.configatron.stub(:locales).and_return([])
-      end
-
       it { should be_empty }
     end
 
     context 'if HTTP_ACCEPT_LANGUAGE is set' do
       # Example borrowed from http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
       let(:accepted_langs) { 'da, en-gb;q=0.8, en;q=0.7' }
-      before :each do
-        helper.configatron = Object.new
-        helper.configatron.stub(:locales).and_return(['en'])
-      end
 
       it { should_not be_empty }
     end
   end
 
   describe '.current_locale' do
-
     let(:target_locale) { 'target locale' }
     let(:default_locale) { 'default locale' }
     let(:accepted_langs) { [target_locale] }
 
     before :each do
-      helper.stub(:accepted_languages).and_return(accepted_langs)
+      allow(helper).to receive(:accepted_languages).and_return(accepted_langs)
     end
 
     subject (:current_locale) { helper.current_locale }
@@ -82,8 +72,8 @@ describe Lookout::Rack::Utils::I18n do
       context 'if configatron does not contain any of the accepted langs' do
         before :each do
           helper.configatron = Object.new
-          helper.configatron.stub(:locales).and_return([])
-          helper.configatron.stub(:default_locale).and_return(default_locale)
+          expect(helper.configatron).to receive(:locales).and_return([])
+          expect(helper.configatron).to receive(:default_locale).and_return(default_locale)
         end
 
         it { should eql default_locale }
@@ -92,7 +82,7 @@ describe Lookout::Rack::Utils::I18n do
       context 'if configatron.locales contains one of the accepted languages' do
         before :each do
           helper.configatron = Object.new
-          helper.configatron.stub(:locales).and_return([target_locale])
+          expect(helper.configatron).to receive(:locales).and_return([target_locale])
         end
 
         it { should eql target_locale }

data/spec/log_spec.rb

@@ -5,37 +5,41 @@ require 'configatron'
 
 describe Lookout::Rack::Utils::Log do
   subject(:log) { described_class.instance }
-  subject(:log_message) { 'foo' }
+  let(:log_message) { 'foo' }
   let(:filename) { "log" }
-
-  before :each do
-    configatron.logging.enabled = true
-    allow(configatron.logging).to receive(:file).and_return(filename)
+  let(:exclude_levels) { [] }
+
+  around :each do |example|
+    configatron.temp do
+      configatron.logging.enabled = true
+      configatron.logging.file = filename
+      configatron.statsd.exclude_levels = exclude_levels
+      example.run
+    end
   end
 
   describe '.debug' do
     context 'if debug is in configatron.statsd.exclude_levels' do
-      before { configatron.statsd.exclude_levels = [:debug] }
-      after { configatron.statsd.exclude_levels = [] }
+      let(:exclude_levels) { [:debug] }
 
       it 'should not log a graphite stat' do
-        Lookout::Rack::Utils::Graphite.should_not_receive(:increment).with('log.debug')
+        expect(Lookout::Rack::Utils::Graphite).not_to receive(:increment).with('log.debug')
         log.debug log_message
       end
     end
 
     it 'should log a graphite stat' do
-      Lookout::Rack::Utils::Graphite.should_receive(:increment).with('log.debug')
+      expect(Lookout::Rack::Utils::Graphite).to receive(:increment).with('log.debug')
       log.debug log_message
     end
   end
 
   [:debug, :info, :warn, :error, :fatal].each do |method|
     describe ".#{method}" do
-      it 'should log a graphite stat' do
-        Lookout::Rack::Utils::Graphite.should_receive(:increment).with("log.#{method}")
+      before { expect(log.instance_variable_get(:@logger)).to receive(method).with(log_message).and_call_original }
 
-        log.instance_variable_get(:@logger).should_receive(method).with(log_message).and_call_original
+      it 'should log a graphite stat' do
+        expect(Lookout::Rack::Utils::Graphite).to receive(:increment).with("log.#{method}")
 
         processed = false
         b = Proc.new { processed = true }
@@ -45,7 +49,6 @@ describe Lookout::Rack::Utils::Log do
       end
 
       it 'should invoke the internal logger object with a given block' do
-        log.instance_variable_get(:@logger).should_receive(method).with(log_message).and_call_original
         processed = false
         b = Proc.new { processed = true }
         log.send(method, log_message, &b)
@@ -53,7 +56,6 @@ describe Lookout::Rack::Utils::Log do
       end
 
       it 'should invoke the internal logger object w/o a given block' do
-        log.instance_variable_get(:@logger).should_receive(method).with(log_message).and_call_original
         log.send(method, log_message)
       end
     end
@@ -92,8 +94,8 @@ describe Lookout::Rack::Utils::Log::LookoutFormatter do
   subject(:formatter) { described_class.new }
   let(:logger) do
     logger = double('Mock Logger')
-    logger.stub(:name).and_return('RSpec Logger')
-    logger.stub(:fullname).and_return('RSpec Logger')
+    expect(logger).to receive(:name).and_return('RSpec Logger')
+    expect(logger).to receive(:fullname).and_return('RSpec Logger')
     logger
   end
   let(:project_name) { 'some_project' }
@@ -113,7 +115,7 @@ describe Lookout::Rack::Utils::Log::LookoutFormatter do
 
 
   before :each do
-    formatter.stub(:basedir).and_return(basedir)
+    allow(formatter).to receive(:basedir).and_return(basedir)
   end
 
 
@@ -121,7 +123,7 @@ describe Lookout::Rack::Utils::Log::LookoutFormatter do
     subject(:filename) { formatter.event_filename(tracer[1]) }
 
     context 'with a normal MRI LogEvent' do
-      it { should eql('spec/log_spec.rb:9') }
+      it { is_expected.to eql('spec/log_spec.rb:9') }
     end
 
     # We have slightly different log formats under packaged .jar files
@@ -129,7 +131,7 @@ describe Lookout::Rack::Utils::Log::LookoutFormatter do
       let(:tracer) { [nil, "backend/metrics.rb:52:in `runloop'"] }
       let(:basedir) { 'file:/home/user/source/projects/stuff.jar!/project' }
 
-      it { should eql('backend/metrics.rb:52') }
+      it { is_expected.to eql('backend/metrics.rb:52') }
     end
   end
 

data/spec/request_spec.rb

@@ -22,26 +22,26 @@ describe Lookout::Rack::Utils::Request do
 
     before :each do
       helper.request = Object.new
-      helper.request.stub(:env).and_return({'HTTP_CONTENT_ENCODING' => 'gzip'})
-      helper.request.stub(:body).and_return(double)
-      helper.request.body.stub(:rewind).and_return(double)
+      allow(helper.request).to receive(:env).and_return({'HTTP_CONTENT_ENCODING' => 'gzip'})
+      allow(helper.request).to receive(:body).and_return(double)
+      allow(helper.request.body).to receive(:rewind).and_return(double)
     end
 
     it 'should unzip data zipped data properly' do
-      helper.request.body.stub(:read).and_return(zipped_sample_data)
+      expect(helper.request.body).to receive(:read).and_return(zipped_sample_data)
       expect(helper.gunzipped_body).to eq(sample_data)
     end
 
     it 'should do nothing if encoding is not set' do
-      helper.request.stub(:env).and_return({})
-      helper.request.body.stub(:read).and_return(zipped_sample_data)
+      expect(helper.request).to receive(:env).and_return({})
+      expect(helper.request.body).to receive(:read).and_return(zipped_sample_data)
       expect(helper.gunzipped_body).to eq(zipped_sample_data)
     end
 
     it 'should halt and throw and 400 when we have badly encoded data' do
       allow(Lookout::Rack::Utils::Log).to receive(:instance).and_return(log_instance)
       expect(log_instance).to receive(:warn)
-      helper.request.body.stub(:read).and_return(sample_data)
+      expect(helper.request.body).to receive(:read).and_return(sample_data)
       expect(helper).to receive(:halt).with(400, "{}")
       helper.gunzipped_body
     end

data/spec/subroute_spec.rb

@@ -93,7 +93,7 @@ describe Lookout::Rack::Utils::Subroute, :type => :route do
         subject(:subrouted) { subroute!('/test_delete_invalid', :request_path => 'DELATE') }
 
         it 'should throw an error' do
-          expect { subrouted }.to raise_error
+          expect { subrouted }.to raise_error NoMethodError
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookout-rack-utils
 version: !ruby/object:Gem::Version
-  version: 3.8.0.39
+  version: 4.0.0.44
 platform: ruby
 authors:
 - Ian Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-graphite
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +154,16 @@ dependencies:
   name: configatron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: ''