configurate 0.0.8 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b1c77311fcc9be9b8545a349cb8a9352fac266ba
+  data.tar.gz: 23cc86a4bc3e0edad45c756eb77a27a97628cb3c
+SHA512:
+  metadata.gz: 0f9b04ce701034847ce8d337093a692bae175e75c8b68b30de0260bfe20520350f6d0112a0423df972d564321b23b4a91a35160d1186899fef1c3d2f61f64388
+  data.tar.gz: f48dbe835f2cb4b2102d8090a1b030612b19f52a7b2b23d517eb6cbc7bc748304a6cac4a1a6826eb90367ad77e73e783735b7bb9be02901766c8a5ea1680bf43

checksums.yaml.gz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAABAgAGBQJUJcgAAAoJEPNH4OtHrHDWwu0IAIPCkoGVvTACKyK1T3wq/1MY
+/Ea17MjRfBzNZ4vagFJd8LZAIf58ZFGYPiFhvZim26o7WVIf6BGUNDQUDC+CKAg6
+iFXfbPjXXjuB3v1mylZ81ZWcfkyClda2T95LHdsdJ52s/ciar2L1QvngM/MR1+Vr
+5nmnBS9OFA3/OsQVJKWi1oKClfz4RLFCcI16Y3gyH9WrsLFlCr2McJ/lTr6U/D8x
+XLrUEcMMYWK7G7qc0C9WKD7+Y/lVLpjZSWElC+Mm9dGpK0Q5K01RbU2zd8O15uDM
+ycwtvFvOnwdKjTRUx/m+LH5ey42nawOgtFhbmDmdwfJwo0gUTtqVvltNGnqgxKo=
+=ryWj
+-----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAABAgAGBQJRrlMbAAoJEPNH4OtHrHDWnC0H/RMF7kn/MJ6sDIugAmWQXK43
-BGyu3+oXLhDPkTOh090/xhajnDh2FqOFVgzdpJRTLkzffC5boy6gOw4c0FeOZJob
-Vm0SiaBBv6qY9PNhUjjcvIH611oaAU/5WLqydCKPl49WKmhd4LGoH/iTnKWeVJWs
-QPrYytfL7YDb8r0zAM/iQ39QI0Wtm+abPSY4zlBv5ZgkyRpbchYC7h7oetJYG9A1
-C8MmoKBA2+aIrWomCcPWTcpuDTFV41Kyrrts7y/4KVc/bpnZo6t56mWmiFDtiMOi
-WQ13Z49/2yMeLIQs5GW98ZS8r2EdkcW+ZzIJQuL7nPGmRqlRFgzs212qc/0gx/Y=
-=+Q/C
+iQEcBAABAgAGBQJUJcgAAAoJEPNH4OtHrHDW6fEH/1cAw0GslySQkuKPc2SvjC5r
+hc3rYNdp7P7RA+a4liD9d/qRjCYWvkV1/dg57B2/PouXT/e/D9+cCvRpgtu1E3lv
+Oecgh+mV/jR7mxfwr4xdLjGX0JajP/VnI/IEcxjLi7ht3tYkztdRACNhIzfjCqdc
+cGyV3dAbmt3bflf85YbDAUcQkkwnFOLCZQUfepgxjgv1/BBBEKXp68+5wge2q2co
++yTmV6LXU+2B8hwDwJpjB1V6lxJKh61gwK3zNexqsYLGn5C7SjxSBdObvs2wCAAR
+9XdG9pkpavHEiYBBXQe5zjDUIWRGIP+Y2/tfVTr74sQ76k7Q4bDSAovoVUwhVQs=
+=4Tkj
 -----END PGP SIGNATURE-----

data/Changelog.md

@@ -0,0 +1,45 @@
+# 0.1.0
+
+* Dynamic provider resolves nested assignments
+
+# 0.0.8
+
+* Include README.md into the gem
+* Skip namespace warning if there but empty
+* Do not overwrite dup in SettingPath
+* Fix tolerant loading of coveralls in the spec helper
+* Improve comparisions in Proxy
+
+# 0.0.7
+
+* Only directly delegate methods returning meta-information in SettingPath
+* Clean output of more methods in SettingPath
+* Sanitize more input methods in SettingPath
+
+# 0.0.6
+
+* Use Forwardable instead of method_missing where possible
+* Fix warning message on invalid namespace in YAML provider
+* Refactor SettingPath to correctly handle special paths in way more places
+* SettingPath#new now handles string paths, dropped SettingPath::from_string
+
+# 0.0.4/0.0.5
+
+* Pass duplicates of SettingPath into the provider so that it can be modified by it.
+* Ensure SettingPath elements are strings
+
+# 0.0.3
+
+* Support Ruby 2.0.0
+* Prefer `public_send` over `send`
+* Manage setting paths through dedicated objects
+* Pass new SettingPath objects directly into the providers
+* Improve specs
+
+# 0.0.2
+
+* Return duplicates from the environment provider so that the return value can be modified by the client.
+
+# 0.0.1
+
+* Initial release

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2012 Jonne Haß
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,9 +1,9 @@
 # Configurate - A flexible configuration system
 [![Gem Version](https://badge.fury.io/rb/configurate.png)](https://rubygems.org/gems/configurate)
-[![Build Status](https://secure.travis-ci.org/MrZYX/configurate.png?branch=master)](https://travis-ci.org/MrZYX/configurate)
+[![Build Status](https://secure.travis-ci.org/jhass/configurate.png?branch=master)](https://travis-ci.org/jhass/configurate)
 [![Gemnasium](https://gemnasium.com/MrZYX/configurate.png)](https://gemnasium.com/MrZYX/configurate)
-[![Code Climate](https://codeclimate.com/github/MrZYX/configurate.png)](https://codeclimate.com/github/MrZYX/configurate)
-[![Coverage Status](https://coveralls.io/repos/MrZYX/configurate/badge.png?branch=master)](https://coveralls.io/r/MrZYX/configurate)
+[![Code Climate](https://codeclimate.com/github/jhass/configurate.png)](https://codeclimate.com/github/MrZYX/configurate)
+[![Coverage Status](https://coveralls.io/repos/jhass/configurate/badge.png?branch=master)](https://coveralls.io/r/MrZYX/configurate)
 
 Configurate allows you to specify a chain of configuration providers which are
 queried in order until one returns a value. This allows scenarios like overriding
@@ -186,7 +186,7 @@ end
 
 ## Documentation
 
-You can find the current documentation for the master branch [here](http://rubydoc.info/github/MrZYX/configurate/master/frames/index).
+You can find the current documentation for the master branch [here](http://rubydoc.info/github/jhass/configurate/master/frames/index).
 
 
 ## License

data/lib/configurate/provider.rb

@@ -11,6 +11,20 @@ module Configurate; module Provider
       raise Configurate::SettingNotFoundError, "The setting #{args.first} was not found"
     end
   end
+
+  # Utility function to lookup a settings path in a hash
+  # @param setting_path [SettingPath]
+  # @param hash [Hash]
+  # @yield fallback value if not found
+  # @return [Object]
+  def self.lookup_in_hash setting_path, hash, &fallback
+    fallback ||= proc { nil }
+    while hash.is_a?(Hash) && hash.has_key?(setting_path.first) && !setting_path.empty?
+      hash = hash[setting_path.shift]
+    end
+    return fallback.call unless setting_path.empty?
+    hash
+  end
 end; end
 
 require 'configurate/provider/yaml'

data/lib/configurate/provider/dynamic.rb

@@ -7,17 +7,17 @@ module Configurate; module Provider
     def initialize
       @settings = {}
     end
-    
-    def lookup_path(setting_path, *args)      
-      key = setting_path.to_s
-      
+
+    def lookup_path(setting_path, *args)
       if setting_path.is_setter? && args.length > 0
         value = args.first
         value = value.get if value.respond_to?(:_proxy?) && value._proxy?
-        @settings[key] = value
+        *root, key = setting_path.to_a
+        hash = root.inject(@settings) {|hash, key| hash[key] ||= {} }
+        hash[key] = value
       end
-      
-      @settings[key]
+
+      Provider.lookup_in_hash setting_path, @settings
     end
   end
 end; end

data/lib/configurate/provider/yaml.rb

@@ -11,38 +11,27 @@ module Configurate; module Provider
     #   the file or the namespace, if given, is not found. Defaults to +true+.
     # @raise [ArgumentError] if the namespace isn't found in the file
     # @raise [Errno:ENOENT] if the file isn't found
-    def initialize(file, opts = {})
+    def initialize file, opts = {}
       @settings = {}
       required = opts.delete(:required) { true }
-      
+
       @settings = ::YAML.load_file(file)
-      
+
       namespace = opts.delete(:namespace)
       unless namespace.nil?
-        @settings = lookup_in_hash(SettingPath.new(namespace), @settings) do
+        @settings = Provider.lookup_in_hash(SettingPath.new(namespace), @settings) do
           raise ArgumentError, "Namespace #{namespace} not found in #{file}" if required
           $stderr.puts "WARNING: Namespace #{namespace} not found in #{file}"
+          nil
         end
       end
     rescue Errno::ENOENT => e
       $stderr.puts "WARNING: Configuration file #{file} not found, ensure it's present"
       raise e if required
     end
-    
-    
-    def lookup_path(setting_path, *)
-      lookup_in_hash(setting_path, @settings)
-    end
-    
-    private
-    
-    def lookup_in_hash(setting_path, hash, &fallback)
-      fallback ||= proc { nil }
-      while hash.is_a?(Hash) && hash.has_key?(setting_path.first) && !setting_path.empty?
-        hash = hash[setting_path.shift]
-      end
-      return fallback.call unless setting_path.empty?
-      hash
+
+    def lookup_path setting_path, *_
+      Provider.lookup_in_hash(setting_path, @settings)
     end
   end
 end; end

data/spec/configurate/lookup_chain_spec.rb

@@ -7,98 +7,98 @@ end
 
 describe Configurate::LookupChain do
   subject { described_class.new }
-  
+
   describe "#add_provider" do
     it "adds a valid provider" do
       expect {
         subject.add_provider ValidConfigurationProvider
       }.to change { subject.instance_variable_get(:@provider).size }.by 1
     end
-    
+
     it "doesn't add an invalid provider" do
       expect {
         subject.add_provider InvalidConfigurationProvider
       }.to raise_error ArgumentError
     end
-    
+
     it "passes extra args to the provider" do
-      ValidConfigurationProvider.should_receive(:new).with(:extra)
+      expect(ValidConfigurationProvider).to receive(:new).with(:extra)
       subject.add_provider ValidConfigurationProvider, :extra
     end
   end
-  
+
   describe "#lookup" do
     before do
       subject.add_provider ValidConfigurationProvider
       subject.add_provider ValidConfigurationProvider
       @provider = subject.instance_variable_get(:@provider)
     end
-    
+
     it "it tries all providers" do
       setting = Configurate::SettingPath.new "some.setting"
-      setting.stub(:clone).and_return(setting)
+      allow(setting).to receive(:clone).and_return(setting)
       @provider.each do |provider|
-        provider.should_receive(:lookup).with(setting).and_raise(Configurate::SettingNotFoundError)
+        expect(provider).to receive(:lookup).with(setting).and_raise(Configurate::SettingNotFoundError)
       end
-      
+
       subject.lookup(setting)
     end
 
     it "converts a string to a SettingPath" do
       provider = @provider.first
-      path = stub
-      path.stub(:clone).and_return(path)
-      provider.should_receive(:lookup).with(path).and_raise(Configurate::SettingNotFoundError)
+      path = double
+      allow(path).to receive(:clone).and_return(path)
+      expect(provider).to receive(:lookup).with(path).and_raise(Configurate::SettingNotFoundError)
       setting = "bar"
-      Configurate::SettingPath.should_receive(:new).with(setting).and_return(path)
+      expect(Configurate::SettingPath).to receive(:new).with(setting).and_return(path)
       subject.lookup(setting)
     end
 
     it "passes a copy of the SettingPath to the provider" do
       provider = @provider.first
-      path = mock("path")
-      copy = stub("copy")
-      path.should_receive(:clone).at_least(:once).and_return(copy)
-      provider.should_receive(:lookup).with(copy).and_raise(Configurate::SettingNotFoundError)
+      path = double("path")
+      copy = double("copy")
+      expect(path).to receive(:clone).at_least(:once).and_return(copy)
+      expect(provider).to receive(:lookup).with(copy).and_raise(Configurate::SettingNotFoundError)
       subject.lookup(path)
     end
-    
+
     it "stops if a value is found" do
-      @provider[0].should_receive(:lookup).and_return("something")
-      @provider[1].should_not_receive(:lookup)
+      expect(@provider[0]).to receive(:lookup).and_return("something")
+      expect(@provider[1]).to_not receive(:lookup)
       subject.lookup("bla")
     end
-    
+
     it "converts numbers to strings" do
-      @provider[0].stub(:lookup).and_return(5)
-      subject.lookup("foo").should == "5"
+      allow(@provider[0]).to receive(:lookup).and_return(5)
+      expect(subject.lookup "foo").to eq "5"
     end
-    
+
     it "does not convert false to a string" do
-      @provider[0].stub(:lookup).and_return(false)
-      subject.lookup("enable").should be_false
+      allow(@provider[0]).to receive(:lookup).and_return(false)
+      expect(subject.lookup "enable").to be_falsey
     end
 
     it "converts 'true' to true" do
-      @provider[0].stub(:lookup).and_return("true")
-      subject.lookup("enable").should be_true
+      allow(@provider[0]).to receive(:lookup).and_return("true")
+      expect(subject.lookup "enable").to be_truthy
     end
 
     it "converts 'false' to false" do
-      @provider[0].stub(:lookup).and_return("false")
-      subject.lookup("enable").should be_false
+      allow(@provider[0]).to receive(:lookup).and_return("false")
+      expect(subject.lookup "enable").to be_falsey
     end
 
     it "returns the value unchanged if it can't be converted" do
-      value = mock
-      value.stub(:respond_to?).with(:to_s).and_return(false)
-      @provider[0].stub(:lookup).and_return(value)
-      subject.lookup("enable").should == value
+      value = double
+      allow(value).to receive(:respond_to?).with(:to_s).and_return(false)
+      allow(@provider[0]).to receive(:lookup).and_return(value)
+      expect(subject.lookup "enable").to eq value
     end
-    
+
     it "returns nil if no value is found" do
-      @provider.each { |p| p.stub(:lookup).and_raise(Configurate::SettingNotFoundError) }
-      subject.lookup("not.me").should be_nil
+      @provider.each { |p| allow(p).to receive(:lookup).and_raise(Configurate::SettingNotFoundError) }
+      expect(subject.lookup "not.me").to be_nil
     end
   end
 end

data/spec/configurate/provider/dynamic_spec.rb

@@ -4,20 +4,24 @@ describe Configurate::Provider::Dynamic do
   subject { described_class.new }
   describe "#lookup_path" do
     it "returns nil if the setting was never set" do
-      subject.lookup_path(Configurate::SettingPath.new(["not_me"])).should be_nil
+      expect(subject.lookup_path Configurate::SettingPath.new(["not_me"]) ).to be_nil
     end
-    
+
     it "remembers the setting if it ends with =" do
-      subject.lookup_path(Configurate::SettingPath.new(["find_me", "later="]), "there")
-      subject.lookup_path(Configurate::SettingPath.new(["find_me", "later"])).should == "there"
+      subject.lookup_path Configurate::SettingPath.new(["find_me", "later="]), "there"
+
+      expect(subject.lookup_path Configurate::SettingPath.new(["find_me", "later"]) ).to eq "there"
     end
-    
+
     it "calls .get on the argument if a proxy object is given" do
-      proxy = mock
-      proxy.stub(:respond_to?).and_return(true)
-      proxy.stub(:_proxy?).and_return(true)
-      proxy.should_receive(:get)
-      subject.lookup_path(Configurate::SettingPath.new(["bla="]), proxy)
+      proxy = double(respond_to: true, _proxy?: true)
+      expect(proxy).to receive(:get)
+      subject.lookup_path Configurate::SettingPath.new(["bla="]), proxy
+    end
+
+    it "resolves nested calls after group assignment" do
+      subject.lookup_path Configurate::SettingPath.new(["find_me", "later="]), {"a" => "b"}
+      expect(subject.lookup_path Configurate::SettingPath.new(["find_me", "later", "a"])).to eq "b"
     end
   end
 end

data/spec/configurate/provider/env_spec.rb

@@ -9,26 +9,26 @@ describe Configurate::Provider::Env do
     ENV['EXISTING_SETTING'] = "there"
     ENV['ARRAY'] = "foo,bar,baz"
   end
-  
+
   after(:all) do
     ENV['EXISTING_SETTING'] = nil
     ENV['ARRAY'] = nil
   end
-  
+
   describe '#lookup_path' do
     it "joins and upcases the path" do
-      ENV.should_receive(:[]).with("EXISTING_SETTING")
-      subject.lookup_path(existing_path)
+      expect(ENV).to receive(:[]).with("EXISTING_SETTING")
+      subject.lookup_path existing_path
     end
-    
+
     it "returns nil if the setting isn't available" do
-      subject.lookup_path(not_existing_path).should be_nil
+      expect(subject.lookup_path not_existing_path).to be_nil
     end
-    
+
     it "makes an array out of comma separated values" do
-      subject.lookup_path(array_path).should == ["foo", "bar", "baz"]
+      expect(subject.lookup_path array_path).to eq ["foo", "bar", "baz"]
     end
-    
+
     it "returns a unfrozen string" do
       expect {
         setting = subject.lookup_path(existing_path)

data/spec/configurate/provider/yaml_spec.rb

@@ -2,80 +2,80 @@ require 'spec_helper'
 
 describe Configurate::Provider::YAML do
   let(:settings) { {"toplevel" => "bar",
-                    "some" => { 
+                    "some" => {
                       "nested" => { "some" => "lala", "setting" => "foo"}
                     }
                    } }
-  
+
   describe "#initialize" do
     it "loads the file" do
       file = "foobar.yml"
-      ::YAML.should_receive(:load_file).with(file).and_return({})
+      expect(::YAML).to receive(:load_file).with(file).and_return({})
       described_class.new file
     end
-    
+
     it "raises if the file is not found" do
-      ::YAML.stub(:load_file).and_raise(Errno::ENOENT)
+      allow(::YAML).to receive(:load_file).and_raise(Errno::ENOENT)
       expect {
         silence_stderr do
           described_class.new "foo"
         end
       }.to raise_error Errno::ENOENT
     end
-      
-    
+
+
     context "with a namespace" do
       it "looks in the file for that namespace" do
         namespace = "some.nested"
-        ::YAML.stub(:load_file).and_return(settings)
+        allow(::YAML).to receive(:load_file).and_return(settings)
         provider = described_class.new 'bla', namespace: namespace
-        provider.instance_variable_get(:@settings).should == settings['some']['nested']
+        expect(provider.instance_variable_get :@settings).to eq settings['some']['nested']
       end
-      
+
       it "raises if the namespace isn't found" do
-        ::YAML.stub(:load_file).and_return({})
+        allow(::YAML).to receive(:load_file).and_return({})
         expect {
           described_class.new 'bla', namespace: "bar"
-        }.to raise_error ArgumentError
+        }.to raise_error
       end
 
       it "works with an empty namespace in the file" do
-        ::YAML.stub(:load_file).and_return({'foo' => {'bar' => nil}})
+        allow(::YAML).to receive(:load_file).and_return({'foo' => {'bar' => nil}})
         expect {
           described_class.new 'bla', namespace: "foo.bar"
-        }.to_not raise_error ArgumentError
+        }.to_not raise_error
       end
     end
-    
+
     context "with required set to false" do
       it "doesn't raise if a file isn't found" do
-        ::YAML.stub(:load_file).and_raise(Errno::ENOENT)
+        allow(::YAML).to receive(:load_file).and_raise(Errno::ENOENT)
         expect {
           described_class.new "not_me", required: false
-        }.not_to raise_error Errno::ENOENT
+        }.not_to raise_error
       end
-      
+
       it "doesn't raise if a namespace isn't found" do
-        ::YAML.stub(:load_file).and_return({})
+        allow(::YAML).to receive(:load_file).and_return({})
         expect {
           described_class.new 'bla', namespace: "foo", required: false
-        }.not_to raise_error ArgumentError
+        }.not_to raise_error
       end
     end
   end
-  
+
   describe "#lookup_path" do
     before do
-      ::YAML.stub(:load_file).and_return(settings)
+      allow(::YAML).to receive(:load_file).and_return(settings)
       @provider = described_class.new 'dummy'
     end
-    
+
     it "looks up the whole nesting" do
-      @provider.lookup_path(["some", "nested", "some"]).should == settings["some"]["nested"]["some"]
+      expect(@provider.lookup_path ["some", "nested", "some"]).to eq settings["some"]["nested"]["some"]
     end
-    
+
     it "returns nil if no setting is found" do
-      @provider.lookup_path(["not_me"]).should be_nil
+      expect(@provider.lookup_path ["not_me"]).to be_nil
     end
   end
 end

data/spec/configurate/provider_spec.rb

@@ -5,12 +5,12 @@ describe Configurate::Provider::Base do
     subject { described_class.new }
     it "calls #lookup_path" do
       path = Configurate::SettingPath.new(["foo", "bar"])
-      subject.should_receive(:lookup_path).with(path).and_return("something")
-      subject.lookup(path).should == "something"
+      expect(subject).to receive(:lookup_path).with(path).and_return("something")
+      expect(subject.lookup(path)).to eq "something"
     end
-    
+
     it "raises SettingNotFoundError if the #lookup_path returns nil" do
-      subject.stub(:lookup_path).and_return(nil)
+      allow(subject).to receive(:lookup_path).and_return(nil)
       expect {
         subject.lookup("bla")
       }.to raise_error Configurate::SettingNotFoundError

data/spec/configurate/proxy_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Configurate::Proxy do
-  let(:lookup_chain) { mock(lookup: "something") }
+  let(:lookup_chain) { double(lookup: "something") }
   let(:proxy) { described_class.new(lookup_chain) }
 
   describe "in case statements" do
@@ -13,66 +13,64 @@ describe Configurate::Proxy do
                else
                 "wrong"
                end
-      result.should == "string"
+      expect(result).to eq "string"
     end
   end
-  
+
   describe "#method_missing" do
     it "calls #target if the method ends with a ?" do
-      lookup_chain.should_receive(:lookup).and_return(false)
+      expect(lookup_chain).to receive(:lookup).and_return(false)
       proxy.method_missing(:enable?)
     end
-    
+
     it "calls #target if the method ends with a =" do
-      lookup_chain.should_receive(:lookup).and_return(false)
+      expect(lookup_chain).to receive(:lookup).and_return(false)
       proxy.method_missing(:url=)
     end
   end
 
   describe "delegations" do
     it "calls the target when negating" do
-      target = mock
-      lookup_chain.stub(:lookup).and_return(target)
-      target.should_receive(:!)
+      target = double
+      allow(lookup_chain).to receive(:lookup).and_return(target)
+      expect(target).to receive(:!)
       proxy.something.__send__(:!)
     end
 
     it "enables sends even though be BasicObject" do
-      proxy.should_receive(:foo)
+      expect(proxy).to receive(:foo)
       proxy.send(:foo)
     end
   end
 
   describe "#proxy" do
     subject { proxy._proxy? }
-    it { should be_true }
+    it { should be_truthy }
   end
-  
+
   describe "#target" do
     [:to_str, :to_s, :to_xml, :respond_to?, :present?, :!=, :eql?,
      :each, :try, :size, :length, :count, :==, :=~, :gsub, :blank?, :chop,
      :start_with?, :end_with?].each do |method|
       it "is called for accessing #{method} on the proxy" do
-        target = mock
-        lookup_chain.stub(:lookup).and_return(target)
-        target.stub(:respond_to?).and_return(true)
-        target.stub(:_proxy?).and_return(false)
-        target.should_receive(method).and_return("something")
-        proxy.something.__send__(method, mock)
+        target = double(respond_to?: true, _proxy?: false)
+        allow(lookup_chain).to receive(:lookup).and_return(target)
+        expect(target).to receive(method).and_return("something")
+        proxy.something.__send__(method, double)
       end
     end
-    
+
     described_class::COMMON_KEY_NAMES.each do |method|
       it "is not called for accessing #{method} on the proxy" do
-        target = mock
-        lookup_chain.should_not_receive(:lookup)
-        target.should_not_receive(method)
-        proxy.something.__send__(method, mock)
+        target = double
+        expect(lookup_chain).to_not receive(:lookup)
+        expect(target).to_not receive(method)
+        proxy.something.__send__(method, double)
       end
     end
-    
+
     it "returns nil if no setting is given" do
-      proxy.target.should be_nil
+      expect(proxy.target).to be_nil
     end
   end
 end

data/spec/configurate/setting_path_spec.rb

@@ -9,7 +9,7 @@ describe Configurate::SettingPath do
   describe "#initialize" do
     context "with a string" do
       it "creates a path" do
-        described_class.new(long_path.to_s).should == long_path
+        expect(described_class.new long_path.to_s).to eq long_path
       end
     end
   end
@@ -17,24 +17,24 @@ describe Configurate::SettingPath do
   describe "#is_question?" do
     context "with a question signature as setting" do
       subject { question_path.is_question? }
-      it { should be_true }
+      it { should be_truthy }
     end
 
     context "with a normal path as setting" do
       subject { normal_path.is_question? }
-      it { should be_false }
+      it { should be_falsey }
     end
   end
 
   describe "#is_setter?" do
     context "with a setter signature as setting" do
-      subject { setter_path.is_setter? } 
-      it { should be_true }
+      subject { setter_path.is_setter? }
+      it { should be_truthy }
     end
 
     context "with a normal path as setting" do
       subject { normal_path.is_setter? }
-      it { should be_false }
+      it { should be_falsey }
     end
   end
 
@@ -43,8 +43,8 @@ describe Configurate::SettingPath do
       original = described_class.new ["foo", "bar"]
       copy = original.clone
       copy << "baz"
-      copy.should include "baz"
-      original.should_not include "baz"
+      expect(copy).to include "baz"
+      expect(original).not_to include "baz"
     end
   end
 
@@ -52,23 +52,23 @@ describe Configurate::SettingPath do
   describe "#is_question_or_setter?" do
     context "with a question signature as setting" do
       subject { question_path.is_question_or_setter? }
-      it { should be_true }
+      it { should be_truthy }
     end
 
     context "with a setter signature as setting" do
-      subject { setter_path.is_question_or_setter? } 
-      it { should be_true }
+      subject { setter_path.is_question_or_setter? }
+      it { should be_truthy }
     end
 
     context "with a normal path as setting" do
       subject { normal_path.is_question_or_setter? }
-      it { should be_false }
+      it { should be_falsey }
     end
   end
 
   describe "#each" do
     it "should strip special characters" do
-      long_path.all? { |c| c.include? "?" }.should be_false
+      expect(long_path.all? { |c| c.include? "?" }).to be_falsey
     end
   end
 
@@ -82,8 +82,8 @@ describe Configurate::SettingPath do
   [:<<, :unshift, :push].each do |method|
     describe "##{method}" do
       it 'converts the argument to a string' do
-        arg = mock
-        arg.should_receive(:to_s).and_return('bar')
+        arg = double
+        expect(arg).to receive(:to_s).and_return('bar')
         described_class.new.public_send method, arg
       end
     end
@@ -103,7 +103,7 @@ describe Configurate::SettingPath do
   describe "#inspect" do
     it "includes the dotted path" do
       path = described_class.new([:foo, :bar])
-      path.inspect.should include "foo.bar"
+      expect(path.inspect).to include "foo.bar"
     end
   end
 end

data/spec/configurate_spec.rb

@@ -3,21 +3,21 @@ require 'spec_helper'
 describe Configurate::Settings do
   describe "#method_missing" do
     subject { described_class.create }
-    
+
     it "delegates the call to a new proxy object" do
-      proxy = mock
-      Configurate::Proxy.should_receive(:new).and_return(proxy)
-      proxy.should_receive(:method_missing).with(:some_setting).and_return("foo")
+      proxy = double
+      expect(Configurate::Proxy).to receive(:new).and_return(proxy)
+      expect(proxy).to receive(:method_missing).with(:some_setting).and_return("foo")
       subject.some_setting
     end
   end
-  
+
   [:lookup, :add_provider, :[]].each do |method|
     describe "#{method}" do
       subject { described_class.create }
-      
+
       it "delegates the call to #lookup_chain" do
-        subject.lookup_chain.should_receive(method)
+        expect(subject.lookup_chain).to receive(method)
         subject.send(method)
       end
     end

data/spec/spec_helper.rb

@@ -20,7 +20,6 @@ def silence_stderr
 end
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -29,4 +28,8 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.expect_with :rspec do |expect_config|
+    expect_config.syntax = :expect
+  end
 end

metadata

@@ -1,100 +1,93 @@
 --- !ruby/object:Gem::Specification
 name: configurate
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Jonne Haß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.0'
 description: Configurate is a flexible configuration system that can read settings
   from multiple sources at the same time.
-email: me@mrzyx.de
+email: me@jhass.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Changelog.md
+- LICENSE
+- README.md
+- lib/configurate.rb
+- lib/configurate/lookup_chain.rb
+- lib/configurate/provider.rb
+- lib/configurate/provider/dynamic.rb
 - lib/configurate/provider/env.rb
 - lib/configurate/provider/yaml.rb
-- lib/configurate/provider/dynamic.rb
 - lib/configurate/proxy.rb
-- lib/configurate/lookup_chain.rb
-- lib/configurate/provider.rb
 - lib/configurate/setting_path.rb
-- lib/configurate.rb
-- README.md
-- spec/configurate/provider_spec.rb
 - spec/configurate/lookup_chain_spec.rb
-- spec/configurate/provider/yaml_spec.rb
-- spec/configurate/provider/env_spec.rb
 - spec/configurate/provider/dynamic_spec.rb
-- spec/configurate/setting_path_spec.rb
+- spec/configurate/provider/env_spec.rb
+- spec/configurate/provider/yaml_spec.rb
+- spec/configurate/provider_spec.rb
 - spec/configurate/proxy_spec.rb
-- spec/spec_helper.rb
+- spec/configurate/setting_path_spec.rb
 - spec/configurate_spec.rb
-homepage: http://mrzyx.github.com/configurate
+- spec/spec_helper.rb
+homepage: http://jhass.github.io/configurate
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 61337675234892431
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Flexbile configuration system
 test_files:
 - spec/configurate/provider_spec.rb

metadata.gz.asc

@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAABAgAGBQJRrlMbAAoJEPNH4OtHrHDWzAQH/jluldbgxLrHmdrfNGxDOfuy
-frt0ZFgpUBkySAh6D16fJeDOu1ziPao8wHM+G4WpvC+szE0kgPoAQV68ON2x4zCL
-FkidnZ0sKHe1z3VKWtl181Du+qbkdz8AhAigTtZPWd2BqR7wniKgvR5j31d553SX
-bQI9ojwOwbOjREmQ795wn/xILE8jkh2tOu+GuMR6TTqY2xXOz3Ccjl+muCDPmnW2
-lQzwodaCVweEzR2AZrkK+MNI5Wq8Ox56RYh1DfHr7nk0jRDCnlSKBl0++EdV3Ies
-eZ2gJBtPGRWk/bumqjaz60QS7m9BwUnq+HqkIQzrxlX/IeVY8cjZG8wyDkWwgxg=
-=vOi8
+iQEcBAABAgAGBQJUJcgAAAoJEPNH4OtHrHDWGi0H/1bZoFxs/WNJhIvM/NciG/lx
+VNgn9R/R46sRZqjCU4EXUAicWAOggNhF78d6XAbdQJSE2aiokBxQrE/tci6q4iDU
+I1LLbcahSmZle9fR2JsUpGtT7A8hyKYpCDUjUG7TY2Ktfas9qL1GEsDtPKVjmQNS
+l0GTg1JQ7XZHSkRAdBWHn9geGnQBQ7AqAqREIK/6+zSAaN7QNtBijIg9h4EyBWXb
+SDZILyvkgj6bt+eE+o32jrNleLMfJbGU9zlNl92l4O1bb5TspUKwq9JkpSR4ZRzd
+jkt5H+gXfwF0/zltejfLlkp50fwF3XnWgy9cEAh/BNTVPzT0HgfJzq3YBPlM7Vo=
+=QI26
 -----END PGP SIGNATURE-----