nxt_init 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a114d10945b4542471672c3c8e33d58b3b1284c30bd005fb76ca91603ecb3d97
-  data.tar.gz: ce5041f6cc768f6bd2b672c909994d7938e78d082413091dd55e6b9de2e10508
+  metadata.gz: aba589829b0c74c391a585c58a6224f9f8777d236f4eaacdcd3c21d7c748b39a
+  data.tar.gz: 1201133becd45a239fdc192d555960d3c3e37ede6011f634854ddfb1e6f6c203
 SHA512:
-  metadata.gz: 6aa8abb8314787aa77f187b91ec44ce7de339c0ab2b714488ce6c5d813796074d01864bcd3fd6220179a8b778bb1c4f269a5eec14f7b9557fafb7d232834a0f3
-  data.tar.gz: c726dc8306b2aa821f9dfc2e7d427f833c4923f9e96e35ebaeb65d57c46456aad285ac45a44a6a67c9c43ba5ff634d167833c006a8700043d03c0a2cf62f909a
+  metadata.gz: 1e1a83e3e4afcd04ceb33a413ae239dd42ecd7fd11cb7b2621ec7b100c36aea9d2b63e97261ac3116e27d291f68fb9ad19c395cd42efdb47a52a6c00445371ee
+  data.tar.gz: 723ec48a995c218319309b50b943170b518df0323520b8fc8379531808afdc6b4dab492bdea9355e7008633b3f3735d4a2f1e82a6a47b55ff86513a8d88c5597

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nxt_init (0.1.0)
+    nxt_init (0.1.2)
       activesupport
 
 GEM

data/lib/nxt_init/version.rb

@@ -1,3 +1,3 @@
 module NxtInit
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/nxt_init.rb

@@ -52,11 +52,18 @@ module NxtInit
       self.class.send(:attr_init_opts).each do |opt|
         if opt.is_a?(Hash)
           key = opt.keys.first
-          value = opt.values.first
-          value = attrs[key] || (value.respond_to?(:call) ? instance_exec(&value) : value)
+          default_value = opt.values.first
+          given_value = attrs[key]
+          key_missing = !attrs.key?(key)
+
+          if default_value_is_preprocessor?(default_value)
+            value = key_missing ? raise_key_error(key) : instance_exec(given_value, &default_value)
+          else
+            value = given_value || (default_value.respond_to?(:call) ? instance_exec(&default_value) : default_value)
+          end
         elsif opt.is_a?(Symbol)
           key = opt
-          value = attrs.fetch(opt)
+          value = attrs.fetch(opt) { |k| raise_key_error(k) }
         else
           raise InvalidOptionError, "Don't know how to deal with #{opt}"
         end
@@ -64,6 +71,17 @@ module NxtInit
       end
     end
 
+    def default_value_is_block?(default_value)
+      default_value.respond_to?(:call)
+    end
+
+    def default_value_is_preprocessor?(default_value)
+      default_value_is_block?(default_value) && default_value.arity == 1
+    end
+
+    def raise_key_error(key)
+      raise KeyError, "NxtInit attr_init key :#{key} was missing at initialization!"
+    end
   end
 
   def self.included(base)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nxt_init
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andreas Robecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport