a9n 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f02694ddef5b6bee722ffa1bc9fd625ca1ca471a
-  data.tar.gz: 49594a970d5088cc11229db97020b9756ae27792
+  metadata.gz: cb78fbff3f0313e316677658597f0143d5688835
+  data.tar.gz: ec4ee59ac801e019236d895674b325ac0b720483
 SHA512:
-  metadata.gz: c5795aa763517c51bb0edc2e78a8610bbc7e9c5c2c20c0031b79d0f15af1aaef4db1a6988cf4cdcb2ae899e61bc02c46f84def2ce70f11b65417b4b108adbbd4
-  data.tar.gz: 5f025caf0e34ef45490fa0b6d6b7daef9246cb01e658a02eecec7ac0198cf16aed33ee30e9ed4d69c736f2bdb8dd69f547f29c42f7b6f5b05a604cc515966ca8
+  metadata.gz: 6325f3fbad2cc18a3d8eb78cde05aebf3c3a0ea62f7a0c1b4e4c2b27e2901919f292c8d268a90319baf053235fcc0055e46aea595a1be764c896b0339fcd88dd
+  data.tar.gz: d0d1228d3b001208f1296f2f6e9468173acac35169cf34810dce9fd303c811ffd303fb9027db19a51d411c3207ba0d8108c90818654f7323daa3bd2a9d07361f

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 gem 'rake'
-gem 'rspec', '~> 3.0.0'
+gem 'rspec'
 gem 'codeclimate-test-reporter', require: false

data/a9n.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/a9n/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Krzysztof Knapik"]
   gem.email         = ["knapo@knapo.net"]
-  gem.description   = %q{a9n - ruby/rails apps extra configuration manager}
+  gem.description   = %q{a9n - ruby/rails apps configuration manager}
   gem.summary       = %q{a9n is a tool to keep ruby/rails apps extra configuration easily maintainable and verifiable}
   gem.homepage      = "https://github.com/knapo/a9n"
   gem.license       = 'MIT'

data/lib/a9n.rb

@@ -66,7 +66,7 @@ module A9n
 
     def method_missing(name, *args)
       load if storage.empty?
-      storage.send(name)
+      storage.send(name, *args)
     end
 
     private
@@ -80,10 +80,11 @@ module A9n
     def setup_scope(name, data)
       if default_scope?(name)
         storage.merge(data)
+        def_delegator :storage, :fetch
         def_delegators :storage, *data.keys
       else
         storage[name] = data
-        def_delegators :storage, name
+        def_delegator :storage, name
       end
       return data
     end

data/lib/a9n/struct.rb

@@ -4,7 +4,7 @@ module A9n
   class Struct < OpenStruct
     extend Forwardable
 
-    def_delegators :@table, :empty?, :keys, :key?
+    def_delegators :@table, :empty?, :keys, :key?, :fetch
 
     def merge(key_value)
       key_value.each_pair do |key, value|

data/lib/a9n/version.rb

@@ -1,3 +1,3 @@
 module A9n
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/integration/a9n_spec.rb

@@ -5,53 +5,114 @@ describe A9n do
 
   let(:env) { "test" }
 
-  before {
+  before do
+    clean_singleton(subject)
     subject.app = double(env: env)
     subject.root = File.expand_path("../../../test_app", __FILE__)
     subject.load
-  }
+  end
 
-  after {
-    subject.instance_variable_set(:@env, nil)
-    subject.root = nil
-    subject.app = nil
-  }
+  after do
+    clean_singleton(subject)
+  end
 
   context "base config file" do
-    it {
+    it do
+      expect(subject.storage).to be_kind_of(A9n::Struct)
+    end
+
+    it do
       expect(subject.default_dwarf).to eq("default dwarf")
       expect(subject.overriden_dwarf).to eq("already overriden dwarf")
-    }
+    end
+
+    it do
+      expect(subject.fetch(:default_dwarf)).to eq("default dwarf")
+      expect(subject.fetch(:overriden_dwarf)).to eq("already overriden dwarf")
+    end
+
+    it do
+      expect { subject.invalid }.to raise_error(A9n::NoSuchConfigurationVariable)
+    end
+
+    it do
+      expect { subject.fetch(:invalid) }.to raise_error(::KeyError)
+    end
+
+    it do
+      expect { subject.fetch(:invalid, "Hello").to eq("Hello") }
+    end
   end
 
   context "undefined env" do
     let(:env) { "tropical" }
-    it {
+
+    it do
       expect(subject.default_dwarf).to eq("default dwarf")
       expect(subject.overriden_dwarf).to eq("not yet overriden dwarf")
-    }
+    end
+
+    it do
+      expect(subject.fetch(:default_dwarf)).to eq("default dwarf")
+      expect(subject.fetch(:overriden_dwarf)).to eq("not yet overriden dwarf")
+    end
   end
 
   context "extra config file" do
-    it {
+    before do
       expect(subject.mandrill).to be_kind_of(A9n::Struct)
+    end
+
+    it do
       expect(subject.mandrill.username).to eq("joe")
       expect(subject.mandrill.api_key).to eq("asdf1234")
-    }
+    end
+
+    it do
+      expect(subject.mandrill.fetch(:username)).to eq("joe")
+      expect(subject.mandrill.fetch(:api_key)).to eq("asdf1234")
+    end
+
+    it do
+      expect(subject.fetch(:mandrill)).to eq(subject.mandrill)
+    end
   end
 
   context "extra config file with erb" do
-    it {
+    before do
       expect(subject.cloud).to be_kind_of(A9n::Struct)
+    end
+
+    it do
       expect(subject.cloud.username).to eq("testuser")
       expect(subject.cloud.password).to eq("qwerty")
-    }
+    end
+
+    it do
+      expect(subject.cloud.fetch(:username)).to eq("testuser")
+      expect(subject.cloud.fetch(:password)).to eq("qwerty")
+    end
+
+    it do
+      expect(subject.fetch(:cloud)).to eq(subject.cloud)
+    end
   end
 
   context "extra config file with example" do
-    it {
+    before do
       expect(subject.mailer).to be_kind_of(A9n::Struct)
+    end
+
+    it do
       expect(subject.mailer.delivery_method).to eq("test")
-    }
+    end
+
+    it do
+      expect(subject.mailer.fetch(:delivery_method)).to eq("test")
+    end
+
+    it do
+      expect(subject.fetch(:mailer)).to eq(subject.mailer)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -15,3 +15,11 @@ RSpec.configure do |config|
   config.order = "random"
   config.tty = true
 end
+
+def clean_singleton(klass)
+  [:@storage, :@env, :@app, :@root].each do |var|
+    if klass.instance_variable_defined?(var)
+      klass.remove_instance_variable(var)
+    end
+  end
+end

data/spec/unit/a9n_spec.rb

@@ -2,14 +2,6 @@ require "spec_helper"
 
 describe A9n do
   subject { described_class }
-
-  def clean_singleton(subject)
-    subject.instance_variable_set(:@storage, nil)
-    subject.instance_variable_set(:@env, nil)
-    subject.root = nil
-    subject.app = nil
-  end
-
   before { clean_singleton(subject) }
   after { clean_singleton(subject) }
 

data/spec/unit/struct_spec.rb

@@ -17,7 +17,19 @@ describe A9n::Struct do
     end
 
     describe "#[]" do
-      it { expect(subject[:dwarf]).to be_nil }
+      it { expect(subject[:dwarf]).to eq(nil) }
+    end
+
+    describe "#fetch" do
+      it do
+        expect {
+          subject.fetch(:dwarf)
+        }.to raise_error(KeyError)
+      end
+
+      it do
+        expect(subject.fetch(:dwarf, "hello")).to eq("hello")
+      end
     end
 
     it "raises error on accessin invalid attribute" do
@@ -100,21 +112,46 @@ describe A9n::Struct do
     end
 
     describe "#[]" do
-      it "return non empty value" do
+      it "returns non empty value" do
         expect(subject[:non_empty_dwarf]).to eq("dwarf")
       end
 
-      it "return false value" do
+      it "returns false value" do
         expect(subject[:false_dwarf]).to eq(false)
       end
 
-      it "return nil value" do
+      it "returns nil value" do
         expect(subject[:nil_dwarf]).to eq(nil)
       end
 
-      it "return nil for non existing value" do
+      it "returns nil for non existing key" do
         expect(subject[:non_existing_dwarf]).to eq(nil)
       end
     end
+
+
+    describe "#fetch" do
+      it "returns non empty value" do
+        expect(subject.fetch(:non_empty_dwarf)).to eq("dwarf")
+      end
+
+      it "returns false value" do
+        expect(subject.fetch(:false_dwarf)).to eq(false)
+      end
+
+      it "returns nil value" do
+        expect(subject.fetch(:nil_dwarf)).to eq(nil)
+      end
+
+      it "returns default for non existing value" do
+        expect(subject.fetch(:non_existing_dwarf, "hello")).to eq("hello")
+      end
+
+      it "raises error for non existing key" do
+        expect {
+          subject.fetch(:non_existing_dwarf)
+        }.to raise_error(KeyError)
+      end
+    end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: a9n
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies: []
-description: a9n - ruby/rails apps extra configuration manager
+description: a9n - ruby/rails apps configuration manager
 email:
 - knapo@knapo.net
 executables: []