anyway_config 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdd74aa415435157e394ef1433722c7a579ff015e72923b095f9f7b25d02990e
-  data.tar.gz: d10f5c7bfc2a8f7908ae1b9a43efcc16da7682974aef1519772af482d75c6cd8
+  metadata.gz: b5deaa09c29ffb32bb0b6454e3c6efc5a3870b01caf4f7794034e7d329d65c43
+  data.tar.gz: 86b948b10fbfac5a56e2cd980a00144f9b6e538dab109923277c00f4466e1220
 SHA512:
-  metadata.gz: a6ac9bd78a2dbd84ae21124a3ad21556204fd6ebfe05dbb55276ac8ef8a94f5ae09ad070e51cf8e97fc3aca8e8f8126171b53e58ff4c81b012abdbbcc28a2779
-  data.tar.gz: 7da007e994e49579dba02fedf82814367c469be4872bba8aafec1b19f57eb3bd6b46bee03e5e98e60e14bbb28e26b3ba76bf16aa40006ae36438ed0dcae409eb
+  metadata.gz: 7bd2c01d521402aa0e1dc6ffae192c5a969383e8e7420a24d39af01b5af3d8e7cd62e084c52e093e8496a67b2007358bce586c0d2501745f1092b2fd7ef82903
+  data.tar.gz: 2a3e279019bca94cba9ec99084e4991ead85e36df3b9e7b9436774b04b520f0c3e4c2a33711a9d23cc2d2db404a534ca87e59f7e81182e540cc8502bc68b3d91

data/anyway_config.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.3'
 
   s.add_development_dependency "rspec", "~> 3.5"
-  s.add_development_dependency "rubocop", "~> 0.57.2"
+  s.add_development_dependency "rubocop", "~> 0.59.0"
   s.add_development_dependency "simplecov", ">= 0.3.8"
 end

data/lib/anyway/config.rb

@@ -31,12 +31,14 @@ module Anyway # :nodoc:
 
       def config_name(val = nil)
         return (@config_name = val.to_s) unless val.nil?
+
         @config_name = underscore_name unless defined?(@config_name)
         @config_name
       end
 
       def env_prefix(val = nil)
         return (@env_prefix = val.to_s) unless val.nil?
+
         @env_prefix
       end
 
@@ -54,6 +56,7 @@ module Anyway # :nodoc:
 
       def underscore_name
         return unless name
+
         word = name[/^(\w+)/]
         word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
         word.downcase!
@@ -75,7 +78,7 @@ module Anyway # :nodoc:
 
       raise ArgumentError, "Config name is missing" unless @config_name
 
-      if @config_name.to_s.include?('_') && @env_prefix.nil?
+      if @config_name.to_s.include?('_') && self.class.env_prefix.nil?
         warn "[Deprecated] As your config_name is #{@config_name}, " \
              "the prefix `#{@config_name.to_s.delete('_').upcase}` " \
              "will be used to parse env variables. " \
@@ -115,6 +118,7 @@ module Anyway # :nodoc:
     def load_from_sources(config = {})
       # Handle anonymous configs
       return config unless config_name
+
       load_from_file(config)
       load_from_env(config)
     end

data/lib/anyway/rails/config.rb

@@ -5,6 +5,7 @@ module Anyway
     class << self
       def defaults
         return unless @defaults
+
         @defaults_wia ||= @defaults.with_indifferent_access
       end
     end

data/lib/anyway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anyway # :nodoc:
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/config_spec.rb

@@ -100,6 +100,35 @@ describe Anyway::Config do
         end
       end
 
+      context "when config_name contains underscores" do
+        let(:conf) do
+          klass = CoolConfig.dup
+          klass.class_eval do
+            config_name :cool_thing
+          end
+          klass.new
+        end
+
+        it "warns user about deprecated behaviour" do
+          expect { conf }.to print_warning
+        end
+
+        context "when env_name is set" do
+          let(:conf) do
+            klass = CoolConfig.dup
+            klass.class_eval do
+              config_name :cool_thing
+              env_prefix  :cool_thing
+            end
+            klass.new
+          end
+
+          it "doesn't print deprecation warning" do
+            expect { conf }.not_to print_warning
+          end
+        end
+      end
+
       it "handle ENV in YML thru ERB" do
         ENV['ANYWAY_SECRET_PASSWORD'] = 'my_pass'
         expect(conf.user[:password]).to eq 'my_pass'

data/spec/support/print_warning_matcher.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :print_warning do |message|
+  def supports_block_expectations?
+    true
+  end
+
+  match do |block|
+    stderr = fake_stderr(&block)
+    message ? stderr.include?(message) : !stderr.empty?
+  end
+
+  description do
+    "write #{message && "\"#{message}\"" || 'anything'} to standard error"
+  end
+
+  failure_message do
+    "expected to #{description}"
+  end
+
+  failure_message_when_negated do
+    "expected not to #{description}"
+  end
+
+  # Fake STDERR and return a string written to it.
+  def fake_stderr
+    original_stderr = $stderr
+    $stderr = StringIO.new
+    yield
+    $stderr.string
+  ensure
+    $stderr = original_stderr
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 0.59.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: 0.59.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +103,7 @@ files:
 - spec/spec_helper.rb
 - spec/spec_norails_helper.rb
 - spec/support/cool_config.rb
+- spec/support/print_warning_matcher.rb
 - spec/support/small_config.rb
 - spec/support/test_config.rb
 homepage: http://github.com/palkan/anyway_config