webvalve 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ee21f56868562d76912798f434460bb7373336b5
-  data.tar.gz: 1a272c0725e2dd5797d233f76f687262fe51cf9a
+SHA256:
+  metadata.gz: e78700063483cd49d8ee34f059f807c6640a002e3380f8f255a742ae01aef042
+  data.tar.gz: f7d1b324e129d5fbe368ef22bd98ddddf83ddf8a9252f8ed539142b3688ab6a9
 SHA512:
-  metadata.gz: a2e6a9654e68364a26ddee0ff97da75b3d720d39af191842ef8507fc210490e2816ee2ffb650a7bf840c48b58523bf0d34c3a7f747cebd408dfd2bd0415540ac
-  data.tar.gz: aafb419aac580481b09d740da59f689b563b5554042f795104e46b0ddd62e84477cd8d3059f6a826be994bbee56bffa6ca0fb5926494e60f9ef4eba36c7ff379
+  metadata.gz: f1781dd8a0d8d64fe570164febfb328f60e3dabf757931fecf16c326bae36a87dd6d1b52dab62bfb588b5e07bb0f0795c61f92b395c5d2e9ea82b16266fd2f49
+  data.tar.gz: 43a431a534c6dd790b05fd7767125b22359fa2d17e2d3fd87a1119bc9f242457ac4e355a069cdb172f5ba61cbe9e2e9225a6cf8072ee7e2c6b328f9d7e2a230c

data/CHANGELOG.md

@@ -9,6 +9,10 @@ and this project aims to adhere to [Semantic Versioning](http://semver.org/spec/
 ### Added
 ### Removed
 
+## [0.9.10] - 2019-09-09
+### Changed
+- rename `whitelist_url` to `allow_url` (https://github.com/Betterment/retail/pull/4424)
+
 ## [0.9.9] - 2019-05-24
 ### Changed
 - fix integration with `webdrivers` gem so Rails 6 should work out of the box (https://github.com/Betterment/webvalve/pull/32)
@@ -31,6 +35,7 @@ and this project aims to adhere to [Semantic Versioning](http://semver.org/spec/
 - WebMock 3+ support from @messanjah (https://github.com/Betterment/webvalve/pull/22)
 
 [Unreleased]: https://github.com/Betterment/webvalve/compare/v0.9.9...HEAD
+[0.9.10]: https://github.com/Betterment/webvalve/compare/v0.9.9...v0.9.10
 [0.9.9]: https://github.com/Betterment/webvalve/compare/v0.9.8...v0.9.9
 [0.9.8]: https://github.com/Betterment/webvalve/compare/v0.9.7...v0.9.8
 [0.9.7]: https://github.com/Betterment/webvalve/compare/v0.9.6...v0.9.7

data/README.md

@@ -71,9 +71,9 @@ This will drop a new file in your config directory.
 # WebValve.register FakeBank
 # WebValve.register FakeExample, url: 'https://api.example.org'
 #
-# # whitelist urls
+# # add urls to allowlist
 #
-# WebValve.whitelist_url 'https://example.com'
+# WebValve.allow_url 'https://example.com'
 ```
 
 If you're not using Rails, you can create this file for yourself.

data/lib/generators/webvalve/install_generator.rb

@@ -19,9 +19,9 @@ module Webvalve
           # WebValve.register FakeThing
           # WebValve.register FakeExample, url: 'https://api.example.org'
           #
-          # # whitelist urls
+          # # add urls to the allowlist
           #
-          # WebValve.whitelist_url 'https://example.com'
+          # WebValve.allow_url 'https://example.com'
         FILE
       end
 

data/lib/webvalve.rb

@@ -11,11 +11,11 @@ module WebValve
     #   @see WebValve::Manager#setup
     # @!method register
     #   @see WebValve::Manager#register
-    # @!method whitelist_url
-    #   @see WebValve::Manager#whitelist_url
+    # @!method allow_url
+    #   @see WebValve::Manager#allow_url
     # @!method reset
     #   @see WebValve::Manager#reset
-    delegate :setup, :register, :whitelist_url, :reset, to: :manager
+    delegate :setup, :register, :allow_url, :reset, to: :manager
     attr_writer :logger
 
     def enabled?

data/lib/webvalve/manager.rb

@@ -12,9 +12,9 @@ module WebValve
       fake_service_configs << FakeServiceConfig.new(service: fake_service, **args)
     end
 
-    def whitelist_url(url)
-      raise "#{url} already registered" if whitelisted_urls.include?(url)
-      whitelisted_urls << url
+    def allow_url(url)
+      raise "#{url} already registered" if allowlisted_urls.include?(url)
+      allowlisted_urls << url
     end
 
     def setup
@@ -22,7 +22,7 @@ module WebValve
         if config.should_intercept?
           webmock_service config
         else
-          whitelist_service config
+          allowlist_service config
         end
       end
 
@@ -32,7 +32,7 @@ module WebValve
 
     # @api private
     def reset
-      whitelisted_urls.clear
+      allowlisted_urls.clear
       fake_service_configs.clear
     end
 
@@ -42,20 +42,20 @@ module WebValve
     end
 
     # @api private
-    def whitelisted_urls
-      @whitelisted_urls ||= Set.new
+    def allowlisted_urls
+      @allowlisted_urls ||= Set.new
     end
 
     private
 
     def webmock_disable_options
       { allow_localhost: true }.tap do |opts|
-        opts[:allow] = whitelisted_url_regexps unless WebValve.env.test?
+        opts[:allow] = allowlisted_url_regexps unless WebValve.env.test?
       end
     end
 
-    def whitelisted_url_regexps
-      whitelisted_urls.map { |url| url_to_regexp url }
+    def allowlisted_url_regexps
+      allowlisted_urls.map { |url| url_to_regexp url }
     end
 
     def webmock_service(config)
@@ -65,8 +65,8 @@ module WebValve
       ).to_rack(FakeServiceWrapper.new(config.service))
     end
 
-    def whitelist_service(config)
-      whitelisted_urls << config.service_url
+    def allowlist_service(config)
+      allowlisted_urls << config.service_url
     end
 
     def url_to_regexp(url)

data/lib/webvalve/version.rb

@@ -1,3 +1,3 @@
 module WebValve
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

data/spec/examples.txt

@@ -1,32 +1,32 @@
 example_id                                             | status | run_time        |
 ------------------------------------------------------ | ------ | --------------- |
-./spec/webvalve/fake_service_config_spec.rb[1:1:1:1]   | passed | 0.0003 seconds  |
-./spec/webvalve/fake_service_config_spec.rb[1:1:1:2]   | passed | 0.00014 seconds |
-./spec/webvalve/fake_service_config_spec.rb[1:1:2:1]   | passed | 0.0002 seconds  |
-./spec/webvalve/fake_service_config_spec.rb[1:1:2:2]   | passed | 0.00017 seconds |
-./spec/webvalve/fake_service_config_spec.rb[1:1:2:3]   | passed | 0.00019 seconds |
-./spec/webvalve/fake_service_config_spec.rb[1:1:3:1]   | passed | 0.00013 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:1:1]   | passed | 0.00013 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:1:2]   | passed | 0.00013 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:2:1]   | passed | 0.00013 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:2:2]   | passed | 0.00016 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:2:3]   | passed | 0.00017 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:3:1]   | passed | 0.00019 seconds |
 ./spec/webvalve/fake_service_config_spec.rb[1:1:3:2]   | passed | 0.00014 seconds |
-./spec/webvalve/fake_service_config_spec.rb[1:1:3:3:1] | passed | 0.00015 seconds |
-./spec/webvalve/fake_service_config_spec.rb[1:1:3:3:2] | passed | 0.00039 seconds |
-./spec/webvalve/fake_service_config_spec.rb[1:2:1]     | passed | 0.00247 seconds |
-./spec/webvalve/fake_service_config_spec.rb[1:2:2]     | passed | 0.00161 seconds |
-./spec/webvalve/fake_service_config_spec.rb[1:2:3]     | passed | 0.0002 seconds  |
-./spec/webvalve/fake_service_spec.rb[1:1]              | passed | 0.00354 seconds |
-./spec/webvalve/fake_service_spec.rb[1:2:1]            | passed | 0.02646 seconds |
-./spec/webvalve/fake_service_spec.rb[1:2:2]            | passed | 0.02043 seconds |
-./spec/webvalve/manager_spec.rb[1:1]                   | passed | 0.00008 seconds |
-./spec/webvalve/manager_spec.rb[1:2:1]                 | passed | 0.00228 seconds |
-./spec/webvalve/manager_spec.rb[1:3:1]                 | passed | 0.00022 seconds |
-./spec/webvalve/manager_spec.rb[1:4:1]                 | passed | 0.0001 seconds  |
-./spec/webvalve/manager_spec.rb[1:5:1]                 | passed | 0.00046 seconds |
-./spec/webvalve/manager_spec.rb[1:5:2]                 | passed | 0.00065 seconds |
-./spec/webvalve/manager_spec.rb[1:5:3]                 | passed | 0.01468 seconds |
-./spec/webvalve/manager_spec.rb[1:5:4:1]               | passed | 0.00055 seconds |
-./spec/webvalve/manager_spec.rb[1:5:5:1]               | passed | 0.00053 seconds |
-./spec/webvalve/manager_spec.rb[1:5:5:2]               | passed | 0.00093 seconds |
-./spec/webvalve/manager_spec.rb[1:5:5:3]               | passed | 0.00188 seconds |
-./spec/webvalve_spec.rb[1:1]                           | passed | 0.00006 seconds |
-./spec/webvalve_spec.rb[1:2]                           | passed | 0.00013 seconds |
-./spec/webvalve_spec.rb[1:3]                           | passed | 0.00008 seconds |
-./spec/webvalve_spec.rb[1:4]                           | passed | 0.00182 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:3:3:1] | passed | 0.00016 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:3:3:2] | passed | 0.00016 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:2:1]     | passed | 0.00015 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:2:2]     | passed | 0.00013 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:2:3]     | passed | 0.00013 seconds |
+./spec/webvalve/fake_service_spec.rb[1:1]              | passed | 0.00273 seconds |
+./spec/webvalve/fake_service_spec.rb[1:2:1]            | passed | 0.0183 seconds  |
+./spec/webvalve/fake_service_spec.rb[1:2:2]            | passed | 0.01809 seconds |
+./spec/webvalve/manager_spec.rb[1:1]                   | passed | 0.00069 seconds |
+./spec/webvalve/manager_spec.rb[1:2:1]                 | passed | 0.00233 seconds |
+./spec/webvalve/manager_spec.rb[1:3:1]                 | passed | 0.00182 seconds |
+./spec/webvalve/manager_spec.rb[1:4:1]                 | passed | 0.00134 seconds |
+./spec/webvalve/manager_spec.rb[1:5:1]                 | passed | 0.03628 seconds |
+./spec/webvalve/manager_spec.rb[1:5:2]                 | passed | 0.00118 seconds |
+./spec/webvalve/manager_spec.rb[1:5:3]                 | passed | 0.00128 seconds |
+./spec/webvalve/manager_spec.rb[1:5:4:1]               | passed | 0.00141 seconds |
+./spec/webvalve/manager_spec.rb[1:5:5:1]               | passed | 0.00147 seconds |
+./spec/webvalve/manager_spec.rb[1:5:5:2]               | passed | 0.00148 seconds |
+./spec/webvalve/manager_spec.rb[1:5:5:3]               | passed | 0.00347 seconds |
+./spec/webvalve_spec.rb[1:1]                           | passed | 0.00008 seconds |
+./spec/webvalve_spec.rb[1:2]                           | passed | 0.00011 seconds |
+./spec/webvalve_spec.rb[1:3]                           | passed | 0.00209 seconds |
+./spec/webvalve_spec.rb[1:4]                           | passed | 0.00009 seconds |

data/spec/webvalve/manager_spec.rb

@@ -8,12 +8,12 @@ RSpec.describe WebValve::Manager do
     described_class.is_a? Singleton
   end
 
-  describe '#whitelist_url' do
+  describe '#allow_url' do
     it 'raises on duplicates' do
-      subject.whitelist_url "foo"
-      expect { subject.whitelist_url "foo" }.to raise_error(/already registered/)
-      expect(subject.whitelisted_urls.count).to eq 1
-      expect(subject.whitelisted_urls).to contain_exactly(/foo/)
+      subject.allow_url "foo"
+      expect { subject.allow_url "foo" }.to raise_error(/already registered/)
+      expect(subject.allowlisted_urls.count).to eq 1
+      expect(subject.allowlisted_urls).to contain_exactly(/foo/)
     end
   end
 
@@ -69,12 +69,12 @@ RSpec.describe WebValve::Manager do
         end
       end
 
-      it 'does not whitelist configured urls in webmock' do
+      it 'does not allowlist configured urls in webmock' do
         allow(WebMock).to receive(:disable_net_connect!)
         results = [%r{\Ahttp://foo\.dev}, %r{\Ahttp://bar\.dev}]
 
-        subject.whitelist_url 'http://foo.dev'
-        subject.whitelist_url 'http://bar.dev'
+        subject.allow_url 'http://foo.dev'
+        subject.allow_url 'http://bar.dev'
 
         subject.setup
 
@@ -90,12 +90,12 @@ RSpec.describe WebValve::Manager do
         end
       end
 
-      it 'whitelists configured urls in webmock' do
+      it 'allowlists configured urls in webmock' do
         allow(WebMock).to receive(:disable_net_connect!)
         results = [%r{\Ahttp://foo\.dev}, %r{\Ahttp://bar\.dev}]
 
-        subject.whitelist_url 'http://foo.dev'
-        subject.whitelist_url 'http://bar.dev'
+        subject.allow_url 'http://foo.dev'
+        subject.allow_url 'http://bar.dev'
 
         subject.setup
 
@@ -117,7 +117,7 @@ RSpec.describe WebValve::Manager do
         expect(web_mock_stubble).to have_received(:to_rack)
       end
 
-      it 'whitelists registered fakes that are enabled in ENV' do
+      it 'allowlists registered fakes that are enabled in ENV' do
         enabled_service = class_double(WebValve::FakeService, name: 'FakeSomething')
 
         with_env 'SOMETHING_ENABLED' => '1', 'SOMETHING_API_URL' => 'http://real.dev' do
@@ -125,7 +125,7 @@ RSpec.describe WebValve::Manager do
           subject.setup
         end
 
-        expect(subject.whitelisted_urls).to include 'http://real.dev'
+        expect(subject.allowlisted_urls).to include 'http://real.dev'
       end
     end
   end

data/spec/webvalve_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe WebValve do
     expect(described_class).to respond_to(:reset)
   end
 
-  it 'delegates .whitelist_url to manager' do
-    expect(described_class).to respond_to(:whitelist_url)
+  it 'delegates .allow_url to manager' do
+    expect(described_class).to respond_to(:allow_url)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webvalve
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Sam Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -220,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A library for faking http service integrations in development and test