enver 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a3f8bffa9a3c689bfc89db10641b37addb7df20
-  data.tar.gz: a0517f566731d2fa42fa6a1e088d2928b9d14e5e
+  metadata.gz: f33b8db91593c565ee79e8f9cc9c831b2d7667dc
+  data.tar.gz: 2c65477773a658a4715f9204b3391d954a30642a
 SHA512:
-  metadata.gz: ba2784cd3efc0072717a1ddca43d8a00bc21c3668f3d6b1a3f87fe5207c1254dbb6ef84d39c4987934dc5d67aa23b965c9fc65b39c4bce76aae8387f0df7b35c
-  data.tar.gz: 8ee7c7dd6fde84d0e9b163c0d55d6e9e83418122a9646ccc0dd219e67d9dd4ef72b1512da3f92c79f0fa485c0a9f46519450e48cc92ac4bb022fe0e787b0579d
+  metadata.gz: ca46784a94a3b3cfda6223615560dc80fd8e5cf3fc650eaf0f4714a2cffd49c998e0de894349b1f3eeedb99f240058a421084f5106ce7a9631b27ac841fc78e5
+  data.tar.gz: 46cdeefe17836fc39ea13e377fa13c96530703cbd1da7cc715c4d9280824256ffc6e8db5f143ae7b38ffb59cd8e95ed29333d235b71bd385cd9f714f305a7a3b

data/README.md

@@ -23,21 +23,21 @@ Or install it yourself as:
 ```bash
 export CLIENT_KEY=xxx
 export CLIENT_SECRET=yyy
-export SERVERS=4
+export NUM_SERVERS=4
 export NEW_RELIC_LICENSE_KEY=lisencekey
 export NEW_RELIC_APP_NAME=appname
 ```
 
 ```ruby
 env = Enver.load do
-  string :client_key, 'CLIENT_KEY'
-  string :client_secret, 'CLIENT_SECRET'
-  integer :servers, 'SERVERS'
-  array :path, 'PATH', pattern: ':'
-
-  partial :new_relic, 'NEW_RELIC_' do
-    string :license_key, 'LICENSE_KEY'
-    string :app_name, 'APP_NAME'
+  string :client_key
+  string :client_secret
+  integer :servers, 'NUM_SERVERS'
+  array :path, pattern: ':'
+
+  partial :new_relic do
+    string :license_key
+    string :app_name
   end
 end
 

data/lib/enver/loader.rb

@@ -11,50 +11,64 @@ module Enver
       instance_eval(&block) if block
     end
 
-    def value(name, env_name, options = {})
+    def value(*args)
+      options = extract_options! args
+      has_default = options.key? :default
+      name = args.shift
+      env_name = args.shift || name.to_s.upcase
+
       value = fetch env_name, options
-      store(name, value.is_a?(String) ? yield(value) : value)
+      value = yield value, options if !has_default && block_given?
+
+      store name, value
     end
 
-    def string(name, env_name, options = {})
-      value(name, env_name, options) do |v|
+    def string(*args)
+      value(*args) do |v|
         v
       end
     end
 
-    def integer(name, env_name, options = {})
-      value(name, env_name, options) do |v|
+    def integer(*args)
+      value(*args) do |v|
         Integer(v)
       end
     end
 
-    def float(name, env_name, options = {})
-      value(name, env_name, options) do |v|
+    def float(*args)
+      value(*args) do |v|
         Float(v)
       end
     end
 
-    def boolean(name, env_name, options = {})
-      value(name, env_name, options) do |v|
+    def boolean(*args)
+      value(*args) do |v, options|
         true_values = options[:true_values] || %w(1 t true y yes)
         true_values.include?(v)
       end
     end
 
-    def array(name, env_name, options = {})
-      value(name, env_name, options) do |v|
+    def array(*args)
+      value(*args) do |v, options|
         pattern = options[:pattern] || ','
         limit = options[:limit] || 0
         v.split(pattern, limit)
       end
     end
 
-    def partial(name, env_prefix, options = {}, &block)
+    def partial(*args, &block)
+      options = extract_options! args
+      name = args.shift
+      env_prefix = args.shift || "#{name.to_s.upcase}_"
       store name, Loader.new(@env, with_prefix(env_prefix), &block).attributes
     end
 
     private
 
+    def extract_options!(args)
+      args.last.is_a?(::Hash) ? args.pop : {}
+    end
+
     def with_prefix(env_name)
       "#{@prefix}#{env_name}"
     end

data/lib/enver/version.rb

@@ -1,3 +1,3 @@
 module Enver
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/spec/enver/loader_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 RSpec.describe Enver::Loader do
   let(:env) do
     {
+      'VALUE' => 'enver',
       'STRING1' => '',
       'STRING2' => 'test',
       'INTEGER1' => '',
@@ -35,46 +36,55 @@ RSpec.describe Enver::Loader do
     it { expect(loader.send(:fetch, 'NOTHING', default: 123)).to eq(123) }
   end
 
+  describe '#value' do
+    it { expect(loader.value(:v, 'VALUE')).to eq('enver') }
+    it { expect(loader.value(:value)).to eq('enver') }
+  end
+
   describe '#string' do
-    it { expect(loader.string(:v, 'STRING1')).to eq('') }
-    it { expect(loader.string(:v, 'STRING2')).to eq('test') }
+    it { expect(loader.string(:string1)).to eq('') }
+    it { expect(loader.string(:string2)).to eq('test') }
   end
 
   describe '#integer' do
-    it { expect{loader.integer(:v, 'INTEGER1')}.to raise_error }
-    it { expect(loader.integer(:v, 'INTEGER2')).to eq(1) }
-    it { expect{loader.integer(:v, 'INTEGER3')}.to raise_error }
-    it { expect{loader.integer(:v, 'INTEGER4')}.to raise_error }
+    it { expect{loader.integer(:integer1)}.to raise_error }
+    it { expect(loader.integer(:integer2)).to eq(1) }
+    it { expect{loader.integer(:integer3)}.to raise_error }
+    it { expect{loader.integer(:integer4)}.to raise_error }
   end
 
   describe '#boolean' do
-    it { expect(loader.boolean(:v, 'BOOLEAN1')).to eq(false) }
-    it { expect(loader.boolean(:v, 'BOOLEAN2')).to eq(true) }
-    it { expect(loader.boolean(:v, 'BOOLEAN3')).to eq(false) }
-    it { expect(loader.boolean(:v, 'BOOLEAN4')).to eq(true) }
-    it { expect(loader.boolean(:v, 'BOOLEAN5')).to eq(false) }
-    it { expect(loader.boolean(:v, 'BOOLEAN6')).to eq(true) }
-    it { expect(loader.boolean(:v, 'BOOLEAN7')).to eq(false) }
-    it { expect(loader.boolean(:v, 'BOOLEAN8')).to eq(true) }
-    it { expect(loader.boolean(:v, 'BOOLEAN9')).to eq(false) }
-    it { expect(loader.boolean(:v, 'BOOLEAN10')).to eq(false) }
-    it { expect(loader.boolean(:v, 'BOOLEAN10', true_values: %w(はい))).to eq(true) }
+    it { expect(loader.boolean(:boolean1)).to eq(false) }
+    it { expect(loader.boolean(:boolean2)).to eq(true) }
+    it { expect(loader.boolean(:boolean3)).to eq(false) }
+    it { expect(loader.boolean(:boolean4)).to eq(true) }
+    it { expect(loader.boolean(:boolean5)).to eq(false) }
+    it { expect(loader.boolean(:boolean6)).to eq(true) }
+    it { expect(loader.boolean(:boolean7)).to eq(false) }
+    it { expect(loader.boolean(:boolean8)).to eq(true) }
+    it { expect(loader.boolean(:boolean9)).to eq(false) }
+    it { expect(loader.boolean(:boolean10)).to eq(false) }
+    it { expect(loader.boolean(:boolean10, true_values: %w(はい))).to eq(true) }
   end
 
   describe '#array' do
-    it { expect(loader.array(:v, 'ARRAY1')).to eq(['foo', 'bar', 'buzz']) }
-    it { expect(loader.array(:v, 'ARRAY2', pattern: ':')).to eq(['foo', 'bar', 'buzz']) }
-    it { expect(loader.array(:v, 'ARRAY1', limit: 2)).to eq(['foo', 'bar,buzz']) }
+    it { expect(loader.array(:array1)).to eq(['foo', 'bar', 'buzz']) }
+    it { expect(loader.array(:array2, pattern: ':')).to eq(['foo', 'bar', 'buzz']) }
+    it { expect(loader.array(:array1, limit: 2)).to eq(['foo', 'bar,buzz']) }
   end
 
   describe '#partial' do
     it do
-      loader.partial :my, 'MY_' do
-        string :value1, 'VALUE1'
-        string :value2, 'VALUE2'
-        partial :super, 'SUPER_' do
-          string :value1, 'VALUE1'
-          string :value2, 'VALUE2'
+      loader.partial :my do
+        string :value1
+        string :value2
+        partial :super do
+          string :value1
+          string :value2
+        end
+        partial :s2, 'SUPER_' do
+          string :value1
+          string :value2
         end
       end
       env = loader.attributes
@@ -82,6 +92,8 @@ RSpec.describe Enver::Loader do
       expect(env.my.value2).to eq('myvalue2')
       expect(env.my.super.value1).to eq('mysupervalue1')
       expect(env.my.super.value2).to eq('mysupervalue2')
+      expect(env.my.s2.value1).to eq('mysupervalue1')
+      expect(env.my.s2.value2).to eq('mysupervalue2')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enver
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - mashiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler