econfig 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cea87052bc286ddf6358f088fa55f43496f8781
-  data.tar.gz: 884f074a2bde2b167ba897b809bb10e02f2239d9
+  metadata.gz: f4ba24341ee1636314ae2fa645edd20fddacedf8
+  data.tar.gz: 8741ff1333019ae2ef21773bedf700beb497a3e0
 SHA512:
-  metadata.gz: 435d78b9d71c5bcbb41d8869887afe8f661e8f6ffe7747374cfef3dd6e8b3e565b0a4a9c949f701c316e47540c6a40a66e2ce335cd8e224da206e04198409dda
-  data.tar.gz: 8f63c476e95c66e8b064a0e63c01c471950b3ec0bdb9220d10c6265abb5698110f3745a6c918570418af2de0294c6ab6662bd161c1cb24d357fa29f3fa4afc87
+  metadata.gz: 8cdb9f56898c683166eb2fa29dc107fcba153e2daa0ea8358419504be251e39013339f9fd438835a368db05385bddc531fe391baac13923f3abff052f0c48f55
+  data.tar.gz: 6c1e783e2e0c2ba72ec2df956370da81269ee185faf6f1cec7bf2c92cb245bef4939eab20accaf7456e847a58b971c4c450170f770e980004579ef61b9b2f92e

data/lib/econfig.rb

@@ -17,12 +17,6 @@ module Econfig
     attr_accessor :root, :env, :instance
 
     def_delegators :instance, :backends, :default_write_backend, :default_write_backend=
-
-    def init
-      backends.each do |backend|
-        backend.init if backend.respond_to?(:init)
-      end
-    end
   end
 end
 

data/lib/econfig/backend_collection.rb

@@ -44,6 +44,11 @@ module Econfig
       @backends.delete_at(index_of!(name))
     end
 
+    def backend_for(key)
+      result = @backends.find { |(n, b)| b.has_key?(key) }
+      result[1] if result
+    end
+
   private
 
     def exists‽(name)

data/lib/econfig/configuration.rb

@@ -7,15 +7,19 @@ module Econfig
     end
 
     def fetch(key)
-      self[key] or raise Econfig::NotFound, "configuration key '#{key}' is not set"
+      key = key.to_s
+      backend = backends.backend_for(key)
+      if backend
+        backend.get(key)
+      else
+        raise Econfig::NotFound, "configuration key '#{key}' is not set"
+      end
     end
 
     def [](key)
-      backends.each do |backend|
-        value = backend.get(key.to_s)
-        return value if value
-      end
-      nil
+      key = key.to_s
+      backend = backends.backend_for(key)
+      backend.get(key) if backend
     end
 
     def []=(backend_name = default_write_backend, key, value)

data/lib/econfig/env.rb

@@ -1,5 +1,9 @@
 module Econfig
   class ENV
+    def has_key?(key)
+      ::ENV.has_key?(key.upcase)
+    end
+
     def get(key)
       ::ENV[key.upcase]
     end

data/lib/econfig/memory.rb

@@ -5,6 +5,10 @@ module Econfig
       @options = {}
     end
 
+    def has_key?(key)
+      @options.has_key?(key)
+    end
+
     def get(key)
       @options[key]
     end

data/lib/econfig/rails.rb

@@ -7,8 +7,6 @@ module Econfig
       Econfig.root = Rails.root
       Econfig.env = Rails.env
       Rails.application.config.app = Econfig.instance
-
-      Econfig.init
     end
   end
 end

data/lib/econfig/redis.rb

@@ -4,6 +4,10 @@ module Econfig
       @redis = redis
     end
 
+    def has_key?(key)
+      @redis.exists(key)
+    end
+
     def get(key)
       @redis.get(key)
     end

data/lib/econfig/version.rb

@@ -1,3 +1,3 @@
 module Econfig
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/lib/econfig/yaml.rb

@@ -1,31 +1,39 @@
+require "yaml"
+require "erb"
+
 module Econfig
   class YAML
     def initialize(path)
       @path = path
+      @mutex = Mutex.new
+      @options = nil
     end
 
     def get(key)
       options[key]
     end
 
-    def init
-      require "yaml"
-      require "erb"
-      if File.exist?(path)
-        @options = ::YAML.load(::ERB.new(File.read(path)).result)[Econfig.env]
-      else
-        @options = {}
-      end
+    def has_key?(key)
+      options.has_key?(key)
     end
 
   private
 
     def path
+      raise Econfig::UninitializedError, "Econfig.root is not set" unless Econfig.root
       File.expand_path(@path, Econfig.root)
     end
 
     def options
-      @options or raise Econfig::UninitializedError
+      return @options if @options
+
+      @mutex.synchronize do
+        @options ||= if File.exist?(path)
+          ::YAML.load(::ERB.new(File.read(path)).result)[Econfig.env] || {}
+        else
+          {}
+        end
+      end
     end
   end
 end

data/spec/configuration_spec.rb

@@ -10,24 +10,27 @@ describe Econfig::Configuration do
 
   describe "#[]" do
     it "returns response from first backend" do
+      backend.stub(:has_key?).with("foobar").and_return(true)
       backend.stub(:get).with("foobar").and_return("elephant")
       config["foobar"].should == "elephant"
     end
 
     it "casts key to string" do
+      backend.stub(:has_key?).with("foobar").and_return(true)
       backend.stub(:get).with("foobar").and_return("elephant")
       config[:foobar].should == "elephant"
     end
 
     it "tries multiple backends until it finds a response" do
-      backend.stub(:get).with("foobar").and_return(nil)
+      backend.stub(:has_key?).with("foobar").and_return(false)
+      other_backend.stub(:has_key?).with("foobar").and_return(true)
       other_backend.stub(:get).with("foobar").and_return("elephant")
       config["foobar"].should == "elephant"
     end
 
     it "returns nil if the key can't be found in any backend" do
-      backend.stub(:get).with("foobar").and_return(nil)
-      other_backend.stub(:get).with("foobar").and_return(nil)
+      backend.stub(:has_key?).with("foobar").and_return(false)
+      other_backend.stub(:has_key?).with("foobar").and_return(false)
       config["foobar"].should == nil
     end
   end
@@ -61,21 +64,30 @@ describe Econfig::Configuration do
 
   describe "#fetch" do
     it "returns response from first backend" do
+      backend.stub(:has_key?).with("foobar").and_return(true)
       backend.stub(:get).with("foobar").and_return("elephant")
       config.fetch("foobar").should == "elephant"
     end
 
     it "tries multiple backends until it finds a response" do
-      backend.stub(:get).with("foobar").and_return(nil)
+      backend.stub(:has_key?).with("foobar").and_return(false)
+      other_backend.stub(:has_key?).with("foobar").and_return(true)
       other_backend.stub(:get).with("foobar").and_return("elephant")
       config.fetch("foobar").should == "elephant"
     end
 
     it "raises error if the key can't be found in any backend" do
-      backend.stub(:get).with("foobar").and_return(nil)
-      other_backend.stub(:get).with("foobar").and_return(nil)
+      backend.stub(:has_key?).with("foobar").and_return(false)
+      other_backend.stub(:has_key?).with("foobar").and_return(false)
       expect { config.fetch("foobar") }.to raise_error(Econfig::NotFound)
     end
+
+    it "allows falsy responses" do
+      backend.stub(:has_key?).with("foobar").and_return(false)
+      other_backend.stub(:has_key?).with("foobar").and_return(true)
+      other_backend.stub(:get).with("foobar").and_return(false)
+      config.fetch("foobar").should == false
+    end
   end
 
   describe "#method_missing" do
@@ -84,23 +96,31 @@ describe Econfig::Configuration do
     end
 
     it "calls fetch for normal methods" do
+      backend.stub(:has_key?).with("foobar").and_return(true)
       backend.stub(:get).with("foobar").and_return("elephant")
       config.foobar.should == "elephant"
     end
 
     it "raises error if the key can't be found in any backend" do
-      backend.stub(:get).with("foobar").and_return(nil)
-      other_backend.stub(:get).with("foobar").and_return(nil)
+      backend.stub(:has_key?).with("foobar").and_return(false)
+      other_backend.stub(:has_key?).with("foobar").and_return(false)
       expect { config.foobar }.to raise_error(Econfig::NotFound)
     end
 
     it "returns nil if environment variable bypass is set" do
       ENV["ECONFIG_PERMISSIVE"] = "true"
-      backend.stub(:get).with("foobar").and_return(nil)
-      other_backend.stub(:get).with("foobar").and_return(nil)
+      backend.stub(:has_key?).with("foobar").and_return(false)
+      other_backend.stub(:has_key?).with("foobar").and_return(false)
       config.foobar.should be_nil
     end
 
+    it "allows falsy responses" do
+      backend.stub(:has_key?).with("foobar").and_return(false)
+      other_backend.stub(:has_key?).with("foobar").and_return(true)
+      other_backend.stub(:get).with("foobar").and_return(false)
+      config.foobar.should == false
+    end
+
     it "raises NoMethodError for bang methods" do
       expect { config.foobar! }.to raise_error(NoMethodError)
     end

data/spec/env_spec.rb

@@ -1,9 +1,27 @@
 describe Econfig::ENV do
   let(:backend) { Econfig::ENV.new }
+
+  before do
+    ENV["FOO_BAR"] = "monkey"
+  end
+
+  describe "#has_key?" do
+    it "returns true if key exists" do
+      backend.has_key?("foo_bar").should eq(true)
+    end
+
+    it "returns false if key is not set" do
+      backend.has_key?("does_not_exist").should eq(false)
+    end
+  end
+
   describe "#get" do
     it "fetches option from environment variables" do
-      ENV["FOO_BAR"] = "monkey"
       backend.get("foo_bar").should == "monkey"
     end
+
+    it "returns nil when not set" do
+      backend.get("does_not_exist").should == nil
+    end
   end
 end

data/spec/memory_spec.rb

@@ -1,5 +1,17 @@
 describe Econfig::Memory do
   let(:backend) { Econfig::Memory.new }
+
+  describe "#has_key?" do
+    it "returns true if key exists" do
+      backend.set("foo", "bar")
+      backend.has_key?("foo").should eq(true)
+    end
+
+    it "returns false if key is not set" do
+      backend.has_key?("foo").should eq(false)
+    end
+  end
+
   describe "#get" do
     it "fetches a previously set option" do
       backend.set("foo", "bar")

data/spec/redis_spec.rb

@@ -7,6 +7,18 @@ describe Econfig::Redis do
   after do |example|
     redis.flushdb
   end
+
+  describe "#has_key?" do
+    it "returns true if key exists" do
+      backend.set("foo", "bar")
+      backend.has_key?("foo").should eq(true)
+    end
+
+    it "returns false if key is not set" do
+      backend.has_key?("foo").should eq(false)
+    end
+  end
+
   describe "#get" do
     it "fetches a previously set option" do
       backend.set("foo", "bar")

data/spec/spec_helper.rb

@@ -2,4 +2,3 @@ require "econfig"
 
 Econfig.root = File.dirname(__FILE__)
 Econfig.env = "test"
-Econfig.init

data/spec/yaml_spec.rb

@@ -1,5 +1,21 @@
 describe Econfig::YAML do
-  let(:backend) { Econfig::YAML.new("config/app.yml").tap(&:init) }
+  let(:backend) { Econfig::YAML.new("config/app.yml") }
+
+  describe "#has_key?" do
+    it "returns true if option exists" do
+      expect(backend.has_key?("quox")).to eq(true)
+    end
+
+    it "returns false when the key does not exist" do
+      expect(backend.has_key?("does_not_exist")).to eq(false)
+    end
+
+    it "returns false when there is no config file" do
+      backend = Econfig::YAML.new("/does/not/exist")
+      expect(backend.has_key?("does_not_exist")).to eq(false)
+    end
+  end
+
   describe "#get" do
     it "fetches option from yaml config file" do
       backend.get("quox").should == "baz"
@@ -10,7 +26,7 @@ describe Econfig::YAML do
     end
 
     it "returns nil when there is no config file" do
-      backend = Econfig::YAML.new("/does/not/exist").tap(&:init)
+      backend = Econfig::YAML.new("/does/not/exist")
       backend.get("does_not_exist").should be_nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: econfig
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake