configerator 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2d61fe028ce7011ef38f7c66473779896d8909
-  data.tar.gz: 4c97a839350bb20cf57663cb72eeb9bd1442a91e
+  metadata.gz: a77e8c3b7be476c6b9a4607d75c9e97e95343a98
+  data.tar.gz: d840fd2c528b01c7a786287b94ae95360b923c28
 SHA512:
-  metadata.gz: 7cb6c10835323f561115d47529dd1e040745f3ab802bc350f22a14eafd9f890dd4476f478f8d02c39d7ae6e6430d4f757f28929414ae6eb3d14d2759eb75b817
-  data.tar.gz: 526875af240df935bdcc219efb2b35e74af4889c70f646b61778f31ad17d34df2831f7ea39d10b9287fdd2985c9f9f05034d5fe73b3898cfbf92440f57a5e982
+  metadata.gz: 6708a7555553df1b71255d6bc9b76559d53532e28da786ae7e1646f33416b552c304f2bb537fe3abf1844ed90f32b64843749219099e3f34804e0730a923957d
+  data.tar.gz: ef78a142714098468d93acab0e177f581d2ea202ca02f05f2f5c38e11599f85b4b211c43c7703cf421b270842fdb6bde6946af1bed74ecfc7621c67b0ceb4de9

data/lib/configerator/configerator.rb

@@ -1,36 +1,36 @@
 require 'uri'
 
 module Configerator
-  @processed = []
-
+  # Initializers (DSL)
   def required(name, method=nil, error_on_load: true)
-    # Hash#fetch raises a KeyError, Hash#[] doesn't
-    value = error_on_load ? ENV.fetch(name.to_s.upcase) : ENV[name.to_s.upcase]
-    value = cast(value, method)
+    value = cast(fetch_env(name, error_on_load: error_on_load), method)
 
     create(name, value, error_on_load)
   end
 
   def optional(name, method=nil)
-    value = cast(ENV[name.to_s.upcase], method)
+    value = cast(fetch_env(name), method)
+    create(name, value)
+  end
+
+  def override(name, default, method=nil)
+    value = cast(fetch_env(name) || default, method)
     create(name, value)
   end
 
   def namespace namespace, prefix: true, &block
     @processed = []
     @prefix = "#{namespace}_" if prefix
+
     yield
-    instance_eval "def #{namespace}?; !!(#{@processed.join(' && ')}) end"
+
+    instance_eval "def #{namespace}?; !!(#{@processed.join(' && ')}) end", __FILE__, __LINE__
   ensure
     @prefix = nil
     @processed = []
   end
 
-  def override(name, default, method=nil)
-    value = cast(ENV.fetch(name.to_s.upcase, default), method)
-    create(name, value)
-  end
-
+  # Scope methods
   def int
     ->(v) { v.to_i }
   end
@@ -69,6 +69,7 @@ module Configerator
     end
   end
 
+  # Helpers
   private
 
   def cast(value, method)
@@ -76,13 +77,26 @@ module Configerator
   end
 
   def create(name, value, error_on_load=true)
-    name = "#{@prefix}#{name}"
+    name = build_key(name).downcase
 
     instance_variable_set(:"@#{name}", value)
-    instance_eval "def #{name}; @#{name} || (raise \"key not set '#{name}'\" unless #{error_on_load}) end"
+
+    instance_eval "def #{name}; @#{name} || (raise 'key not set: \"#{name.upcase}\"' unless #{error_on_load}) end", __FILE__, __LINE__
     instance_eval "def #{name}?; !!#{name} end", __FILE__, __LINE__
 
     @processed ||= []
     @processed << name
   end
+
+  def build_key(key)
+    key = "#{@prefix}#{key}" if @prefix
+
+    key.to_s.upcase
+  end
+
+  def fetch_env(key, error_on_load: false)
+    key = build_key(key)
+
+    error_on_load ? ENV.fetch(key) : ENV[key]
+  end
 end

data/lib/generators/configerator/config_generator.rb

@@ -0,0 +1,11 @@
+module Configerator
+  class ConfigGenerator < Rails::Generators::Base
+    desc "Creates a Configerator-based file at config/config.rb"
+
+    source_root File.expand_path("../../templates", __FILE__)
+
+    def create_config_file
+      copy_file "config.rb", "config/config.rb"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configerator
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Joshua Mervine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2017-02-18 00:00:00.000000000 Z
 dependencies: []
 description: Simple module for implementing environment based configuration adapted
   from Pliny and following the 12factor pattern.
@@ -22,9 +22,8 @@ extra_rdoc_files: []
 files:
 - lib/configerator.rb
 - lib/configerator/configerator.rb
-- lib/generators/config_generator.rb
+- lib/generators/configerator/config_generator.rb
 - lib/generators/templates/config.rb
-- test/configerator_test.rb
 homepage: https://github.com/heroku/configerator
 licenses:
 - MIT
@@ -49,5 +48,4 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'Configerator: A Config Helper'
-test_files:
-- test/configerator_test.rb
+test_files: []

data/lib/generators/config_generator.rb

@@ -1,9 +0,0 @@
-class ConfigGenerator < Rails::Generators::Base
-  desc "Creates a Configerator-based file at config/config.rb"
-
-  source_root File.expand_path("../templates", __FILE__)
-
-  def create_config_file
-    copy_file "config.rb", "config/config.rb"
-  end
-end

data/test/configerator_test.rb

@@ -1,172 +0,0 @@
-require 'uri'
-require 'minitest/autorun'
-require './lib/configerator'
-
-module Config
-  extend Configerator
-end
-
-class TestConfigerator < Minitest::Test
-  FIXTURES = {
-    test_required: 'required',
-    test_optional: 'optional',
-    test_override: 'override',
-
-    test_int: 99,
-    test_float: 99.9,
-    test_string: 'ninty nine',
-    test_symbol: :ninty_nine,
-    test_url: 'https://99.com',
-    test_array_int: [ 9, 9 ],
-    test_array: [ 'nine', 'nine' ],
-
-    test_ns1: 'ns1',
-    test_ns2: 'ns2',
-
-    ns1: 'ns1',
-    ns2: 'ns2'
-  }.freeze
-
-  def setup
-    FIXTURES.each { |k, v|
-      ENV[k.to_s.upcase] = (v.is_a?(Array) ? v.join(',') : v.to_s)
-    }
-  end
-
-  def with_method
-    -> (v) { "method:#{v}" }
-  end
-
-  def test_required
-    Config.required :test_required
-
-    assert_equal Config.test_required, 'required'
-    assert Config.test_required?
-  end
-
-  def test_required_on_load_false
-    Config.required :test_required2, error_on_load: false
-
-    assert_raises RuntimeError do
-      Config.test_required2?
-    end
-
-    assert_raises RuntimeError do
-      Config.test_required2
-    end
-  end
-
-  def test_required_with_method
-    Config.required :test_required, with_method
-
-    assert_equal Config.test_required, 'method:required'
-    assert Config.test_required?
-  end
-
-  def test_required_missing
-    assert_raises KeyError do
-      Config.required :test_missing
-    end
-  end
-
-  def test_optional
-    Config.optional :test_optional
-
-    assert_equal Config.test_optional, 'optional'
-  end
-
-  def test_optional_with_method
-    Config.optional :test_optional, with_method
-
-    assert_equal Config.test_optional, 'method:optional'
-  end
-
-  def test_optional_missing
-    Config.optional :test_missing_optional
-
-    assert_nil Config.test_missing_optional
-  end
-
-  def test_namespace
-    Config.namespace :test do
-      Config.required :ns1
-      Config.optional :ns2
-      Config.override :ns3, "three"
-    end
-
-    assert Config.test_ns1
-    assert Config.test_ns2
-    assert Config.test_ns3
-    assert Config.test?
-  end
-
-  def test_namepsace_missing
-    Config.namespace :test do
-      Config.required :ns1
-      Config.optional :ns2
-      Config.override :ns3, "three"
-      Config.optional :ns4
-    end
-
-    assert Config.test_ns1
-    assert Config.test_ns2
-    assert Config.test_ns3
-    refute Config.test_ns4
-    refute Config.test?
-  end
-
-  def test_namespace_without_prefix
-    Config.namespace :test, prefix: false do
-      Config.optional :ns1
-      Config.optional :ns2
-    end
-
-    assert Config.ns1
-    assert Config.ns2
-  end
-
-  def test_override
-    Config.override :test_override, 'override_default'
-
-    assert_equal Config.test_override, 'override'
-  end
-
-  def test_override_with_method
-    Config.override :test_override, 'override_default', with_method
-
-    assert_equal Config.test_override, 'method:override'
-  end
-
-  def test_override_missing
-    Config.override :test_override_missing, 'override_default'
-
-    assert_equal Config.test_override_missing, 'override_default'
-  end
-
-  # build basic casting tests
-  FIXTURES.each do |meth, val|
-    caster = meth.to_s.gsub(/^test_/, '')
-
-    unless %w[ required optional override url ns1 ns2 ].include? caster
-      method = \
-        if caster =~ /_/
-          parts = caster.split('_')
-          Config.send(parts.first.to_sym, Config.send(parts.last.to_sym))
-        else
-          Config.send(caster.to_sym)
-        end
-
-      define_method(meth) do
-        Config.required meth, method
-
-        assert_equal Config.send(meth), val
-      end
-    end
-  end
-
-  def test_url
-    Config.required :test_url, Config.url
-
-    assert_equal Config.test_url, URI.parse('https://99.com')
-  end
-end