a9n 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb78fbff3f0313e316677658597f0143d5688835
-  data.tar.gz: ec4ee59ac801e019236d895674b325ac0b720483
+  metadata.gz: 90f0d9378a0371006614053fd5f2ba3add41dd36
+  data.tar.gz: e2d2b46d4acc96d2fadf7e83ee13e396b9daa988
 SHA512:
-  metadata.gz: 6325f3fbad2cc18a3d8eb78cde05aebf3c3a0ea62f7a0c1b4e4c2b27e2901919f292c8d268a90319baf053235fcc0055e46aea595a1be764c896b0339fcd88dd
-  data.tar.gz: d0d1228d3b001208f1296f2f6e9468173acac35169cf34810dce9fd303c811ffd303fb9027db19a51d411c3207ba0d8108c90818654f7323daa3bd2a9d07361f
+  metadata.gz: 898bc6b5f725ce86e9323a528979c0fbf082627717b30786a8e1625d1f6b0c838964b03bdba3052526265fe5ecf8aae10f2d77d93fefb64df5ae330aca316a57
+  data.tar.gz: e5e42e3571bfb95ac3a5d308a40639a0d99d8d6e721384ba250fe56297e915c16adee00877e3131c7469f24854129b97791e35f9f76386485992d8fab5e0a30d

data/.ruby-version

@@ -1 +1 @@
-2.1.5@a9n
+2.2.2@a9n

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  - 2.1.6
+  - 2.2.2
 addons:
   code_climate:
     repo_token: 9aa2aa2432639c57772b6917ad9da468709e5536b75617575b02b35201a2eaf8

data/lib/a9n/ext/hash.rb

@@ -1,21 +1,29 @@
 module A9n
   class HashExt
     class << self
-      # Hash#deep_symbolize_keys
-      # based on
-      # https://github.com/svenfuchs/i18n/blob/master/lib/i18n/core_ext/hash.rb
-      def deep_symbolize_keys(hash)
-        hash.inject({}) { |result, (key, value)|
-          value = deep_symbolize_keys(value) if value.is_a?(::Hash)
-          result[(key.to_sym rescue key) || key] = value
+      def deep_prepare(hash)
+        hash.inject({}) do |result, (key, value)|
+          result[(key.to_sym rescue key)] = get_value(key, value)
           result
-        }
+        end
       end
 
       def merge(*items)
         return nil if items.compact.empty?
         items.compact.inject({}){|sum, item| sum.merge!(item)}
       end
+
+      private
+
+      def get_value(key, value)
+        if value.is_a?(::Hash)
+          deep_prepare(value)
+        elsif value.is_a?(Symbol) && value == :env
+          ENV[key.to_s.upcase]
+        else
+          value
+        end
+      end
     end
   end
 end

data/lib/a9n/loader.rb

@@ -44,7 +44,7 @@ module A9n
 
       def prepare_yml_scope(yml, env_scope)
         if yml[env_scope].is_a?(::Hash)
-          A9n::HashExt.deep_symbolize_keys(yml[env_scope])
+          A9n::HashExt.deep_prepare(yml[env_scope])
         else
           nil
         end

data/lib/a9n/version.rb

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

data/spec/unit/loader_spec.rb

@@ -13,15 +13,15 @@ describe A9n::Loader do
   end
 
   describe "#load" do
-    let(:example_config) {
+    let(:example_config) do
       { app_url: "http://127.0.0.1:3000", api_key: "example1234" }
-    }
-    let(:local_config) {
+    end
+
+    let(:local_config) do
       { app_host: "127.0.0.1:3000", api_key: "local1234" }
-    }
-    let(:env){
-      "tropical"
-    }
+    end
+
+    let(:env) { "tropical" }
     let(:config) { subject.get }
 
     context "when no configuration file exists" do
@@ -122,7 +122,13 @@ describe A9n::Loader do
       end
 
       before do
-        ENV["DWARF"] = "erbized dwarf"
+        ENV["ERB_DWARF"] = "erbized dwarf"
+        ENV["DWARF_PASSWORD"] = "dwarf123"
+      end
+
+      after do
+        ENV["ERB_DWARF"] = nil
+        ENV["DWARF_PASSWORD"] = nil
       end
 
       context "when file has erb extension" do
@@ -150,6 +156,11 @@ describe A9n::Loader do
         it "parses erb" do
           expect(subject[:erb_dwarf]).to eq("erbized dwarf")
         end
+
+        it "gets valus from ENV" do
+          p subject
+          expect(subject[:dwarf_password]).to eq("dwarf123")
+        end
       end
 
       context "having no env and only defaults data" do

data/test_app/config/configuration.yml

@@ -1,12 +1,13 @@
 defaults:
   default_dwarf: "default dwarf"
   overriden_dwarf: "not yet overriden dwarf"
+  erb_dwarf: "<%= ENV['ERB_DWARF'] %>"
+  dwarf_password: :env
 development:
   nil_dwarf: ~
   false_dwarf: false
   true_dwarf: true
   string_dwarf: "dwarf"
-  erb_dwarf: "<%= ENV['DWARF'] %>"
   overriden_dwarf: "already overriden dwarf"
   hash_dwarf:
     dwarf_1: "hello 1"
@@ -16,7 +17,6 @@ test:
   false_dwarf: false
   true_dwarf: true
   string_dwarf: "dwarf"
-  erb_dwarf: "<%= ENV['DWARF'] %>"
   overriden_dwarf: "already overriden dwarf"
   hash_dwarf:
     dwarf_1: "hello 1"

data/test_app/config/configuration.yml.example

@@ -1,12 +1,13 @@
 defaults:
   default_dwarf: "example default dwarf"
   overriden_dwarf: "example not yet overriden dwarf"
+  erb_dwarf: "<%= ENV['ERB_DWARF'] %>"
+  dwarf_password: :env
 development:
   nil_dwarf: ~
   false_dwarf: false
   true_dwarf: true
   string_dwarf: "dwarf"
-  erb_dwarf: "<%= ENV['DWARF'] %>"
   overriden_dwarf: "example already overriden dwarf"
   hash_dwarf:
     dwarf_1: "hello 1"
@@ -16,7 +17,6 @@ test:
   false_dwarf: false
   true_dwarf: true
   string_dwarf: "dwarf"
-  erb_dwarf: "<%= ENV['DWARF'] %>"
   overriden_dwarf: "example already overriden dwarf"
   hash_dwarf:
     dwarf_1: "hello 1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a9n
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies: []
 description: a9n - ruby/rails apps configuration manager
 email:
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: a9n is a tool to keep ruby/rails apps extra configuration easily maintainable