webvalve 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85339410fa30aa4cb403ec0ec9466439a116e56e
-  data.tar.gz: 679473da643fc5b0dee1fc6e47d80943f20f0558
+  metadata.gz: d20ff6188f40da891f473d759c59756663969c5d
+  data.tar.gz: 25c6f27d9285afaa2d0affe93f1e6b34052b9d64
 SHA512:
-  metadata.gz: ee3ccf5b6d9820bf37023428235fc9716d5323f0bcc65e1dca00d38a37d3db3fbb73105ea2ff056ebb77646fa82caeb54b4d045623663952a4ce8a1a091a6554
-  data.tar.gz: e87a9ab43c489f4f652d6462672272976c6de1d6f372d0e3dafc2e0bd29865710f67b02e01ba23a550bce2a23e072e9dbf0b87d546fbf335f22370db8567a319
+  metadata.gz: 0c71debf9c31b8df724f6bf5751630a180dce3de6a3e3888057874abbb9533f6f8fca46b2198658eb3a00898792252c27dbb3aca041bbfc5e8a36737b46eb660
+  data.tar.gz: 197ad5715b1851d086b8ead3550318a937468bfa9b6b92072fb7743252a6075aac0db5882df8a4d0b2fb94743210fc242181785cc47e2b585dadc11c7a1c1143

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project aims to adhere to [Semantic Versioning](http://semver.org/spec/
 
 ## [Unreleased]
 
+## [0.9.7] - 2018-09-30
+### Changed
+- Improved WEBVALVED_ENABLED behavior from @haffla (https://github.com/Betterment/webvalve/pull/24)
+
 ## [0.9.6] - 2018-06-27
 ### Changed
 - fix changelog links
@@ -14,6 +18,7 @@ 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/v0.9.6...HEAD
+[Unreleased]: https://github.com/Betterment/webvalve/compare/v0.9.7...HEAD
+[0.9.7]: https://github.com/Betterment/webvalve/compare/v0.9.6...v0.9.7
 [0.9.6]: https://github.com/Betterment/webvalve/compare/v0.9.5...v0.9.6
 [0.9.5]: https://github.com/Betterment/webvalve/compare/v0.9.4...v0.9.5

data/lib/webvalve/railtie.rb

@@ -1,15 +1,17 @@
 module 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|
+      if WebValve.enabled?
         WebValve.config_paths << app.root
 
         WebValve.config_paths.each do |root|
           app.config.eager_load_paths << root.join('webvalve').to_s
         end
       end
+    end
 
-      initializer 'webvalve.setup' do
+    initializer 'webvalve.setup' do
+      if WebValve.enabled?
         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.6"
+  VERSION = "0.9.7"
 end

data/lib/webvalve.rb

@@ -16,6 +16,7 @@ module WebValve
     # @!method reset
     #   @see WebValve::Manager#reset
     delegate :setup, :register, :whitelist_url, :reset, to: :manager
+    attr_writer :logger
 
     def enabled?
       if env.in?(ALWAYS_ENABLED_ENVS)
@@ -35,8 +36,24 @@ module WebValve
       @config_paths ||= Set.new
     end
 
+    def logger
+      @logger ||=
+        if defined?(::Rails)
+          # Rails.logger can be nil
+          ::Rails.logger || default_logger
+        else
+          default_logger
+        end
+    end
+
+    def default_logger
+      ActiveSupport::Logger.new(STDOUT).tap do |l|
+        l.formatter = ::Logger::Formatter.new
+      end
+    end
+
     if defined?(::Rails)
-      delegate :env, :env=, :logger, :logger=, to: ::Rails
+      delegate :env, :env=, to: ::Rails
     else
       def env
         @env ||= (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development').inquiry
@@ -45,16 +62,6 @@ module WebValve
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webvalve
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Sam Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport