faraday-conductivity 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81337bd02893a9e0365427e2f498fc299c9bfd91
-  data.tar.gz: b35b5bf0cf8e97c222b7a08d2425f6ffc47210d7
+  metadata.gz: 37144ee9e787b4eba24b366cff58a3d437e5670c
+  data.tar.gz: 577ec27bee6892d8a73382eb1018e726236ce2a4
 SHA512:
-  metadata.gz: ff06c7a6e23d062a62cf24bc02867c9ec23243afcf284dec10bdf4737d97bb2cbfa23befd52907d4b2e590b41205a24398e78572513da26491f8c47d6027e9ed
-  data.tar.gz: 88b20bf120f272d9c2e16908bd2bcbc650befac32e64ba6570d3cc103ac3244af517d2c7cd90d33883c6a697f24a174c5da87bd2ebd437b577de2f55e3510069
+  metadata.gz: dce521f65e52e0fa0cfc168d4bd3fe5fded12ecbc5267a9c8632772c19f9e75713f9a84a7013d2bb2e1979e8c8f79eed7b1293da78b751dc64757a8fbf277e56
+  data.tar.gz: c65886c49d1ccaf753bdeeca1133aa002070c9b9354499fcb82ab9b619cb8a5944a86db4511866cb63f7f260a9325111f33e129797c1505d20981439189b8188

data/.rspec

@@ -1,2 +1,4 @@
 --format documentation
 --color
+--require spec_helper
+--order random

data/faraday-conductivity.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "faraday", "~> 0.8"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec", "~> 3"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "service_double"
   gem.add_development_dependency "appraisal"

data/lib/faraday/conductivity/request_id_filter.rb

@@ -2,8 +2,11 @@ module Faraday
   module Conductivity
     class RequestIdFilter
 
-      def self.filter(controller)
-        Thread.current[:request_id] = controller.request.uuid
+      class << self
+        def filter(controller)
+          Thread.current[:request_id] = controller.request.uuid
+        end
+        alias_method :before, :filter
       end
 
     end

data/lib/faraday/conductivity/version.rb

@@ -1,5 +1,5 @@
 module Faraday
   module Conductivity
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/middleware/extended_logging_spec.rb

@@ -1,40 +1,39 @@
-require 'spec_helper'
 require 'logger'
 
-describe Faraday::Conductivity::ExtendedLogging do
+RSpec.describe Faraday::Conductivity::ExtendedLogging do
 
   subject(:log) { io.read }
 
   it "includes the HTTP verb" do
-    log.should include "GET"
+    expect(log).to include "GET"
   end
 
   it "includes the request body" do
-    log.should include "the request body"
+    expect(log).to include "the request body"
   end
 
   it "includes the request headers" do
-    log.should match %r"X-Foo\s+: bar"
+    expect(log).to match %r"X-Foo\s+: bar"
   end
 
   it "includes the complete URL" do
-    log.should include "http://widgets.example.org/test"
+    expect(log).to include "http://widgets.example.org/test"
   end
 
   it "includes the response status" do
-    log.should include "200"
+    expect(log).to include "200"
   end
 
   it "includes the response time" do
-    log.should match(/\d+\.\d+ms/)
+    expect(log).to match(/\d+\.\d+ms/)
   end
 
   it "includes the response headers" do
-    log.should include "X-Bar : foo"
+    expect(log).to include "X-Bar : foo"
   end
 
   it "includes the response body" do
-    log.should include "the response body"
+    expect(log).to include "the response body"
   end
 
   before do

data/spec/middleware/mimetype_spec.rb

@@ -1,11 +1,9 @@
-require 'spec_helper'
-
-describe Faraday::Conductivity::Mimetype do
+RSpec.describe Faraday::Conductivity::Mimetype do
 
   subject(:request_headers) { response.env[:request_headers] }
 
   it "includes the mimetype specified" do
-    request_headers["Accept"].should eq mimetype
+    expect(request_headers["Accept"]).to eq mimetype
   end
 
   let(:mimetype) { "application/vnd.users-v2+json" }

data/spec/middleware/repeater_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Faraday::Conductivity::Repeater do
+RSpec.describe Faraday::Conductivity::Repeater do
 
   let(:connection) {
     Faraday.new(url: $service_double_url) { |faraday|
@@ -11,7 +9,7 @@ describe Faraday::Conductivity::Repeater do
   }
 
   it "retries after timeouts" do
-    get_with_max(4).body.should eq "fast"
+    expect(get_with_max(4).body).to eq "fast"
   end
 
   it "gives up after a number of retries" do
@@ -34,9 +32,9 @@ describe Faraday::Conductivity::Repeater do
 
   it "waits according to a pattern" do
     pattern = MyPattern.new
-    Faraday::Conductivity::Repeater::Pattern.should_receive(:new).and_return(pattern)
+    expect(Faraday::Conductivity::Repeater::Pattern).to receive(:new).and_return(pattern)
     get_with_max(6)
-    pattern.waited.should eq pattern.waited.sort
+    expect(pattern.waited).to eq pattern.waited.sort
   end
 
   it "handles other errors too" do
@@ -46,9 +44,9 @@ describe Faraday::Conductivity::Repeater do
     }
 
     pattern = double :pattern
-    Faraday::Conductivity::Repeater::Pattern.should_receive(:new).and_return(pattern)
-    pattern.should_receive(:wait).with(1).ordered
-    pattern.should_receive(:wait).with(2).ordered
+    expect(Faraday::Conductivity::Repeater::Pattern).to receive(:new).and_return(pattern)
+    expect(pattern).to receive(:wait).with(1).ordered
+    expect(pattern).to receive(:wait).with(2).ordered
 
     expect { connection.get("/") }.to raise_error(Faraday::Error::ConnectionFailed)
   end

data/spec/middleware/request_headers_spec.rb

@@ -1,6 +1,4 @@
-require "spec_helper"
-
-describe Faraday::Conductivity::RequestHeaders do
+RSpec.describe Faraday::Conductivity::RequestHeaders do
 
   it "includes the mimetype specified" do
     connection = create_connection do |faraday|
@@ -8,8 +6,8 @@ describe Faraday::Conductivity::RequestHeaders do
     end
     request_headers = connection.get("/test").env[:request_headers]
 
-    request_headers["Accept"].should eq "application/json"
-    request_headers["X-Version-Number"].should eq "123"
+    expect(request_headers["Accept"]).to eq "application/json"
+    expect(request_headers["X-Version-Number"]).to eq "123"
   end
 
   it "doesn't override locally specified headers" do
@@ -22,7 +20,7 @@ describe Faraday::Conductivity::RequestHeaders do
 
     request_headers = response.env[:request_headers]
 
-    request_headers["Accept"].should eq "application/xml"
+    expect(request_headers["Accept"]).to eq "application/xml"
   end
 
 end

data/spec/middleware/request_id_spec.rb

@@ -1,17 +1,15 @@
-require 'spec_helper'
-
-describe Faraday::Conductivity::RequestId do
+RSpec.describe Faraday::Conductivity::RequestId do
 
   subject(:request_headers) { response.env[:request_headers] }
 
   it "includes the thread local variable" do
     Thread.current[:request_id] = "my-request-id"
-    request_headers["X-Request-Id"].should eq "my-request-id"
+    expect(request_headers["X-Request-Id"]).to eq "my-request-id"
   end
 
   it "doesn't add the header if there is no request id" do
     Thread.current[:request_id] = nil
-    request_headers.should_not have_key "X-Request-Id"
+    expect(request_headers).not_to have_key "X-Request-Id"
   end
 
   def connection

data/spec/middleware/selective_errors_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe Faraday::Conductivity::SelectiveErrors do
+RSpec.describe Faraday::Conductivity::SelectiveErrors do
 
   subject(:request_headers) { response.env[:request_headers] }
 

data/spec/middleware/user_agent_spec.rb

@@ -1,39 +1,37 @@
-require 'spec_helper'
-
-describe Faraday::Conductivity::UserAgent do
+RSpec.describe Faraday::Conductivity::UserAgent do
 
   subject(:user_agent) { response.env[:request_headers]["User-Agent"] }
 
   it "includes the name and version of the app" do
-    user_agent.should start_with "MarketingSite/1.1"
+    expect(user_agent).to start_with "MarketingSite/1.1"
   end
 
   it "includes the current ruby version" do
-    user_agent.should include RUBY_VERSION
+    expect(user_agent).to include RUBY_VERSION
   end
 
   it "includes the current ruby engine" do
-    user_agent.should include RUBY_ENGINE
+    expect(user_agent).to include RUBY_ENGINE
   end
 
   it "includes the current ruby patch level" do
-    user_agent.should include RUBY_PATCHLEVEL.to_s
+    expect(user_agent).to include RUBY_PATCHLEVEL.to_s
   end
 
   it "includes the platform" do
-    user_agent.should include RUBY_PLATFORM
+    expect(user_agent).to include RUBY_PLATFORM
   end
 
   it "includes the pid" do
-    user_agent.should include "1337"
+    expect(user_agent).to include "1337"
   end
 
   it "includes the current host" do
-    user_agent.should include "my.hostname"
+    expect(user_agent).to include "my.hostname"
   end
 
   it "includes the current user name" do
-    user_agent.should include "linus"
+    expect(user_agent).to include "linus"
   end
 
   let(:environment) {

data/spec/spec_helper.rb

@@ -28,10 +28,7 @@ module SpecHelper
 end
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-  config.order = 'random'
+  config.disable_monkey_patching!
   config.include SpecHelper
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-conductivity
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -165,3 +165,4 @@ test_files:
 - spec/middleware/selective_errors_spec.rb
 - spec/middleware/user_agent_spec.rb
 - spec/spec_helper.rb
+has_rdoc: