anyway_config 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a97f6978750cef7720cc23ca182e8a6456655cb8ece18d1becdcd5e58262b7b9
-  data.tar.gz: 5be2a8fc609273c759cef30b3eaf3c6d470716dc722ebd2a75a32b4209fe42a9
+  metadata.gz: af77cb70b9fea95ccb938643fcf462f04ef0087a1b3811de9e9f66e696f29ad5
+  data.tar.gz: 771eeb316a5a11d9bd8072dd7f506ddd5a02d36995ccf2facec3f40dcbc412ea
 SHA512:
-  metadata.gz: 4e7c52fde9b0db72b7429748d0950286facbd82731e98375494dbd4dedec4efd448cc83bc30df8802a98e25c8bd230587ee2d8e09475aab8541410df1208672e
-  data.tar.gz: 932f662e306d85328a9a9131dcb8daab211bb87ee2f1177b68cce1c3b8c315ab2bd4ac4cd2e148c992e02f3ac4bfa4a0c32600b345957f61178cdd9aaa3c3d79
+  metadata.gz: 87d5c17d6ec017474112df69685edcdfe9c7547ae7ad82b4338a4dd3493afeef50d6102fe87e7b0a5070aa6ad48f4872371515f32443a443bc324a67dcdfd918
+  data.tar.gz: 7c4cb678483573bb6a4db45ea5c78bbf1d077fcc7e5486fe4e420cae2c4de09224611d1925cdddebdc80ea767e140870b81bbcf39ce2be9515761846db70cc13

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 1.4.4 (2019-02-07)
+
+- Allow overriding default config file path via ENV with Rails integration ([@sponomarev][])
+
 ## 1.4.3 (2019-02-04)
 
 - Add a temporary fix for JRuby regression [#5550](https://github.com/jruby/jruby/issues/5550). ([@palkan][])
@@ -105,3 +109,4 @@ Initial version.
 [@dsalahutdinov]: https://github.com/dsalahutdinov
 [@charlie-wasp]: https://github.com/charlie-wasp
 [@jastkand]: https://github.com/jastkand
+[@sponomarev]: https://github.com/sponomarev

data/README.md

@@ -99,7 +99,6 @@ explicitly, and it will be used as is:
 ```ruby
 module MyCoolGem
   class Config < Anyway::Config
-    config_name :cool_gem
     env_prefix :really_cool # now variables, starting wih `REALLY_COOL_`, will be parsed
     attr_config user: 'root', password: 'root', host: 'localhost', options: {}
   end
@@ -136,7 +135,8 @@ config = Anyway::Config.for(:my_app)
 
 Your config will be filled up with values from the following sources (ordered by priority from low to high):
 
-- `RAILS_ROOT/config/my_cool_gem.yml` (for the current `RAILS_ENV`, supports `ERB`)
+- `RAILS_ROOT/config/my_cool_gem.yml` (for the current `RAILS_ENV`, supports `ERB`). You can override this setting
+through special environment variable – 'MYCOOLGEM_CONF' – containing the path to the YAML file.
 
 - `Rails.application.secrets.my_cool_gem`
 
@@ -144,10 +144,10 @@ Your config will be filled up with values from the following sources (ordered by
 
 ### Using with Ruby
 
-By default, Anyway Config is looking for a config YAML at `./config/<config-name>.yml`. You can override this setting
-through special environment variable – 'MYGEM_CONF' – containing the path to the YAML file.
+By default, Anyway Config is looking for a config YAML at `./config/<config-name>.yml` e.g. `./config/my_cool_gem.yml`.
+You can override this location the same way as for Rails.
 
-Environmental variables work the same way as with Rails.
+Environmental variables work the same way too.
 
 
 ### Config clear and reload

data/lib/anyway/config.rb

@@ -156,14 +156,12 @@ module Anyway # :nodoc:
     end
 
     def load_from_file(config)
-      config_path = Anyway.env.fetch(env_prefix).delete('conf') ||
-                    "./config/#{config_name}.yml"
       config.deep_merge!(parse_yml(config_path) || {}) if config_path && File.file?(config_path)
       config
     end
 
     def load_from_env(config)
-      config.deep_merge!(Anyway.env.fetch(env_prefix))
+      config.deep_merge!(env_part)
       config
     end
 
@@ -188,6 +186,18 @@ module Anyway # :nodoc:
 
     private
 
+    def env_part
+      Anyway.env.fetch(env_prefix)
+    end
+
+    def config_path
+      env_part.delete('conf') || default_config_path
+    end
+
+    def default_config_path
+      "./config/#{config_name}.yml"
+    end
+
     def set_value(key, val)
       send("#{key}=", val) if respond_to?(key)
     end

data/lib/anyway/rails/config.rb

@@ -18,7 +18,6 @@ module Anyway
     end
 
     def load_from_file(config)
-      config_path = Rails.root.join("config", "#{@config_name}.yml")
       config.deep_merge!(parse_yml(config_path)[Rails.env] || {}) if File.file? config_path
       config
     end
@@ -29,5 +28,11 @@ module Anyway
       end
       config
     end
+
+    private
+
+    def default_config_path
+      Rails.root.join("config", "#{config_name}.yml")
+    end
   end
 end

data/lib/anyway/version.rb

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

data/spec/config_spec.rb

@@ -69,6 +69,13 @@ describe Anyway::Config do
           expect(conf.user[:password]).to eq "root"
         end
       end
+
+      context "with overiden path" do
+        it "reads custom config path" do
+          ENV['COOL_CONF'] = Rails.root.join("config", "cool_custom.yml").to_s
+          expect(conf.host).to eq "custom.host"
+        end
+      end
     end
 
     describe "load from env" do

data/spec/dummy/config/cool_custom.yml

@@ -0,0 +1,2 @@
+test:
+  host: "custom.host"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,7 @@ files:
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/cool.yml
+- spec/dummy/config/cool_custom.yml
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/test.rb