anyway_config 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 823f018ceb705907a1036edc866bf656039b10d9
-  data.tar.gz: 99094de1c4829dd8400f08d1614fea2750ba005c
+  metadata.gz: e88db3a37e515c2b4fbcb002b3dbe984300fb800
+  data.tar.gz: b753b1df76dfc0d48b52a9cfc038b418df5a4fba
 SHA512:
-  metadata.gz: 2df8b0c108c4e52cae357201ee79f3504ebd951e35e2ab568aa800636be11fc3fb8f3ad5526dfec5b91055bb861ce9188bca832d08d615eaa1bba8a7dea9dfe1
-  data.tar.gz: c12bf044e159260ed53cafa28bc4ea75e187572df2b4fa31300444a31e1a9f670661f1798c091dfe4edd9d359ce728f33f42e720d982ea15badadd73a05d26e3
+  metadata.gz: 7421be11264c928c62e2edd22452e446f4c8995b40e13de5f748a94dbfa740654a2954128d0c690be085a95a8a92d983beabf00f5004cf0cf80377e1546c9723
+  data.tar.gz: 488df50e28e9469aa094c7b3b6b69fba76f835fa0070ed86ad81c25181e89562aa055dfb73cde5e12e45b64f660b7a9f289458c28fd8c253ba51d23c88e8312b

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change log
 
+## 1.1.3 (2017-12-20)
+
+- Allow to pass raw hash with explicit values to `Config.new`. ([@dsalahutdinov][])
+
+  Example:
+
+  ```ruby
+  Sniffer::Config.new(
+    overrides: {
+      enabled: true,
+      storage: {capacity: 500}
+    }
+  )
+  ```
+
+  See more https://github.com/palkan/anyway_config/pull/10
+
 ## 1.1.2 (2017-11-19)
 
 - Enable aliases for YAML. ([@onemanstartup][])
@@ -36,3 +53,4 @@ Initial version.
 
 [@palkan]: https://github.com/palkan
 [@onemanstartup]: https://github.com/onemanstartup
+[@dsalahutdinov]: https://github.com/dsalahutdinov

data/README.md

@@ -12,6 +12,8 @@ Libraries using Anyway Config:
 
 - [AnyCable](https://github.com/anycable/anycable)
 
+- [Sniffer](https://github.com/aderyabin/sniffer)
+
 - [and others](https://github.com/palkan/anyway_config/network/dependents).
 
 ## Installation
@@ -87,6 +89,23 @@ module MyCoolGem
 end
 ```
 
+#### Provide explicit values
+
+Sometimes it's useful to set some parameters explicitly during config initialization.
+You can do that using `overrides` option:
+
+```ruby
+config = MyCoolGem::Config.new(
+  overrides: {
+    user: 'john',
+    password: 'rubyisnotdead'
+  }
+)
+
+# The value would not be overriden from other sources (such as YML file, env)
+config.user == 'john'
+```
+
 ### Dynamic configuration
 
 You can also create configuration objects without pre-defined schema (just like `Rails.application.config_for` but more [powerful](#railsapplicationconfig_for-vs-anywayconfigfor)):
@@ -118,6 +137,7 @@ Environmental variables work the same way as with Rails.
 
 There are `#clear` and `#reload` functions on your config (which do exactly what they state).
 
+Note: `#reload` also accepts `overrides` key to provide explicit values (see above).
 
 ## `Rails.application.config_for` vs `Anyway::Config.for`
 

data/anyway_config.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.summary     = "Configuration DSL for Ruby libraries and applications"
   s.description = %{
     Configuration DSL for Ruby libraries and applications.
-
     Allows you to easily follow the twelve-factor application principles (https://12factor.net/config).
   }
 
@@ -24,6 +23,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.2'
 
   s.add_development_dependency "rspec", "~> 3.5"
-  s.add_development_dependency "rubocop", "~> 0.49"
+  s.add_development_dependency "rubocop", "~> 0.52"
   s.add_development_dependency "simplecov", ">= 0.3.8"
 end

data/lib/anyway/config.rb

@@ -44,21 +44,35 @@ module Anyway # :nodoc:
       #   my_config = Anyway::Config.for(:my_app)
       #   # will load data from config/my_app.yml, secrets.my_app, ENV["MY_APP_*"]
       def for(name)
-        new(name, false).load_from_sources
+        new(name: name, load: false).load_from_sources
       end
     end
 
     attr_reader :config_name
 
-    def initialize(config_name = nil, do_load = true)
-      @config_name = config_name || self.class.config_name
+    # Instantiate config with specified name, loads the data and applies overrides
+    #
+    # Example:
+    #
+    #   my_config = Anyway::Config.new(name: :my_app, load: true, overrides: { some: :value })
+    #
+    # rubocop:disable Metrics/LineLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    def initialize(config_name = nil, do_load = nil, name: nil, load: true, overrides: {})
+      unless config_name.nil? && do_load.nil?
+        warn "[Deprecated] Positional arguments for Anyway::Config#initialize will be removed in 1.2.0. Use keyword arguments instead: initialize(name:, load:, overrides:)"
+      end
+      name = config_name unless config_name.nil?
+      load = do_load unless do_load.nil?
+
+      @config_name = name || self.class.config_name
       raise ArgumentError, "Config name is missing" unless @config_name
-      load if do_load
+      self.load(overrides) if load
     end
+    # rubocop:enable Metrics/LineLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 
-    def reload
+    def reload(overrides = {})
       clear
-      load
+      load(overrides)
       self
     end
 
@@ -69,8 +83,10 @@ module Anyway # :nodoc:
       self
     end
 
-    def load
+    def load(overrides = {})
       config = load_from_sources((self.class.defaults || {}).deep_dup)
+
+      config.merge!(overrides) unless overrides.nil?
       config.each do |key, val|
         set_value(key, val)
       end
@@ -86,9 +102,7 @@ module Anyway # :nodoc:
     def load_from_file(config)
       config_path = Anyway.env.fetch(config_name).delete('conf') ||
                     "./config/#{config_name}.yml"
-      if config_path && File.file?(config_path)
-        config.deep_merge!(parse_yml(config_path) || {})
-      end
+      config.deep_merge!(parse_yml(config_path) || {}) if config_path && File.file?(config_path)
       config
     end
 

data/lib/anyway/rails/config.rb

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

data/lib/anyway/version.rb

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

data/spec/config_spec.rb

@@ -54,6 +54,11 @@ describe Anyway::Config do
         expect(conf.host).to eq "test.host"
       end
 
+      it "sets overrides after loading YAML" do
+        config = CoolConfig.new(overrides: { host: 'overrided.host' })
+        expect(config.host).to eq "overrided.host"
+      end
+
       if Rails.application.respond_to?(:secrets)
         it "load config from secrets" do
           expect(conf.user[:name]).to eq "test"
@@ -79,6 +84,17 @@ describe Anyway::Config do
         ENV['ANYWAY_SECRET_PASSWORD'] = 'my_pass'
         expect(conf.user[:password]).to eq 'my_pass'
       end
+
+      it "overrides loaded value by explicit" do
+        ENV['ANYWAY_SECRET_PASSWORD'] = 'my_pass'
+
+        config = CoolConfig.new(
+          overrides: {
+            user: { password: 'explicit_password' }
+          }
+        )
+        expect(config.user[:password]).to eq "explicit_password"
+      end
     end
 
     describe "clear" do
@@ -118,9 +134,7 @@ describe Anyway::Config do
       data = Anyway::Config.for(:my_app)
       expect(data[:test]).to eq 1
       expect(data[:name]).to eq 'my_app'
-      if Rails.application.respond_to?(:secrets)
-        expect(data[:secret]).to eq 'my_secret'
-      end
+      expect(data[:secret]).to eq 'my_secret' if Rails.application.respond_to?(:secrets)
     end
   end
 
@@ -133,6 +147,14 @@ describe Anyway::Config do
     end
   end
 
+  context "config with initial hash values" do
+    let(:conf) { SmallConfig.new(overrides: { 'meta': 'dummy' }) }
+
+    it "works" do
+      expect(conf.meta).to eq 'dummy'
+    end
+  end
+
   context "when name is missing" do
     let(:config) do
       Class.new(described_class)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.52'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
-description: "\n    Configuration DSL for Ruby libraries and applications.\n\n    Allows
+description: "\n    Configuration DSL for Ruby libraries and applications.\n    Allows
   you to easily follow the twelve-factor application principles (https://12factor.net/config).\n
   \ "
 email: