webvalve 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c7d7e47d1e476165ad4a624652f8f739a89f88b
-  data.tar.gz: 9b52e6fe109b4e32d904ae4757369db755623a13
+  metadata.gz: 5e60a2b347e2feeac25e77f2f00ea08bd47a21ac
+  data.tar.gz: f24d8a35e41dcb5bb9ddf34c5bc6462a2a0ac2d0
 SHA512:
-  metadata.gz: 20b8faa5fac8de89d4c512d852e1e9e8dede7552ad0ca5d82d7041b472c537064f1f9a2b64be0238317fbe6209e2f9fe5a184d38219cdfe4c7c18b2bedcf6bd1
-  data.tar.gz: c21e6dcb440acd1c8ea4e04a990891876f6975bb86a962e1c3d4a8a8f096ebac6ae13d711c624f1f3b9d2903b58cd354d3bd5463b7d19889d01d31cc98f73151
+  metadata.gz: 1e683adde8772005f7128f32cc5bed08477acf771bece27ebd18248eddbd90137e2ff18e9a38363ab84b51611d2da5ecde1f7cb3321944bae770e3af99e5df76
+  data.tar.gz: 6398326ced19332fd63ba9d1eac2dd69de6a3f1970c2186690f46479ad1d4f3a4735a357a34c5aaae89670c87b287af7c7ec086fa48561306fd65308327a849d

data/README.md

@@ -18,7 +18,8 @@ Check out [the Rails at Scale talk](https://www.youtube.com/watch?v=Nd9hnffxCP8)
 
 ## Getting Started
 
-WebValve is designed to work with Rails 4+.
+WebValve is designed to work with Rails 4+, but it also should work with
+non-Rails apps and gems.
 
 ### Installation
 
@@ -75,6 +76,8 @@ This will drop a new file in your config directory.
 # WebValve.whitelist_url 'https://example.com'
 ```
 
+If you're not using Rails, you can create this file for yourself.
+
 ### Registering a service
 
 Next, you will want create a `FakeService` and register
@@ -113,6 +116,9 @@ And it will automatically register it in `config/webvalve.rb`
 WebValve.register FakeBank
 ```
 
+Again, if you're not using Rails, you'll have to create this file
+yourself and update the config file manually.
+
 You'll also want to define an environment variable for the base url of
 your service.
 
@@ -141,7 +147,7 @@ have to configure WebValve at the beginning of each test. For RSpec, there
 is a configuration provided. 
 
 ```ruby
-# spec/rails_helper.rb
+# spec/spec_helper.rb
 require 'webvalve/rspec'
 ```
 
@@ -202,6 +208,13 @@ environments; however, it can be enabled in other environments by
 setting `WEBVALVE_ENABLED=true`. This can be useful for spinning up
 cheap, one-off environments for user-testing or demos.
 
+> Can I use WebValve without Rails?
+
+Yep! If you're not using Rails, you'll have to load the config file
+yourself. You will want to explicitly `require` each of your fake
+services in your `config/webvalve.rb`, `require` your config file, and
+call `WebValve.setup`  during your app's boot-up process.
+
 ## How to Contribute
 
 We would love for you to contribute! Anything that benefits the majority

data/Rakefile

@@ -4,25 +4,18 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
 Bundler::GemHelper.install_tasks
 
-if Rails.env.development? || Rails.env.test?
-  if defined? Dummy
-    task(:default).clear
-    if ENV['APPRAISAL_INITIALIZED'] || ENV['TRAVIS']
-      require 'rspec/core'
-      require 'rspec/core/rake_task'
-      RSpec::Core::RakeTask.new(:spec)
-      task default: :spec
-    else
-      require 'appraisal'
-      Appraisal::Task.new
-      task default: :appraisal
-    end
-  end
+task(:default).clear
+if ENV['APPRAISAL_INITIALIZED'] || ENV['TRAVIS']
+  require 'rspec/core'
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task default: :spec
+else
+  require 'appraisal'
+  Appraisal::Task.new
+  task default: :appraisal
 end
 
 require 'yard'

data/lib/webvalve.rb

@@ -1,4 +1,6 @@
 require 'set'
+require 'active_support'
+require 'active_support/core_ext'
 
 module WebValve
   ALWAYS_ENABLED_ENVS = %w(development test).freeze
@@ -16,9 +18,9 @@ module WebValve
     delegate :setup, :register, :whitelist_url, :reset, to: :manager
 
     def enabled?
-      if Rails.env.in?(ALWAYS_ENABLED_ENVS)
+      if env.in?(ALWAYS_ENABLED_ENVS)
         if ENV.key? 'WEBVALVE_ENABLED'
-          Rails.logger.warn(<<~MESSAGE)
+          logger.warn(<<~MESSAGE)
             WARNING: Ignoring WEBVALVE_ENABLED environment variable setting (#{ENV['WEBVALVE_ENABLED']})
             WebValve is always enabled in development and test environments.
           MESSAGE
@@ -33,7 +35,27 @@ module WebValve
       @config_paths ||= Set.new
     end
 
-    private
+    if defined?(::Rails)
+      delegate :env, :env=, :logger, :logger=, to: ::Rails
+    else
+      def env
+        @env ||= (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development').inquiry
+      end
+
+      def env=(env)
+        @env = env&.inquiry
+      end
+
+      def logger
+        @logger ||= ActiveSupport::Logger.new(STDOUT).tap do |l|
+          l.formatter = ::Logger::Formatter.new
+        end
+      end
+
+      def logger=(logger)
+        @logger = logger
+      end
+    end
 
     def manager
       WebValve::Manager.instance
@@ -41,8 +63,8 @@ module WebValve
   end
 end
 
+require 'webvalve/railtie' if defined?(::Rails)
 require 'webvalve/instrumentation'
-require 'webvalve/engine'
 require 'webvalve/fake_service'
 require 'webvalve/fake_service_wrapper'
 require 'webvalve/fake_service_config'

data/lib/webvalve/fake_service_config.rb

@@ -8,7 +8,7 @@ module WebValve
     end
 
     def should_intercept?
-      Rails.env.test? || # always intercept in test
+      WebValve.env.test? || # always intercept in test
         (WebValve.enabled? && !service_enabled_in_env?)
     end
 

data/lib/webvalve/instrumentation/log_subscriber.rb

@@ -1,3 +1,5 @@
+require 'active_support/log_subscriber'
+
 module WebValve
   module Instrumentation
     class LogSubscriber < ActiveSupport::LogSubscriber

data/lib/webvalve/instrumentation/middleware.rb

@@ -1,3 +1,5 @@
+require 'active_support/notifications'
+
 module WebValve
   module Instrumentation
     class Middleware

data/lib/webvalve/manager.rb

@@ -50,7 +50,7 @@ module WebValve
 
     def webmock_disable_options
       { allow_localhost: true }.tap do |opts|
-        opts[:allow] = whitelisted_url_regexps unless Rails.env.test?
+        opts[:allow] = whitelisted_url_regexps unless WebValve.env.test?
       end
     end
 

data/lib/webvalve/{engine.rb → railtie.rb}

@@ -1,9 +1,7 @@
 module WebValve
-  class Engine < ::Rails::Engine
-    isolate_namespace WebValve
-
+  class Railtie < ::Rails::Railtie
     if WebValve.enabled?
-      initializer "webvalve.set_autoload_paths", before: :set_autoload_paths do |app|
+      initializer 'webvalve.set_autoload_paths', before: :set_autoload_paths do |app|
         WebValve.config_paths << app.root
 
         WebValve.config_paths.each do |root|
@@ -11,7 +9,7 @@ module WebValve
         end
       end
 
-      initializer "webvalve.setup" do
+      initializer 'webvalve.setup' do
         WebValve.config_paths.each do |root|
           path = root.join('config', 'webvalve.rb').to_s
           load path if File.exist?(path)

data/lib/webvalve/version.rb

@@ -1,3 +1,3 @@
 module WebValve
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/dummy/config/routes.rb

@@ -1,3 +1,2 @@
 Rails.application.routes.draw do
-  mount WebValve::Engine => "/webvalve"
 end

data/spec/dummy/log/test.log

@@ -0,0 +1,36 @@
+  WebValve Request Captured (0.4ms)  dummy.dev GET /foos []
+  WebValve Request Captured (4.8ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (3.0ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.8ms)  dummy.dev GET /foos []
+  WebValve Request Captured (3.9ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.4ms)  dummy.dev GET /foos []
+  WebValve Request Captured (2.6ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.5ms)  dummy.dev GET /foos []
+  WebValve Request Captured (0.4ms)  dummy.dev GET /foos []
+  WebValve Request Captured (2.2ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.5ms)  dummy.dev GET /foos []
+  WebValve Request Captured (3.9ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (2.1ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.3ms)  dummy.dev GET /foos []
+  WebValve Request Captured (2.9ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.4ms)  dummy.dev GET /foos []
+  WebValve Request Captured (0.4ms)  dummy.dev GET /foos []
+  WebValve Request Captured (4.9ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (2.1ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.4ms)  dummy.dev GET /foos []
+  WebValve Request Captured (0.5ms)  dummy.dev GET /foos []
+  WebValve Request Captured (2.2ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.5ms)  dummy.dev GET /foos []
+  WebValve Request Captured (2.6ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (6.6ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.4ms)  dummy.dev GET /foos []
+  WebValve Request Captured (0.5ms)  dummy.dev GET /foos []
+  WebValve Request Captured (2.5ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.4ms)  dummy.dev GET /foos []
+  WebValve Request Captured (2.2ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (2.1ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.3ms)  dummy.dev GET /foos []
+  WebValve Request Captured (2.4ms)  dummy.dev GET /widgets [200]
+  WebValve Request Captured (0.3ms)  dummy.dev GET /foos []
+  WebValve Request Captured (0.4ms)  dummy.dev GET /foos []
+  WebValve Request Captured (2.2ms)  dummy.dev GET /widgets [200]

data/spec/examples.txt

@@ -0,0 +1,32 @@
+example_id                                             | status | run_time        |
+------------------------------------------------------ | ------ | --------------- |
+./spec/webvalve/fake_service_config_spec.rb[1:1:1:1]   | passed | 0.00015 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.00019 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:2:2]   | passed | 0.00026 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:2:3]   | passed | 0.00024 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:3:1]   | passed | 0.00016 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:3:2]   | passed | 0.00021 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:3:3:1] | passed | 0.00019 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:1:3:3:2] | passed | 0.00027 seconds |
+./spec/webvalve/fake_service_config_spec.rb[1:2:1]     | passed | 0.0002 seconds  |
+./spec/webvalve/fake_service_config_spec.rb[1:2:2]     | passed | 0.0002 seconds  |
+./spec/webvalve/fake_service_config_spec.rb[1:2:3]     | passed | 0.00016 seconds |
+./spec/webvalve/fake_service_spec.rb[1:1]              | passed | 0.00236 seconds |
+./spec/webvalve/fake_service_spec.rb[1:2:1]            | passed | 0.00387 seconds |
+./spec/webvalve/fake_service_spec.rb[1:2:2]            | passed | 0.02133 seconds |
+./spec/webvalve/manager_spec.rb[1:1]                   | passed | 0.00005 seconds |
+./spec/webvalve/manager_spec.rb[1:2:1]                 | passed | 0.00213 seconds |
+./spec/webvalve/manager_spec.rb[1:3:1]                 | passed | 0.00019 seconds |
+./spec/webvalve/manager_spec.rb[1:4:1]                 | passed | 0.00011 seconds |
+./spec/webvalve/manager_spec.rb[1:5:1]                 | passed | 0.00024 seconds |
+./spec/webvalve/manager_spec.rb[1:5:2]                 | passed | 0.0084 seconds  |
+./spec/webvalve/manager_spec.rb[1:5:3]                 | passed | 0.00052 seconds |
+./spec/webvalve/manager_spec.rb[1:5:4:1]               | passed | 0.00049 seconds |
+./spec/webvalve/manager_spec.rb[1:5:5:1]               | passed | 0.0006 seconds  |
+./spec/webvalve/manager_spec.rb[1:5:5:2]               | passed | 0.00079 seconds |
+./spec/webvalve/manager_spec.rb[1:5:5:3]               | passed | 0.0019 seconds  |
+./spec/webvalve_spec.rb[1:1]                           | passed | 0.00012 seconds |
+./spec/webvalve_spec.rb[1:2]                           | passed | 0.00006 seconds |
+./spec/webvalve_spec.rb[1:3]                           | passed | 0.00006 seconds |
+./spec/webvalve_spec.rb[1:4]                           | passed | 0.00107 seconds |

data/spec/spec_helper.rb

@@ -1,3 +1,11 @@
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('dummy/config/environment', __dir__) if ENV['BUNDLE_GEMFILE'] =~ /rails/
+require 'rspec'
+require 'pry'
+require 'webvalve'
+
+Dir[File.join(__dir__, 'support/**/*.rb')].each { |f| require f }
+
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
@@ -18,5 +26,7 @@ RSpec.configure do |config|
   config.order = :random
   Kernel.srand config.seed
 
-  # config.profile_examples = 10
+  config.profile_examples = 10
+
+  config.include Helpers
 end

data/spec/support/helpers.rb

@@ -15,10 +15,10 @@ module Helpers
   end
 
   def with_rails_env(env)
-    initial_env = Rails.env
-    Rails.env = env
+    initial_env = WebValve.env
+    WebValve.env = env
     yield
   ensure
-    Rails.env = initial_env
+    WebValve.env = initial_env
   end
 end

data/spec/webvalve/fake_service_config_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe WebValve::FakeServiceConfig do
   let(:fake_service) do

data/spec/webvalve/fake_service_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe WebValve::FakeService do
   subject do

data/spec/webvalve/manager_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe WebValve::Manager do
 

data/spec/webvalve_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe WebValve do
   it 'delegates .setup to manager' do

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: webvalve
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Sam Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,7 +93,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -147,9 +147,7 @@ files:
 - Rakefile
 - lib/generators/webvalve/fake_service_generator.rb
 - lib/generators/webvalve/install_generator.rb
-- lib/tasks/webvalve_tasks.rake
 - lib/webvalve.rb
-- lib/webvalve/engine.rb
 - lib/webvalve/fake_service.rb
 - lib/webvalve/fake_service_config.rb
 - lib/webvalve/fake_service_wrapper.rb
@@ -157,6 +155,7 @@ files:
 - lib/webvalve/instrumentation/log_subscriber.rb
 - lib/webvalve/instrumentation/middleware.rb
 - lib/webvalve/manager.rb
+- lib/webvalve/railtie.rb
 - lib/webvalve/rspec.rb
 - lib/webvalve/version.rb
 - spec/dummy/README.rdoc
@@ -189,11 +188,12 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/rails_helper.rb
+- spec/examples.txt
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/webvalve/fake_service_config_spec.rb
@@ -259,10 +259,11 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
+- spec/dummy/log/test.log
 - spec/dummy/README.rdoc
+- spec/examples.txt
 - spec/webvalve/fake_service_spec.rb
 - spec/webvalve/fake_service_config_spec.rb
 - spec/webvalve/manager_spec.rb
 - spec/webvalve_spec.rb
 - spec/support/helpers.rb
-- spec/rails_helper.rb

data/spec/rails_helper.rb

@@ -1,14 +0,0 @@
-ENV['RAILS_ENV'] ||= 'test'
-require File.expand_path('../dummy/config/environment', __FILE__)
-abort("The Rails environment is running in production mode!") if Rails.env.production?
-require 'spec_helper'
-require 'rspec/rails'
-require 'pry'
-Dir[Rails.root.join("#{WebValve::Engine.root}/spec/support/**/*.rb")].each { |f| require f }
-
-RSpec.configure do |config|
-  config.use_transactional_fixtures = true
-  config.infer_spec_type_from_file_location!
-  config.filter_rails_from_backtrace!
-  config.include Helpers
-end