get_env 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 840c77f6c35baeec3560a6fb8b64667fffe6e477d344c0b4d92e2b18f9a89758
-  data.tar.gz: '0916cd555771f013375a4d42b190ee04736e101a0e1a9e963eb004cc899cb9bf'
+  metadata.gz: a69954781ff0a92ff24cbc9200e0605104f7df6228b0f389ea1400af81bbf926
+  data.tar.gz: 1b316b87f08984ced9e07c55bf3bf94f13b9a6b68cc7441a4cf05af77f6cee4f
 SHA512:
-  metadata.gz: c636397567c57c93a12cbefc88bbed42e42fc6511a488971840af66a91b2aa8de92173412b9ba88ab9aee689c10307536181723f5e8d1a1fada132778ac0c3cd
-  data.tar.gz: b1b43cea47ab2af9a9f1adbfda13319e0598d4a73566529dcfc8e4496276903804f295feaf4e8a4ca2b0132917cd9d3a3c50ea29c31d3f8dc08698266690bf4c
+  metadata.gz: 398a9044aa2d6982f27eaf7a3bd56d7bdb4c690fd5a0d79a166b54ecb4775fc6520a1f5133bc106e440f17162bb148157672c11c55eb5ba0a0a7b02e6b8d2d02
+  data.tar.gz: '036692057e61f8c0e600bcf296e8b161a0122650d4ed02fb0cb049ee805f0e053f6b0a0f98ca50a99994e86a49abf2d0f54b6a66a264650585b561d0824082c9'

data/lib/get_env/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GetEnv
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/get_env.rb

@@ -3,30 +3,48 @@
 require 'get_env/version'
 
 module GetEnv
-  def self.[](key)
-    return nil if key.nil?
+  class << self
+    def [](key)
+      return nil if key.nil?
 
-    v = ENV[key].to_i
-    return v if v.to_s == ENV[key]
+      v = ENV[key].to_i
+      return v if v.to_s == ENV[key]
 
-    v = ENV[key].to_f
-    return v if v.to_s == ENV[key]
+      v = ENV[key].to_f
+      return v if v.to_s == ENV[key]
 
-    return false if ENV[key] == 'false'
-    return true if ENV[key] == 'true'
+      return false if ENV[key] == 'false'
+      return true if ENV[key] == 'true'
 
-    ENV[key]
-  end
+      ENV[key]
+    end
+
+    def fetch(*args, &block)
+      case args
+      in [key, default] then fetch_with_default(key, default)
+      in [key] then fetch_without_default(key, &block)
+      else raise ArgumentError
+      end
+    end
+
+    private
+
+    def fetch_with_default(key, default)
+      if ENV.has_key?(key)
+        self[key]
+      else
+        default
+      end
+    end
 
-  def self.fetch(key, default = nil)
-    if ENV.has_key?(key)
-      self[key]
-    elsif !default.nil?
-      default
-    elsif block_given?
-      yield
-    else
-      ENV.fetch(key) # Will raise a KeyError
+    def fetch_without_default(key, &block)
+      if ENV.has_key?(key)
+        self[key]
+      elsif block_given?
+        block.call
+      else
+        ENV.fetch(key) # Will raise a KeyError
+      end
     end
   end
 end

data/spec/get_env_spec.rb

@@ -53,6 +53,10 @@ RSpec.describe GetEnv do
       expect(GetEnv.fetch('SOME_NON_EXISTANT_FLOAT', 3.21)).to eq(3.21)
     end
 
+    it 'allows nil as a default value' do
+      expect(GetEnv.fetch('SOME_NON_EXISTANT_FLOAT', nil)).to be_nil
+    end
+
     it 'raises an exception if not found and no default is specified' do
       expect do
         GetEnv.fetch('SOME_NON_EXISTANT_FLOAT')
@@ -63,5 +67,10 @@ RSpec.describe GetEnv do
       v = GetEnv.fetch('SOME_NON_EXISTANT_FLOAT') { 3.21 }
       expect(v).to eq(3.21)
     end
+
+    it 'raises when given too few or too many arguments' do
+      expect { GetEnv.fetch }.to raise_error(ArgumentError)
+      expect { GetEnv.fetch('FOO', 1, 2) }.to raise_error(ArgumentError)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: get_env
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Simon Mathieu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,11 +118,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Read values from ENV in a reasonable way
 test_files:
-- spec/spec_helper.rb
 - spec/get_env_spec.rb
 - spec/rubocop/cop/lint/no_env_spec.rb
+- spec/spec_helper.rb