env-conf 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d65d6c79532e7e63b9cb9d15c21ffd286ece2b45
-  data.tar.gz: 0cdff989113e9acdc74a8d7da124fc2b5ea97c66
+  metadata.gz: 5ce3f0a8c8200a87077f541c755d437b08065973
+  data.tar.gz: 68e041d51ce6b9be1a7bf360fa1294429c6c868c
 SHA512:
-  metadata.gz: 49577599914ac3a3b92cc7a404ff735a9930b08317ad3425500969b004c107d883687d769b48bdc4dec2ee14fd9436d6867f0e9e2aae7820a581115743a93101
-  data.tar.gz: ee100f7003c5cfd5bd238c35c9a4bf8259204f36c0c8b6885caa75e6f8b5d979380738359f63b1cb106e909803f4aa1c4e1c70815c200e1ff89cc63aa79f80d6
+  metadata.gz: 060e1c6e5f820f590697142bc0a8973f6e48c58f0542d420022ca34497c50c79fe84e9402f8d8a6aa4a9d604cddb074ec54a19a9ce6c1e23d19fcb7825b49318
+  data.tar.gz: bed5c0fc4464573b2736b182017e468352342ff534c2a48558bfff36df9bf1ea97ffbfd00bd215689a9f42d44e47d39ca0e5af39ae18756dade5616a0a5a3cb7

data/lib/env-conf.rb

@@ -1,5 +1,6 @@
 require_relative './env-conf/version'
 require 'uri'
+require 'time'
 
 module Config
   @@defaults = {}
@@ -143,7 +144,7 @@ module Config
   # @return [Fixnum] The number or nil if the value couldn't be coerced to a
   #   Fixnum.
   def self.int(name)
-    self[name] && self[name].to_i
+    self[name] && Integer(self[name])
   end
 
   # Comma-separated words converted to an array.
@@ -186,7 +187,7 @@ module Config
   def self.dotenv!
     return if Config.production?
     require 'dotenv'
-    ['.env','.env.local',".env.#{Config[:rack_env]}"].each do |filename|
+    ['.env','.env.local',".env.#{Config[:rack_env]}",".env.#{Config[:rack_env]}.local"].each do |filename|
       if File.exists?(filename)
         @@dotenv.update(Dotenv::Parser.call(File.read(filename)))
       end

data/lib/env-conf/version.rb

@@ -2,5 +2,5 @@
 Object.send(:remove_const, :Config) if defined?(Config)
 
 module Config
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/test/config_test.rb

@@ -119,6 +119,12 @@ class ConfigTest < Test
     set_env 'FOO', "3000"
     assert_equal(3000, Config.int('FOO'))
     assert_equal(3000, Config.int(:foo))
+    set_env 'FOO', "1.0"
+    assert_raises(ArgumentError){ Config.time(:foo) }
+    set_env 'FOO', nil
+    assert_equal(nil, Config.int(:foo))
+    set_env 'FOO', "a"
+    assert_raises(ArgumentError){ Config.time(:foo) }
   end
 
   # Config.time returns nil or VAR as time
@@ -135,6 +141,12 @@ class ConfigTest < Test
 
     set_env 'T', '2000-2-2T11:11'
     assert_equal(Time.new(2000,2,2,11,11), Config.time(:t))
+
+    set_env 'T', nil
+    assert_equal(nil, Config.time(:t))
+
+    set_env 'T', 'derp'
+    assert_raises(ArgumentError){ Config.time(:t) }
   end
 
   # Config.time returns nil or VAR as URI

data/test/dotenv_test.rb

@@ -8,7 +8,7 @@ class DotenvTest < Test
 
   def teardown
     super
-    %w{.env .env.local .env.test}.each do |f|
+    %w{.env .env.local .env.test .env.test.local}.each do |f|
       File.unlink(f) if File.exists?(f)
     end
     FakeFS.deactivate!
@@ -32,7 +32,8 @@ class DotenvTest < Test
   def test_env_specific
     File.open(".env",'w') { |f| f << "FOO=bar" }
     File.open(".env.local",'w') { |f| f << "FOO=zzz" }
-    File.open(".env.test",'w') { |f| f << "FOO=test" }
+    File.open(".env.test",'w') { |f| f << "FOO=foo" }
+    File.open(".env.test.local",'w') { |f| f << "FOO=test" }
     assert_equal(nil, Config[:foo])
     set_env('RACK_ENV', 'test')
     Config.dotenv!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: env-conf
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Chris Continanza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv