figgy 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 499c24c1fd7a7e05cd66b372eca6346fb7da29c1
-  data.tar.gz: ac9627e72c4c9523e9edd4b02dea51a5547a3f3d
+  metadata.gz: 5be4c7010520f7045983d8c3c1d3328026a870d9
+  data.tar.gz: 82dc97e42a79c6a5ffd3bab665373aad229a28c8
 SHA512:
-  metadata.gz: 8756cc7930b50be03ed15cf75b2a296537e9bebeb02457fee2d8a4036289600efdb30527bd60f9a26acb03da2e23106c4d7c3bd9f1891b4c2fb143261a1087b0
-  data.tar.gz: 4eca2e791b7aae2f972d63826e4d57442cc277e553486411efb41387358def8825827619c9e2ec067bf17b31e782e1dd1a6ba921b8ad04e272eac0dad86fbbee
+  metadata.gz: f35abdc5ab055703069215b2cb0a9e798fe9e5d30d5cd6cc57755adfdc2f9e8b60718e07d311aaabc598a644942341ee62e85b75ce130c032407b593e0fe5ecc
+  data.tar.gz: f00088e94ee6c7770ec41521ec39b43d6f702743a11a31a251e883b30f3d5915ed89bdef0c70c499f1f65a7e09af818a8d3845ba77a7d7452ef6a36027c4fcf5

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 .bundle
 Gemfile.lock
+*.gemfile.lock
 pkg/*
 coverage
 tmp/

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--warnings

data/.simplecov

@@ -0,0 +1,11 @@
+begin
+  require 'coveralls'
+
+  SimpleCov.formatters = [
+    Coveralls::SimpleCov::Formatter,
+    SimpleCov::Formatter::HTMLFormatter,
+  ]
+
+  SimpleCov.start
+rescue LoadError
+end

data/.travis.yml

@@ -1,9 +1,16 @@
 language: ruby
 cache: bundler
 rvm:
-  - 1.8.7
-  - 1.9
   - 2.0
   - 2.1
   - 2.2
-  - rbx-2
+  - 2.3
+
+before_install: gem install bundler
+
+matrix:
+  include:
+    - rvm: 1.8.7
+      gemfile: gemfiles/ruby-1.8.7.gemfile
+    - rvm: 1.9
+      gemfile: gemfiles/ruby-1.9.gemfile

data/Gemfile

@@ -1,4 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in figgy.gemspec
 gemspec
+
+gem 'coveralls'

data/figgy.gemspec

@@ -21,7 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", '~> 3.0'
   s.add_development_dependency "simplecov", '~> 0.9'
-  s.add_development_dependency "coveralls"
-  s.add_development_dependency "rest-client", '1.6.8' if RUBY_VERSION == "1.8.7"
   s.add_development_dependency "heredoc_unindent"
 end

data/gemfiles/ruby-1.8.7.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in figgy.gemspec
+gemspec :path => '..'
+
+gem 'rake', '< 11'
+gem 'json', '< 2'

data/gemfiles/ruby-1.9.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in figgy.gemspec
+gemspec path: '..'
+
+gem 'json', '< 2'

data/lib/figgy/configuration.rb

@@ -128,7 +128,7 @@ class Figgy
     end
 
     def overlay_values
-      @overlays.map &:last
+      @overlays.map(&:last)
     end
   end
 end

data/lib/figgy/finder.rb

@@ -22,7 +22,7 @@ class Figgy
         raise(Figgy::FileNotFound, "Can't find config files for key: #{name.inspect}")
       end
 
-      result = files.reduce(nil) do |result, file|
+      final_result = files.reduce(nil) do |result, file|
         object = @config.handler_for(file).call(File.read(file))
         if result && result.respond_to?(:merge)
           deep_merge(result, object)
@@ -31,7 +31,7 @@ class Figgy
         end
       end
 
-      deep_freeze(to_figgy_hash(result))
+      deep_freeze(to_figgy_hash(final_result))
     end
 
     # @param [String] name the configuration key to search for

data/lib/figgy/hash.rb

@@ -17,6 +17,10 @@ class Figgy
       super(convert_key(key), value)
     end
 
+    def fetch(key, *extras)
+      super(convert_key(key), *extras)
+    end
+
     def delete(key)
       super(convert_key(key))
     end
@@ -36,6 +40,10 @@ class Figgy
       self
     end
 
+    def dig(*keys)
+      super(*keys.map { |k| convert_key(k) })
+    end if ::Hash.method_defined?(:dig)
+
     def respond_to?(m, *)
       super || key?(convert_key(m))
     end if RUBY_VERSION == "1.8.7"

data/lib/figgy/version.rb

@@ -1,3 +1,3 @@
 class Figgy
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/figgy_spec.rb

@@ -49,8 +49,8 @@ describe Figgy do
       write_config 'values.yml', 'foo: 1'
       write_config 'values.yaml', 'foo: 2'
 
-      config = test_config do |config|
-        config.define_handler('yml', 'yaml') { |body| YAML.load(body) }
+      config = test_config do |cfg|
+        cfg.define_handler('yml', 'yaml') { |body| YAML.load(body) }
       end
       expect(config.values.foo).to eq(2)
     end
@@ -170,6 +170,27 @@ describe Figgy do
       it "can merge with another hash" do
         expect(config.values.with.merge(config.values.another)).to eq(config.values.altogether)
       end
+
+      it 'can fetch a key with a default value' do
+        expect(config.values.without.fetch('two')).to eq(config.values.without.two)
+        expect(config.values.without.fetch(:two)).to  eq(config.values.without.two)
+
+        expect { config.values.without.fetch('one') }.to raise_error(/key not found/)
+        expect { config.values.without.fetch(:one) }.to  raise_error(/key not found/)
+
+        expect(config.values.without.fetch('one', 1)).to eq 1
+        expect(config.values.without.fetch(:one, 1)).to  eq 1
+
+        expect(config.values.without.fetch('three') { 3 } ).to eq 3
+        expect(config.values.without.fetch(:three) { 3 } ).to  eq 3
+      end
+
+      it 'can dig for nested values' do
+        skip if RUBY_VERSION < '2.3.0'
+
+        expect(config.values.dig(:without, 'two')).to eq config.values.without.two
+        expect(config.values.dig(:without, 'one')).to eq nil
+      end
     end
   end
 
@@ -200,9 +221,9 @@ describe Figgy do
       write_config 'root1/values', 'foo: 1'
       write_config 'root2/values', 'bar: 2'
 
-      config = test_config do |config|
-        config.root = File.join(current_dir, 'root1')
-        config.add_root File.join(current_dir, 'root2')
+      config = test_config do |cfg|
+        cfg.root = File.join(current_dir, 'root1')
+        cfg.add_root File.join(current_dir, 'root2')
       end
 
       expect(config.values.foo).to eq(1)
@@ -215,10 +236,10 @@ describe Figgy do
       write_config 'root2/values',      'bar: 1'
       write_config 'root2/prod/values', 'bar: 2'
 
-      config = test_config do |config|
-        config.root = File.join(current_dir, 'root1')
-        config.add_root File.join(current_dir, 'root2')
-        config.define_overlay :environment, 'prod'
+      config = test_config do |cfg|
+        cfg.root = File.join(current_dir, 'root1')
+        cfg.add_root File.join(current_dir, 'root2')
+        cfg.define_overlay :environment, 'prod'
       end
 
       expect(config.values.foo).to eq(2)
@@ -230,10 +251,10 @@ describe Figgy do
       write_config 'root1/prod/values', 'foo: 2'
       write_config 'root2/prod/values', 'foo: 3'
 
-      config = test_config do |config|
-        config.root = File.join(current_dir, 'root1')
-        config.add_root File.join(current_dir, 'root2')
-        config.define_overlay :environment, 'prod'
+      config = test_config do |cfg|
+        cfg.root = File.join(current_dir, 'root1')
+        cfg.add_root File.join(current_dir, 'root2')
+        cfg.define_overlay :environment, 'prod'
       end
 
       expect(config.values.foo).to eq(2)
@@ -248,16 +269,16 @@ describe Figgy do
 
     it "interprets a nil overlay value as an indication to read from the config root" do
       write_config 'values', "foo: 1"
-      config = test_config do |config|
-        config.define_overlay :default, nil
+      config = test_config do |cfg|
+        cfg.define_overlay :default, nil
       end
       expect(config.values).to eq({ "foo" => 1 })
     end
 
     it "allows the overlay's value to be the result of a block" do
       write_config 'prod/values', "foo: 1"
-      config = test_config do |config|
-        config.define_overlay(:environment) { 'prod' }
+      config = test_config do |cfg|
+        cfg.define_overlay(:environment) { 'prod' }
       end
       expect(config.values).to eq({ "foo" => 1 })
     end
@@ -266,9 +287,9 @@ describe Figgy do
       write_config 'some_string', "foo bar baz"
       write_config 'prod/some_string', "foo bar baz quux"
 
-      config = test_config do |config|
-        config.define_overlay :default, nil
-        config.define_overlay :environment, 'prod'
+      config = test_config do |cfg|
+        cfg.define_overlay :default, nil
+        cfg.define_overlay :environment, 'prod'
       end
 
       expect(config.some_string).to eq("foo bar baz quux")
@@ -287,9 +308,9 @@ describe Figgy do
       quux: hi!
       YML
 
-      config = test_config do |config|
-        config.define_overlay :default, 'defaults'
-        config.define_overlay :environment, 'prod'
+      config = test_config do |cfg|
+        cfg.define_overlay :default, 'defaults'
+        cfg.define_overlay :environment, 'prod'
       end
 
       expect(config.values).to eq({ "foo" => { "bar" => 1, "baz" => 3 }, "quux" => "hi!" })
@@ -298,9 +319,9 @@ describe Figgy do
     it "can use both a nil overlay and an overlay with a value" do
       write_config 'values', "foo: 1\nbar: 2"
       write_config 'prod/values', "foo: 2"
-      config = test_config do |config|
-        config.define_overlay :default, nil
-        config.define_overlay :environment, 'prod'
+      config = test_config do |cfg|
+        cfg.define_overlay :default, nil
+        cfg.define_overlay :environment, 'prod'
       end
       expect(config.values).to eq({ "foo" => 2, "bar" => 2 })
     end
@@ -321,10 +342,10 @@ describe Figgy do
       baz: 3
       YML
 
-      config = test_config do |config|
-        config.define_overlay :default, 'defaults'
-        config.define_overlay :environment, 'prod'
-        config.define_overlay :local, 'local'
+      config = test_config do |cfg|
+        cfg.define_overlay :default, 'defaults'
+        cfg.define_overlay :environment, 'prod'
+        cfg.define_overlay :local, 'local'
       end
 
       expect(config.values).to eq({ "foo" => 1, "bar" => 2, "baz" => 3 })
@@ -337,11 +358,11 @@ describe Figgy do
       write_config 'prod/keys', "foo: 2"
       write_config 'prod_US/keys', "foo: 3"
 
-      config = test_config do |config|
-        config.define_overlay :default, nil
-        config.define_overlay :environment, 'prod'
-        config.define_overlay :country, 'US'
-        config.define_combined_overlay :environment, :country
+      config = test_config do |cfg|
+        cfg.define_overlay :default, nil
+        cfg.define_overlay :environment, 'prod'
+        cfg.define_overlay :country, 'US'
+        cfg.define_combined_overlay :environment, :country
       end
 
       expect(config.keys).to eq({ "foo" => 3 })
@@ -351,8 +372,8 @@ describe Figgy do
   context "reloading" do
     it "can reload on each access when config.always_reload = true" do
       write_config 'values', 'foo: 1'
-      config = test_config do |config|
-        config.always_reload = true
+      config = test_config do |cfg|
+        cfg.always_reload = true
       end
       expect(config.values).to eq({ "foo" => 1 })
 
@@ -362,8 +383,8 @@ describe Figgy do
 
     it "does not reload when config.always_reload = false" do
       write_config 'values', 'foo: 1'
-      config = test_config do |config|
-        config.always_reload = false
+      config = test_config do |cfg|
+        cfg.always_reload = false
       end
       expect(config.values).to eq({ "foo" => 1 })
 
@@ -378,10 +399,10 @@ describe Figgy do
       write_config 'prod/values', 'foo: 2'
       write_config 'prod/prod_only', 'bar: baz'
 
-      config = test_config do |config|
-        config.define_overlay :default, nil
-        config.define_overlay :environment, 'prod'
-        config.preload = true
+      config = test_config do |cfg|
+        cfg.define_overlay :default, nil
+        cfg.define_overlay :environment, 'prod'
+        cfg.preload = true
       end
 
       write_config 'prod/values', 'foo: 3'
@@ -397,10 +418,10 @@ describe Figgy do
       write_config 'prod/lonely.yml', 'only: yml'
       write_config 'local/json_values.json', '{ "json": true }'
 
-      config = test_config do |config|
-        config.define_overlay :default, nil
-        config.define_overlay :environment, 'prod'
-        config.define_overlay :local, 'local'
+      config = test_config do |cfg|
+        cfg.define_overlay :default, nil
+        cfg.define_overlay :environment, 'prod'
+        cfg.define_overlay :local, 'local'
       end
 
       finder = config.instance_variable_get(:@finder)
@@ -410,9 +431,9 @@ describe Figgy do
     it "still supports reloading when preloading is enabled" do
       write_config 'values', 'foo: 1'
 
-      config = test_config do |config|
-        config.preload = true
-        config.always_reload = true
+      config = test_config do |cfg|
+        cfg.preload = true
+        cfg.always_reload = true
       end
 
       expect(config.values['foo']).to eq(1)
@@ -430,8 +451,8 @@ describe Figgy do
 
     it "freezes the results when config.freeze = true" do
       write_config 'values', "foo: '1'"
-      config = test_config do |config|
-        config.freeze = true
+      config = test_config do |cfg|
+        cfg.freeze = true
       end
       expect(config.values).to be_frozen
     end
@@ -446,8 +467,8 @@ describe Figgy do
           - and: an inner hash
       YML
 
-      config = test_config do |config|
-        config.freeze = true
+      config = test_config do |cfg|
+        cfg.freeze = true
       end
 
       expect { config.values.outer.array[2]['and'] = 'foo' }.to raise_error(/can't modify frozen/)

data/spec/spec_helper.rb

@@ -1,12 +1,4 @@
 require 'simplecov'
-require 'coveralls'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  Coveralls::SimpleCov::Formatter,
-  SimpleCov::Formatter::HTMLFormatter,
-]
-
-SimpleCov.start
 
 require 'rspec'
 require 'figgy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: figgy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Kyle Hargraves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: heredoc_unindent
   requirement: !ruby/object:Gem::Requirement
@@ -102,12 +88,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".simplecov"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - figgy.gemspec
+- gemfiles/ruby-1.8.7.gemfile
+- gemfiles/ruby-1.9.gemfile
 - lib/figgy.rb
 - lib/figgy/configuration.rb
 - lib/figgy/finder.rb
@@ -136,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Configuration file reading