envied 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36d17e2dd8294749d6092e79e10c5e4ba738e30e
-  data.tar.gz: 20154eb0fc0d036ba2fd0e05016db9442304d944
+  metadata.gz: 4a2483497b0ea0cac789287167585eee37cfbd70
+  data.tar.gz: fa76d7207586ed263d2b8f1ca284b18a5711b41f
 SHA512:
-  metadata.gz: 9a7b3f6e04cb7faf1704feff910ca6aa30b68ea416d1427de0b2a977477467c0da1791fd34f89ab823d999a5389d1e026ef04e9036bb9adb5e48f545d9aea224
-  data.tar.gz: 5e513482e36a44737af281bf239f19b55f8b007f9e03cca22e4c632b5b08c6b6b49a55dea140b393b4745a142b3e28c9655ae72e12dae515d639a56b968d2735
+  metadata.gz: c484a2e67953278b2d8ac7b50ccbc849a4b3eb22e4ec33715194fe42b58ab968cec2a808e6d5ff85d8797cbea3bb299770835c9db71cf9d9337c94e219afe475
+  data.tar.gz: 16b0ab7de0f0b6185836fefe0ee82b4a179493be2ab702721f4e25ea2edf8e5a1f69e45b4731960d5799f75e8f0686091cd8756e158e7bcfedce3a83bc15b671

data/README.md

@@ -60,11 +60,11 @@ The following types are supported:
 
 ### Defaults
 
-Variables can have defaults. It can be value or a proc (with arity 0, 1 or 2).
+Variables can have defaults. It can be a value or a proc.
 
 ```ruby
 ENVied.configure do |env|
-  env.variable :port, :Integer, default: ->(env, variable){ env.force_ssl ? 443 : 80 }
+  env.variable :port, :Integer, default: proc {|env, variable| env.force_ssl ? 443 : 80 }
   env.variable :force_ssl, :Boolean, default: true
 end
 ```

data/lib/envied.rb

@@ -1,5 +1,5 @@
 class ENVied
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
   module Configurable
     require 'virtus'
 
@@ -29,6 +29,7 @@ class ENVied
     def self.included(base)
       base.class_eval do
         include Virtus.model
+
       end
       base.extend ClassMethods
     end
@@ -43,37 +44,44 @@ class ENVied
       # @param env [Hash] the env
       def parse_env(env)
         atts = attribute_set.map(&:name).each_with_object({}) do |name, result|
-          @variable = attribute_set[name]
-          has_default = !!@variable.options[:default]
-          var_value = env[name.to_s] || env[name.to_s.upcase]
-          result[name] = var_value if var_value
-          if !(result[name] || has_default)
-            raise VariableMissingError, @variable
+          variable = attribute_set[name]
+          default = variable.options[:default]
+          value = env[name.to_s] || env[name.to_s.upcase]
+          if !(value || default)
+            raise VariableMissingError, variable
           end
+
+          try_coercion(variable, value, default)
+          result[name] = value if value
         end
 
         new(atts)
-      rescue Virtus::CoercionError => e
-        raise VariableTypeError, @variable
       end
 
       def variable(name, type = :String, options = {})
-        options[:default] &&= flexible_arity(options[:default])
         attribute name, type, { strict: true }.merge(options)
       end
 
-      protected
-      def flexible_arity(default)
-        return default unless default.respond_to?(:call)
-
-        case default.arity
-        when 1
-          ->(env, _){ default[env] }
-        when 0
-          ->(*){ default[] }
-        else
-          default
+      def default_if?(cond, value = nil, &block)
+        options = { default: (value || block) }
+        cond ? options : Hash.new
+      end
+
+      def default_unless?(cond, value = nil, &block)
+        default_if?(!cond, value, &block)
+      end
+
+      private
+      def try_coercion(variable, value, default)
+        value ||= begin
+          default unless default.respond_to?(:call)
         end
+        return unless value
+        @variable = variable
+
+        variable.coerce(value)
+      rescue Virtus::CoercionError => e
+        raise VariableTypeError.new(@variable)
       end
     end
   end
@@ -83,7 +91,9 @@ class ENVied
   end
 
   def self.configure(&block)
-    @configuration = Class.new { include Configurable }.tap(&block)
+    @configuration = Class.new { include Configurable }.tap do |k|
+      k.instance_eval(&block)
+    end
     # or define this thing as ENVied::Configuration? prolly not threadsafe
   ensure
     @instance = nil

data/spec/envied_spec.rb

@@ -73,22 +73,9 @@ describe ENVied do
         expect(ENVied.a).to eq 1
       end
 
-      (0..2).each do |arity|
-        it "can be a proc with arity #{arity}" do
-          default = begin
-            case arity
-            when 2
-              ->(a,b){ 1 }
-            when 1
-              ->(a){ 1 }
-            when 0
-              ->(){ 1 }
-            end
-          end
-
-          configured_with(a: [:Integer, default: default]).and_no_ENV
-          expect(ENVied.a).to eq 1
-        end
+      it "can be anything callable" do
+        configured_with(a: [:Integer, default: proc { 1 }]).and_no_ENV
+        expect(ENVied.a).to eq 1
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envied
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Gert Goet