action_subscriber 5.2.1-java → 5.2.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bca78c71253cc0e0b3c8f4c7b2ba62bc9b98919b5f66f057f14e29b6d646aba4
-  data.tar.gz: 38e3d342e82a51bbfc07cc6f8cf48d273723553b0946b3d00802269ad0ddb783
+  metadata.gz: 69350b95fb8b203e390c3aac19dc9d53af00b2c517bd465b47c415633109b107
+  data.tar.gz: 5d93a16416a0cd14595ae0e0e029988154496575501862b4ecdd7469754004e6
 SHA512:
-  metadata.gz: c4beea316e1c5f47b62ee9d49a450fd47c1b166e426cbdb625d96e198e2b995d76682144857ef62b114dafea062001b6bd329598b8830950980c8d0733ed3ebc
-  data.tar.gz: 1f6daf1342da85dca5c9b19054c4d801cc0c94781fe36cd4a1bbdbafb13901d9b827ae18b60677a0b2528b39eca06a2b984eb38083d4f88ae83a0d77f51db076
+  metadata.gz: 95909a21c18bdf27b56646b3431f200918618d30610dbab37d6afa6ca032e78695f603d9c8e3014f278346ce6493ee8e32f75526c3c51e71636d3d8595189b18
+  data.tar.gz: 680505cffe5b8b404b22e22246b104b58ef3e02cea0d0c501e56acb03d7daa3de03167067a9a26fa8147d89a8c12b89aab1b0cc98e3fd03f5bf6f0da21dd474b

data/lib/action_subscriber/configuration.rb

@@ -77,8 +77,8 @@ module ActionSubscriber
           end
 
           ::ActionSubscriber::Configuration::DEFAULTS.each_pair do |key, value|
-            setting = cli_options[key] || yaml_config[key.to_s]
-            ::ActionSubscriber.config.__send__("#{key}=", setting) if setting
+            exists, setting = fetch_config_value(key, cli_options, yaml_config)
+            ::ActionSubscriber.config.__send__("#{key}=", setting) if exists
           end
 
           true
@@ -86,6 +86,15 @@ module ActionSubscriber
       end
     end
 
+    def self.fetch_config_value(key, cli_options, yaml_config)
+      return [true, cli_options[key]] if cli_options.key?(key)
+      return [true, cli_options[key.to_s]] if cli_options.key?(key.to_s)
+      return [true, yaml_config[key]] if yaml_config.key?(key)
+      return [true, yaml_config[key.to_s]] if yaml_config.key?(key.to_s)
+      [false, nil]
+    end
+    private_class_method :fetch_config_value
+
     ##
     # Instance Methods
     #

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "5.2.1"
+  VERSION = "5.2.2"
 end

data/spec/lib/action_subscriber/configuration_spec.rb

@@ -24,6 +24,13 @@ describe ::ActionSubscriber::Configuration do
         ::ActionSubscriber::Configuration.configure_from_yaml_and_cli({}, true)
       end
     end
+
+    it "can override a true value with a false value" do
+      expect(::ActionSubscriber.configuration.verify_peer).to eq(true)
+      expect(::ActionSubscriber.configuration).to receive(:verify_peer=).with(false).and_call_original
+      ::ActionSubscriber::Configuration.configure_from_yaml_and_cli({"verify_peer" => false}, true)
+      expect(::ActionSubscriber.configuration.verify_peer).to eq(false)
+    end
   end
 
   describe "add_decoder" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement