config 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 596c969d80cfb2d6801d31bba080085e92a4ac6a
-  data.tar.gz: 216e0648c48e36e8500d12158c8d337146a7db1c
+  metadata.gz: 73118a0190819d693e81132bc4a2746a453dd74d
+  data.tar.gz: 5c6a339dcfa60f444269f0ba45da298656297471
 SHA512:
-  metadata.gz: fa84888d4bbc7c706a408c377771ffbd20bb1d2711a1eaf6aa49a068dac7e93fe5523187416c0ae5e47f891cf144ce697bfdfcab1127339bba9931a96738ba9b
-  data.tar.gz: acaff95833ee702ce60d99284284e8db0dc5682b54ce1d4afb3c4af235702370bca792ccfa395f070d1e6b45de19726ec25523f1f7621155bf0986a8ffa6b9d3
+  metadata.gz: a28428c4f956dacbd9032fa97037819a15956eb0d694a48a4250425d3902ef9fd13bb67fcfdb011d1c67ea043476a386c2dd6e729de85a846ad13d2b772c67a5
+  data.tar.gz: 35fa737c860ca76a6c6aac73ccbdab4e5e399cfdf214d357e26cdd9e00fa1e3652a4701bfb73adcca498981cf67bd10c35088fe510d925605f43087f7cccee0b

data/CHANGELOG.md

@@ -1,8 +1,14 @@
 # Changelog
 
+## 1.4.0
+
+* Added support for passing a raw ruby hash into to both `Settings.add_source!` and `Settings.prepend_source!` ([#108](https://github.com/railsconfig/config/pull/159) thanks to [@halloffame](https://github.com/halloffame))
+* Added new reserved name `test` ([#158](https://github.com/railsconfig/config/pull/158) thanks to [@milushov](https://github.com/milushov))
+* `to_hash` should not replace nested config objects with Hash ([#160](https://github.com/railsconfig/config/issues/160) thanks to [@seikichi](https://github.com/seikichi))
+
 ## 1.3.0
 
-* **WARNING:** Overwrite arrays found in previously loaded settings file ([#137](https://github.com/railsconfig/config/pull/137) thanks to [@Fryguy](https://github.com/Fryguy) and [@dtaniwaki](https://github.com/dtaniwaki)) - this is a change breaking previous behaviour. If you want to keep Config to work as before, which is merging arrays found in following loaded settings file, please add `config.overwrite_arrays = true` to your Config initializer 
+* **WARNING:** Overwrite arrays found in previously loaded settings file ([#137](https://github.com/railsconfig/config/pull/137) thanks to [@Fryguy](https://github.com/Fryguy) and [@dtaniwaki](https://github.com/dtaniwaki)) - this is a change breaking previous behaviour. If you want to keep Config to work as before, which is merging arrays found in following loaded settings file, please add `config.overwrite_arrays = false` to your Config initializer 
 * Changed default ENV variables loading settings to downcase variable names and parse values
 * Added parsing ENV variables values to Float type
 * Change method definition order in Rails integration module to prevent undefined method `preload` error (based on [@YaroSpace](https://github.com/YaroSpace) suggestion in [#111](https://github.com/railsconfig/config/issues/111)

data/README.md

@@ -64,6 +64,15 @@ set :root, File.dirname(__FILE__)
 register Config
 ```
 
+### Installing on other ruby projects
+
+Add the gem to your `Gemfile` and run `bundle install` to install it.
+Then initialize `Config` manually within your configure block.
+
+```ruby
+Config.load_and_set_settings(Config.setting_files("/path/to/config_root", "your_project_environment"))
+```
+
 It's also possible to initialize `Config` manually within your configure block if you want to just give it some yml
 paths to load from.
 
@@ -184,6 +193,15 @@ Settings.reload!
 > Note: this is an example usage, it is easier to just use the default local files `settings.local.yml,
 settings/#{Rails.env}.local.yml and environments/#{Rails.env}.local.yml` for your developer specific settings.
 
+You also have the option to add a raw hash as a source. One use case might be storing settings in the database or in environment variables that overwrite what is in the YML files.
+
+```ruby
+Settings.add_source!({some_secret: ENV['some_secret']})
+Settings.reload!
+```
+
+You may pass a hash to `prepend_source!` as well.
+
 ## Embedded Ruby (ERB)
 
 Embedded Ruby is allowed in the configuration files. Consider the two following config files.

data/lib/config.rb

@@ -5,6 +5,7 @@ require 'config/options'
 require 'config/version'
 require 'config/integrations/rails/engine' if defined?(::Rails)
 require 'config/sources/yaml_source'
+require 'config/sources/hash_source'
 require 'deep_merge'
 
 module Config

data/lib/config/options.rb

@@ -15,6 +15,7 @@ module Config
     def add_source!(source)
       # handle yaml file paths
       source = (Sources::YAMLSource.new(source)) if source.is_a?(String)
+      source = (Sources::HashSource.new(source)) if source.is_a?(Hash)
 
       @config_sources ||= []
       @config_sources << source
@@ -22,6 +23,7 @@ module Config
 
     def prepend_source!(source)
       source = (Sources::YAMLSource.new(source)) if source.is_a?(String)
+      source = (Sources::HashSource.new(source)) if source.is_a?(Hash)
 
       @config_sources ||= []
       @config_sources.unshift(source)
@@ -126,7 +128,7 @@ module Config
     end
 
     # Some keywords that don't play nicely with OpenStruct
-    SETTINGS_RESERVED_NAMES = %w{select collect}
+    SETTINGS_RESERVED_NAMES = %w{select collect test}
 
     # An alternative mechanism for property access.
     # This let's you do foo['bar'] along with foo.bar.
@@ -148,15 +150,15 @@ module Config
     protected
 
     def descend_array(array)
-      array.length.times do |i|
-        value = array[i]
+      array.map do |value|
         if value.instance_of? Config::Options
-          array[i] = value.to_hash
+          value.to_hash
         elsif value.instance_of? Array
-          array[i] = descend_array(value)
+          descend_array(value)
+        else
+          value
         end
       end
-      array
     end
 
     # Recursively converts Hashes to Options (including Hashes inside Arrays)

data/lib/config/sources/hash_source.rb

@@ -0,0 +1,16 @@
+module Config
+  module Sources
+    class HashSource
+      attr_accessor :hash
+
+      def initialize(hash)
+        @hash = hash
+      end
+
+      # returns hash that was passed in to initialize
+      def load
+        hash.is_a?(Hash) ? hash : {}
+      end
+    end
+  end
+end

data/lib/config/version.rb

@@ -1,3 +1,3 @@
 module Config
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Piotr Kuczynski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -265,6 +265,7 @@ files:
 - lib/config/integrations/sinatra.rb
 - lib/config/options.rb
 - lib/config/rack/reloader.rb
+- lib/config/sources/hash_source.rb
 - lib/config/sources/yaml_source.rb
 - lib/config/tasks/heroku.rake
 - lib/config/version.rb
@@ -297,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Effortless multi-environment settings in Rails, Sinatra, Pandrino and others