webvalve 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27cfca3646bee0e4a3405dfd89591a279d39ec26693689953bc47bb887c860d
-  data.tar.gz: 372b6c3d9f1ea51b9ba7313ad8836a1c926dbcb1b67c32a348a81522ba9c0b17
+  metadata.gz: 258ab9f12c33a103010fd6ae0fde275dda425623699c792bf6f5652ed8bb065c
+  data.tar.gz: 02ea9901da037bbc16ddf4be606c5f2aa71a91320378192cef0b3da8a21d470a
 SHA512:
-  metadata.gz: 75425fd1a5e8b11a40863e375b64a2c71a8f7f5a9399d8dc3bc0bc86aba4241a9b210c2c384db54e33960aa67906ffd14195a3b289fc81b61212182497a5d667
-  data.tar.gz: 67598716476b08fddfea8de71321660fe3b3af454fb133cf4968c37ac958eda9daebc724961c534dcb8a13dfab315b1ce7bc12ee65807d2d6733a86eec7e102d
+  metadata.gz: '09ca5fd0597e1620d06f05db92f27a05e01ed20320a644ae5c08615ac6dc7bcb46210fc142b708fd5a42dbb207cd6da112417286c4194734b29f0a32e49951dd'
+  data.tar.gz: bb1a313e30a0b1c0df6148abee38194666d3013625ee9d042816af461afa8e90567a438f6f49c3e8cd287ecb75dfec6d2a0b88e21371e97e2894b424fdbab32d

data/CHANGELOG.md

@@ -9,6 +9,14 @@ and this project aims to adhere to [Semantic Versioning](http://semver.org/spec/
 ### Added
 ### Removed
 
+## [1.1.0] - 2020-04-27
+### Changed
+- Allow the same URL for services as long as basic auth is different
+    (https://github.com/Betterment/webvalve/pull/46)
+- Introduce `reset!` and `clear!` to replace `reset`
+    https://github.com/Betterment/webvalve/pull/45)
+
+
 ## [1.0.2] - 2020-04-27
 ### Changed
 - Fix an issue with setup / reset
@@ -68,7 +76,8 @@ and this project aims to adhere to [Semantic Versioning](http://semver.org/spec/
 ### Changed
 - WebMock 3+ support from @messanjah (https://github.com/Betterment/webvalve/pull/22)
 
-[Unreleased]: https://github.com/Betterment/webvalve/compare/v1.0.2...HEAD
+[Unreleased]: https://github.com/Betterment/webvalve/compare/v1.1.0...HEAD
+[1.1.0]: https://github.com/Betterment/webvalve/compare/v1.0.2...v1.1.0
 [1.0.2]: https://github.com/Betterment/webvalve/compare/v1.0.1...v1.0.2
 [1.0.1]: https://github.com/Betterment/webvalve/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/Betterment/webvalve/compare/v0.12.0...v1.0.0

data/README.md

@@ -170,8 +170,7 @@ RSpec.configure do |config|
   end
   
   config.around :each do |ex|
-    WebValve.reset
-    WebValve.setup
+    WebValve.reset!
     ex.run
   end
 end

data/lib/webvalve.rb

@@ -10,11 +10,13 @@ module WebValve
     #   @see WebValve::Manager#register
     # @!method allow_url
     #   @see WebValve::Manager#allow_url
-    # @!method reset
-    #   @see WebValve::Manager#reset
+    # @!method reset!
+    #   @see WebValve::Manager#reset!
+    # @!method clear!
+    #   @see WebValve::Manager#clear!
     # @!method enabled?
     #   @see WebValve::Manager#enabled?
-    delegate :setup, :register, :allow_url, :reset, :enabled?, to: :manager
+    delegate :setup, :register, :allow_url, :reset!, :clear!, :enabled?, to: :manager
     attr_writer :logger
 
     def config_paths
@@ -52,6 +54,15 @@ module WebValve
     def manager
       WebValve::Manager.instance
     end
+
+    def reset
+      ActiveSupport::Deprecation.warn <<~WARN.squish
+        `WebValve.reset` is deprecated.
+        Please use `WebValve.clear!` (the old 'reset' behavior)
+        or `WebValve.reset!` (which also runs 'setup')
+      WARN
+      clear!
+    end
   end
 end
 

data/lib/webvalve/fake_service_config.rb

@@ -15,11 +15,14 @@ module WebValve
       value_from_env.present? && WebValve::DISABLED_VALUES.include?(value_from_env.to_s)
     end
 
+    def full_url
+      @full_url ||= custom_service_url || default_service_url
+    end
+
     def service_url
       @service_url ||= begin
-        url = custom_service_url || default_service_url
-        raise missing_url_message if url.blank?
-        strip_basic_auth url
+        raise missing_url_message if full_url.blank?
+        strip_basic_auth full_url
       end
     end
 

data/lib/webvalve/manager.rb

@@ -67,7 +67,13 @@ module WebValve
     end
 
     # @api private
-    def reset
+    def reset!
+      clear!
+      setup
+    end
+
+    # @api private
+    def clear!
       allowlisted_urls.clear
       fake_service_configs.clear
       stubbed_urls.clear
@@ -146,8 +152,8 @@ module WebValve
     end
 
     def ensure_non_duplicate_stub(config)
-      raise "Invalid config for #{config.service_class_name}. Already stubbed url #{config.service_url}" if stubbed_urls.include?(config.service_url)
-      stubbed_urls << config.service_url
+      raise "Invalid config for #{config.service_class_name}. Already stubbed url #{config.full_url}" if stubbed_urls.include?(config.full_url)
+      stubbed_urls << config.full_url
     end
 
     def load_configs!

data/lib/webvalve/rspec.rb

@@ -3,8 +3,7 @@ require 'webmock/rspec'
 
 RSpec.configure do |c|
   c.around do |example|
-    WebValve.reset
-    WebValve.setup
+    WebValve.reset!
     example.run
   end
 end

data/lib/webvalve/version.rb

@@ -1,3 +1,3 @@
 module WebValve
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/webvalve/fake_service_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe WebValve::FakeService do
 
   describe 'integrated behavior' do
     after do
-      WebValve.reset
+      WebValve.reset!
     end
 
     context 'when the service is at a root path' do

data/spec/webvalve/manager_spec.rb

@@ -141,6 +141,21 @@ RSpec.describe WebValve::Manager do
           expect { subject.setup }.to raise_error('Invalid config for FakeOtherThing. Already stubbed url http://something.dev')
         end
       end
+
+      it 'does not raise with different HTTP auth patterns' do
+        disabled_service = class_double(WebValve::FakeService, name: 'FakeSomething')
+        other_disabled_service = class_double(WebValve::FakeService, name: 'FakeOtherThing')
+        web_mock_stubble = double(to_rack: true)
+        allow(WebMock).to receive(:stub_request).and_return(web_mock_stubble)
+
+        with_env 'SOMETHING_API_URL' => 'http://user1@something.dev', 'OTHER_THING_API_URL' => 'http://user2@something.dev' do
+          subject.register disabled_service.name
+          subject.register other_disabled_service.name
+
+          expect { subject.setup }.to_not raise_error
+          expect(WebMock).to have_received(:stub_request).with(:any, %r{\Ahttp://something\.dev}).twice
+        end
+      end
     end
 
     context 'when WebValve is on and allowing traffic' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webvalve
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Sam Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport