puffing-billy 0.4.1 → 0.5.0

data/spec/lib/billy/resource_utils_spec.rb

@@ -4,31 +4,31 @@ describe Billy::JSONUtils do
   describe 'sorting' do
     describe '#sort_hash_keys' do
       it 'sorts simple Hashes' do
-        data     = {c: 'three',a: 'one',b: 'two'}
-        expected = {a: 'one',b: 'two',c: 'three'}
-        expect(Billy::JSONUtils::sort_hash_keys(data)).to eq expected
+        data     = { c: 'three', a: 'one', b: 'two' }
+        expected = { a: 'one', b: 'two', c: 'three' }
+        expect(Billy::JSONUtils.sort_hash_keys(data)).to eq expected
       end
 
       it 'does not sort simple Arrays' do
-        data     = [3,1,2,'two','three','one']
-        expect(Billy::JSONUtils::sort_hash_keys(data)).to eq data
+        data     = [3, 1, 2, 'two', 'three', 'one']
+        expect(Billy::JSONUtils.sort_hash_keys(data)).to eq data
       end
 
       it 'does not sort multi-dimensional Arrays' do
-        data     = [[3,2,1],[5,4,6],['b','c','a']]
-        expect(Billy::JSONUtils::sort_hash_keys(data)).to eq data
+        data     = [[3, 2, 1], [5, 4, 6], %w(b c a)]
+        expect(Billy::JSONUtils.sort_hash_keys(data)).to eq data
       end
 
       it 'sorts multi-dimensional Hashes' do
-        data     = {c: {l: 2,m: 3,k: 1},a: {f: 3,e: 2,d: 1},b: {i: 2,h: 1,j: 3}}
-        expected = {a: {d: 1,e: 2,f: 3},b: {h: 1,i: 2,j: 3},c: {k: 1,l: 2,m: 3}}
-        expect(Billy::JSONUtils::sort_hash_keys(data)).to eq expected
+        data     = { c: { l: 2, m: 3, k: 1 }, a: { f: 3, e: 2, d: 1 }, b: { i: 2, h: 1, j: 3 } }
+        expected = { a: { d: 1, e: 2, f: 3 }, b: { h: 1, i: 2, j: 3 }, c: { k: 1, l: 2, m: 3 } }
+        expect(Billy::JSONUtils.sort_hash_keys(data)).to eq expected
       end
 
       it 'sorts abnormal data structures' do
-        data     = {b: [['b','c','a'],{ab: 5,aa: 4, ac: 6},[3,2,1],{ba: true,bc: false, bb: nil}],a: {f: 3,e: 2,d: 1}}
-        expected = {a: {d: 1,e: 2,f: 3},b: [['b','c','a'],{aa: 4,ab: 5,ac: 6},[3,2,1],{ba: true, bb: nil,bc: false}]}
-        expect(Billy::JSONUtils::sort_hash_keys(data)).to eq expected
+        data     = { b: [%w(b c a), { ab: 5, aa: 4, ac: 6 }, [3, 2, 1], { ba: true, bc: false, bb: nil }], a: { f: 3, e: 2, d: 1 } }
+        expected = { a: { d: 1, e: 2, f: 3 }, b: [%w(b c a), { aa: 4, ab: 5, ac: 6 }, [3, 2, 1], { ba: true, bb: nil, bc: false }] }
+        expect(Billy::JSONUtils.sort_hash_keys(data)).to eq expected
       end
     end
 
@@ -36,20 +36,20 @@ describe Billy::JSONUtils do
       it 'sorts JSON' do
         data     = '{"c":"three","a":"one","b":"two"}'
         expected = '{"a":"one","b":"two","c":"three"}'
-        expect(Billy::JSONUtils::sort_json(data)).to eq expected
+        expect(Billy::JSONUtils.sort_json(data)).to eq expected
       end
     end
   end
 
   describe 'json?' do
-    let(:json) { {a: '1'}.to_json }
+    let(:json) { { a: '1' }.to_json }
     let(:non_json) { 'Not JSON.' }
 
     it 'identifies JSON' do
-      expect(Billy::JSONUtils::json?(json)).to be true
+      expect(Billy::JSONUtils.json?(json)).to be true
     end
     it 'identifies non-JSON' do
-      expect(Billy::JSONUtils::json?(non_json)).to be false
+      expect(Billy::JSONUtils.json?(non_json)).to be false
     end
   end
 end

data/spec/lib/proxy_spec.rb

@@ -8,11 +8,11 @@ shared_examples_for 'a proxy server' do
   end
 
   it 'should proxy POST requests' do
-    expect(http.post('/echo', :foo => 'bar').body).to eql "POST /echo\nfoo=bar"
+    expect(http.post('/echo', foo: 'bar').body).to eql "POST /echo\nfoo=bar"
   end
 
   it 'should proxy PUT requests' do
-    expect(http.post('/echo', :foo => 'bar').body).to eql "POST /echo\nfoo=bar"
+    expect(http.post('/echo', foo: 'bar').body).to eql "POST /echo\nfoo=bar"
   end
 
   it 'should proxy HEAD requests' do
@@ -26,44 +26,43 @@ end
 
 shared_examples_for 'a request stub' do
   it 'should stub GET requests' do
-    proxy.stub("#{url}/foo").
-      and_return(:text => 'hello, GET!')
+    proxy.stub("#{url}/foo")
+      .and_return(text: 'hello, GET!')
     expect(http.get('/foo').body).to eql 'hello, GET!'
   end
 
   it 'should stub GET response statuses' do
-    proxy.stub("#{url}/foo").
-      and_return(:code => 200)
+    proxy.stub("#{url}/foo")
+      .and_return(code: 200)
     expect(http.get('/foo').status).to eql 200
   end
 
   it 'should stub POST requests' do
-    proxy.stub("#{url}/bar", :method => :post).
-      and_return(:text => 'hello, POST!')
-    expect(http.post('/bar', :foo => :bar).body).to eql 'hello, POST!'
+    proxy.stub("#{url}/bar", method: :post)
+      .and_return(text: 'hello, POST!')
+    expect(http.post('/bar', foo: :bar).body).to eql 'hello, POST!'
   end
 
   it 'should stub PUT requests' do
-    proxy.stub("#{url}/baz", :method => :put).
-      and_return(:text => 'hello, PUT!')
-    expect(http.put('/baz', :foo => :bar).body).to eql 'hello, PUT!'
+    proxy.stub("#{url}/baz", method: :put)
+      .and_return(text: 'hello, PUT!')
+    expect(http.put('/baz', foo: :bar).body).to eql 'hello, PUT!'
   end
 
   it 'should stub HEAD requests' do
-    proxy.stub("#{url}/bap", :method => :head).
-      and_return(:headers => {'HTTP-X-Hello' => 'hello, HEAD!'})
+    proxy.stub("#{url}/bap", method: :head)
+      .and_return(headers: { 'HTTP-X-Hello' => 'hello, HEAD!' })
     expect(http.head('/bap').headers['http-x-hello']).to eql 'hello, HEAD!'
   end
 
   it 'should stub DELETE requests' do
-    proxy.stub("#{url}/bam", :method => :delete).
-      and_return(:text => 'hello, DELETE!')
+    proxy.stub("#{url}/bam", method: :delete)
+      .and_return(text: 'hello, DELETE!')
     expect(http.delete('/bam').body).to eql 'hello, DELETE!'
   end
 end
 
 shared_examples_for 'a cache' do
-
   context 'whitelisted GET requests' do
     it 'should not be cached' do
       assert_noncached_url
@@ -93,7 +92,7 @@ shared_examples_for 'a cache' do
     context 'with ports' do
       before do
         rack_app_url = URI(http.url_prefix)
-        Billy.config.whitelist = ["#{rack_app_url.host}:#{rack_app_url.port+1}"]
+        Billy.config.whitelist = ["#{rack_app_url.host}:#{rack_app_url.port + 1}"]
       end
 
       it 'should be cached' do
@@ -110,11 +109,11 @@ shared_examples_for 'a cache' do
     it 'should be cached' do
       r = http.get('/analytics?some_param=5')
       expect(r.body).to eql 'GET /analytics'
-      expect {
-        expect {
+      expect do
+        expect do
           r = http.get('/analytics?some_param=20')
-        }.to change { r.headers['HTTP-X-EchoCount'].to_i }.by(1)
-      }.to_not change { r.body }
+        end.to change { r.headers['HTTP-X-EchoCount'].to_i }.by(1)
+      end.to_not change { r.body }
     end
   end
 
@@ -128,11 +127,11 @@ shared_examples_for 'a cache' do
     end
   end
 
-  context "cache persistence" do
+  context 'cache persistence' do
     let(:cache_path) { Billy.config.cache_path }
-    let(:cached_key) { proxy.cache.key('get',"#{url}/foo","") }
+    let(:cached_key) { proxy.cache.key('get', "#{url}/foo", '') }
     let(:cached_file) do
-      f = cached_key + ".yml"
+      f = cached_key + '.yml'
       File.join(cache_path, f)
     end
 
@@ -142,24 +141,24 @@ shared_examples_for 'a cache' do
     end
 
     after do
-      File.delete(cached_file) if File.exists?(cached_file)
+      File.delete(cached_file) if File.exist?(cached_file)
     end
 
-    context "enabled" do
+    context 'enabled' do
       before { Billy.config.persist_cache = true }
 
       it 'should persist' do
-        r = http.get('/foo')
-        expect(File.exists?(cached_file)).to be true
+        http.get('/foo')
+        expect(File.exist?(cached_file)).to be true
       end
 
       it 'should be read initially from persistent cache' do
         File.open(cached_file, 'w') do |f|
           cached = {
-            :headers => {},
-            :content => "GET /foo cached"
+            headers: {},
+            content: 'GET /foo cached'
           }
-          f.write(cached.to_yaml(:Encoding => :Utf8))
+          f.write(cached.to_yaml(Encoding: :Utf8))
         end
 
         r = http.get('/foo')
@@ -168,7 +167,7 @@ shared_examples_for 'a cache' do
 
       context 'cache_request_headers requests' do
         it 'should not be cached by default' do
-          r = http.get('/foo')
+          http.get('/foo')
           saved_cache = Billy.proxy.cache.fetch_from_persistence(cached_key)
           expect(saved_cache.keys).not_to include :request_headers
         end
@@ -179,7 +178,7 @@ shared_examples_for 'a cache' do
           end
 
           it 'should be cached' do
-            r = http.get('/foo')
+            http.get('/foo')
             saved_cache = Billy.proxy.cache.fetch_from_persistence(cached_key)
             expect(saved_cache.keys).to include :request_headers
           end
@@ -201,8 +200,8 @@ shared_examples_for 'a cache' do
         before { Billy.config.non_whitelisted_requests_disabled = true }
 
         it 'should raise error when disabled' do
-          #TODO: Suppress stderr output: https://gist.github.com/adamstegman/926858
-          expect{http.get('/foo')}.to raise_error(Faraday::Error::ConnectionFailed, "end of file reached")
+          # TODO: Suppress stderr output: https://gist.github.com/adamstegman/926858
+          expect { http.get('/foo') }.to raise_error(Faraday::Error::ConnectionFailed, 'end of file reached')
         end
       end
 
@@ -215,7 +214,7 @@ shared_examples_for 'a cache' do
 
         it 'should not cache non-successful response when enabled' do
           http_error.get('/foo')
-          expect(File.exists?(cached_file)).to be false
+          expect(File.exist?(cached_file)).to be false
         end
 
         it 'should cache successful response when enabled' do
@@ -238,22 +237,21 @@ shared_examples_for 'a cache' do
           # 2) Restart the test servers if they aren't running
           # 3) Change the test servers to start/stop for each test instead of before all
           # 4) Remove the test server completely and rely on the server instantiated by the app
-          pending "Unable to test this without affecting the running test servers"
+          pending 'Unable to test this without affecting the running test servers'
           # If the 'pending' continues to execute the spec, 'skip' it to avoid EM errors.
           # If 'pending' stops the test, 'skip' isn't defined but it won't hit this line.
-          skip "Unable to test this without affecting the running test servers"
-          expect{http_error.get('/foo')}.to raise_error(Faraday::Error::ConnectionFailed)
+          skip 'Unable to test this without affecting the running test servers'
+          expect { http_error.get('/foo') }.to raise_error(Faraday::Error::ConnectionFailed)
         end
       end
-
     end
 
-    context "disabled" do
+    context 'disabled' do
       before { Billy.config.persist_cache = false }
 
       it 'shouldnt persist' do
-        r = http.get('/foo')
-        expect(File.exists?(cached_file)).to be false
+        http.get('/foo')
+        expect(File.exist?(cached_file)).to be false
       end
     end
   end
@@ -261,41 +259,39 @@ shared_examples_for 'a cache' do
   def assert_noncached_url(url = '/foo')
     r = http.get(url)
     expect(r.body).to eql "GET #{url}"
-    expect {
-      expect {
+    expect do
+      expect do
         r = http.get(url)
-      }.to change { r.headers['HTTP-X-EchoCount'].to_i }.by(1)
-    }.to_not change { r.body }
+      end.to change { r.headers['HTTP-X-EchoCount'].to_i }.by(1)
+    end.to_not change { r.body }
   end
 
   def assert_cached_url(url = '/foo')
     r = http.get(url)
     expect(r.body).to eql "GET #{url}"
-    expect {
-      expect {
+    expect do
+      expect do
         r = http.get(url)
-      }.to_not change { r.headers['HTTP-X-EchoCount'] }
-    }.to_not change { r.body }
+      end.to_not change { r.headers['HTTP-X-EchoCount'] }
+    end.to_not change { r.body }
   end
 end
 
 describe Billy::Proxy do
-
   before do
     # Adding non-valid Faraday options throw an error: https://github.com/arsduo/koala/pull/311
     # Valid options: :request, :proxy, :ssl, :builder, :url, :parallel_manager, :params, :headers, :builder_class
     faraday_options = {
-      :proxy   => { :uri => proxy.url },
-      :request => { :timeout => 1.0 }
+      proxy: { uri: proxy.url },
+      request: { timeout: 1.0 }
     }
 
     @http       = Faraday.new @http_url,  faraday_options
-    @https      = Faraday.new @https_url, faraday_options.merge(:ssl => { :verify => false })
+    @https      = Faraday.new @https_url, faraday_options.merge(ssl: { verify: false })
     @http_error = Faraday.new @error_url, faraday_options
   end
 
   context 'proxying' do
-
     context 'HTTP' do
       let!(:http) { @http }
       it_should_behave_like 'a proxy server'
@@ -305,11 +301,9 @@ describe Billy::Proxy do
       let!(:http) { @https }
       it_should_behave_like 'a proxy server'
     end
-
   end
 
   context 'stubbing' do
-
     context 'HTTP' do
       let!(:url)  { @http_url }
       let!(:http) { @http }
@@ -321,11 +315,9 @@ describe Billy::Proxy do
       let!(:http) { @https }
       it_should_behave_like 'a request stub'
     end
-
   end
 
   context 'caching' do
-
     it 'defaults to nil scope' do
       expect(proxy.cache.scope).to be nil
     end
@@ -350,7 +342,7 @@ describe Billy::Proxy do
       let!(:http_error) { @http_error }
 
       before do
-        proxy.cache.scope_to "my_cache"
+        proxy.cache.scope_to 'my_cache'
       end
 
       after do
@@ -360,7 +352,7 @@ describe Billy::Proxy do
       it_should_behave_like 'a cache'
 
       it 'uses the cache scope' do
-        expect(proxy.cache.scope).to eq("my_cache")
+        expect(proxy.cache.scope).to eq('my_cache')
       end
 
       it 'can be reset to the default scope' do
@@ -369,21 +361,21 @@ describe Billy::Proxy do
       end
 
       it 'can execute a block against a cache scope' do
-        expect(proxy.cache.scope).to eq "my_cache"
-        proxy.cache.with_scope "another_cache" do
-          expect(proxy.cache.scope).to eq "another_cache"
+        expect(proxy.cache.scope).to eq 'my_cache'
+        proxy.cache.with_scope 'another_cache' do
+          expect(proxy.cache.scope).to eq 'another_cache'
         end
-        expect(proxy.cache.scope).to eq "my_cache"
+        expect(proxy.cache.scope).to eq 'my_cache'
       end
 
       it 'requires a block to be passed to with_scope' do
-        expect {proxy.cache.with_scope "some_scope"}.to raise_error ArgumentError
+        expect { proxy.cache.with_scope 'some_scope' }.to raise_error ArgumentError
       end
 
       it 'should have different keys for the same request under a different scope' do
-        args = ['get',"#{url}/foo",""]
+        args = ['get', "#{url}/foo", '']
         key = proxy.cache.key(*args)
-        proxy.cache.with_scope "another_cache" do
+        proxy.cache.with_scope 'another_cache' do
           expect(proxy.cache.key(*args)).to_not eq key
         end
       end

data/spec/spec_helper.rb

@@ -1,15 +1,15 @@
-Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f}
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
 
 require 'pry'
 require 'billy/rspec'
 require 'rack'
 require 'logger'
 
-Capybara.app = Rack::Directory.new(File.expand_path("../../examples", __FILE__))
+Capybara.app = Rack::Directory.new(File.expand_path('../../examples', __FILE__))
 Capybara.javascript_driver = :poltergeist_billy
 
 Billy.configure do |config|
-  config.logger = Logger.new(File.expand_path("../../log/test.log", __FILE__))
+  config.logger = Logger.new(File.expand_path('../../log/test.log', __FILE__))
 end
 
 RSpec.configure do |config|

data/spec/support/test_server.rb

@@ -62,8 +62,8 @@ module Billy
       if ssl
         http_server.ssl = true
         http_server.ssl_options = {
-          :private_key_file => File.expand_path('../../fixtures/test-server.key', __FILE__),
-          :cert_chain_file => File.expand_path('../../fixtures/test-server.crt', __FILE__)
+          private_key_file: File.expand_path('../../fixtures/test-server.key', __FILE__),
+          cert_chain_file: File.expand_path('../../fixtures/test-server.crt', __FILE__)
         }
       end
       http_server.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puffing-billy
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Olly Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -224,16 +224,16 @@ dependencies:
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
   requirement: !ruby/object:Gem::Requirement