conferred 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ca81ecce48b54d2665c4a672136ba54f6dd123e
-  data.tar.gz: b804e9540b55f7adcdfb89f1959f1bf4f0dbd51b
+  metadata.gz: f8711bba8f2ccbb40233e7818df22ef4429d86cb
+  data.tar.gz: a7eef9286f5ba1ff16c98d47a6b053152114f630
 SHA512:
-  metadata.gz: 81afad6a3bab313c253f9b0c8dd72992f05c952e78f526823a1b2ed6a92e8e8e41855c9d53dc2adf58d90acf3531d6ca62ad8d342449e35dc52d985def799ad0
-  data.tar.gz: 16ef081d0d2289deae6b13aff81f58d29f717223d6343052055ba1b110c8d0edc1223a3b1214179c1556916f7f8d7046773b690ea1750060217cbe2a3d244ec4
+  metadata.gz: f653a30ca067c1be29153a5b7bb28801f77746ac060c396b8e559198f8f51e7d3075874df264253419bdfc1bd1755c9a6e0ad825bbcedb6731d54a618a38c32c
+  data.tar.gz: ee5c32b780d81224803a9212609048ac980a35a42cf5fbb5241307a1cb266c8ac0a4da6b206907879e35b7979293b190c45a18cc44fa48cb94f6d8d298660bd7

data/README.rdoc

@@ -12,6 +12,7 @@ http://12factor.net/config
 == Usage
 
 to access the environment use:
+------------------------------
 
     Conferred.gmail_user
     # returns ENV['GMAIL_USER']
@@ -23,13 +24,20 @@ to access the environment use:
     # returns ENV['GMAIL_USER'] if it has a non blank value
     # otherwise raises an error
 
-to access etcd settings
+to access etcd settings:
+------------------------
   
     Conferred.provider = :etcd
     Conferred.namespace = :my_app
     Conferred.gmail_user
     # returns the value of etcd key at "http://localhost:2379/v2/keys/:my_app/gmail_user"
+    # if etcd does not respond with a value try to lookup in the environment
 
+to configure from the enviromnent:
+----------------------------------
+
+export CONFERRED_PROVIDER=etcd
+export CONFERRED_ETCD_NAMESPACE=my_app
 
 == Contributing to conferred
  

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/conferred.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: conferred 0.1.2 ruby lib
+# stub: conferred 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "conferred"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/conferred.rb

@@ -3,8 +3,6 @@ require 'json'
 class Conferred
   @@provider = "env"
   class << self
-    attr_accessor :namespace
-    
     def provider=(value)
       @@provider=value
     end
@@ -13,11 +11,17 @@ class Conferred
       @@provider || ENV["CONFERRED_PROVIDER"] || "env"
     end
 
+    def namespace=(value)
+      @@namespace=value
+    end
+
+    def namespace
+      @@namespace || ENV["CONFERRED_ETC_NAMESPACE"] || ""
+    end
+
+
     def method_missing(setting, *args, &block)
-      if setting =~ /#{provider}_setting_value/
-        super
-        return
-      end
+      super if setting =~ /#{provider}_setting_value/
       method = :setting_value
       method = :setting_value? if setting[-1] == "?"
       method = :setting_value! if setting[-1] == "!"
@@ -61,7 +65,9 @@ class Conferred
     end
 
     def etcd_setting_namespace
-      self.namespace ? "#{self.namespace}/" : ""
+      return "" unless self.namespace 
+      return "" if self.namespace.empty?
+      "#{self.namespace}/"
     end
 
     def setting_method_name

data/spec/conferred_spec.rb

@@ -5,6 +5,12 @@ def set_envs(params)
 end
 
 describe "Conferred" do
+  before do
+    #reset to defaults
+    Conferred.namespace = nil
+    Conferred.provider = nil
+  end
+
   context "simple config methods " do
     describe "accessor methods" do
       it "returns environment setting" do
@@ -34,6 +40,7 @@ describe "Conferred" do
         set_envs "A_SETTING" => "value 123"
         expect(Conferred.a_setting?).to eq true
       end
+
       it "is false when missing" do
         expect(Conferred.another_setting?).to eq false
       end
@@ -43,10 +50,6 @@ describe "Conferred" do
 
   describe "providers" do
     describe "#provider" do
-      before do
-        Conferred.provider= nil
-      end
-
       it "defaults to 'env'" do
         expect(Conferred.provider).to eq "env"
       end
@@ -70,24 +73,47 @@ describe "Conferred" do
     describe "#namespace" do
       before do
         Conferred.provider = "etcd"
-        Conferred.namespace = "section"
       end
 
-      it "sets a namespace" do
-        expect(Conferred.namespace).to eq "section"
+      context "configured namespace" do
+        before do
+          Conferred.namespace = "section"
+        end
+
+        it "sets a namespace" do
+          expect(Conferred.namespace).to eq "section"
+        end
+
+
+        it "passes the namespace to etcd" do
+          expect(Net::HTTP).to receive(:get)
+            .with(URI('http://localhost:2379/section/secret'))
+          Conferred.secret
+        end
       end
 
-      it "passes the namespace to etcd" do
-        expect(Net::HTTP).to receive(:get)
-          .with(URI('http://localhost:2379/section/secret'))
-        Conferred.secret
+      context "inferred namespace" do
+        before do
+          set_envs "CONFERRED_ETC_NAMESPACE" => "monty"
+        end
+
+        it "defers to the environment" do
+          expect(Conferred.namespace).to eq "monty"
+        end
+
+        it "configured value overides environment" do
+          Conferred.namespace = "sect"
+          expect(Conferred.namespace).to eq "sect"
+        end
       end
     end
 
     describe "etcd" do
+      before do
+        Conferred.provider = "etcd"
+      end
+
       it "calls the correct lookup function based on provider" do
-        Conferred.provider="etcd"
-        Conferred.namespace=nil
         allow(Net::HTTP).to receive(:get)
           .with(URI('http://localhost:2379/secret'))
           .and_return('{"action":"get","node":{"key":"/secret","value":"foo","modifiedIndex":2962,"createdIndex":2962}}')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conferred
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Ian Kenney