contextualizer 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 656da6e97d5a4805a96b5aae76332fd738c9727a
-  data.tar.gz: 0ec330dd1f6919269230eda301084792ac83be30
+  metadata.gz: 213d3ab93e2c302ffa373e24042fecc4aa483586
+  data.tar.gz: 962895326c717c818af6e99e1c91ba9e5eeffda8
 SHA512:
-  metadata.gz: 70d5adca95a69de4c41a852ccc290920008ab7fc7b58d95675039b7394adadb447f7ea15df842a2e4653b415c3c643d5d1e5976dcce7a3048e257d63445f1fd8
-  data.tar.gz: d83fac648dadc104b6c898dbdbf61c0d39f251a6bf73194eb6d3b7a41ec0947c1c6df7cd499d40957055f3eaceea3e0ca1dc9b196ebbbbb637e10aa0e5d26b33
+  metadata.gz: 7d5aaa12c07248aec59c58e01785030e3789ce2793d85a4043685e16e79023e1ddc7b33946723d68419bb42fdfc566cd5ae3e5d13a20a7f9c70f34472c8ecd15
+  data.tar.gz: 15964bd4677634957c413ff8cb5364db752e49853a00d6e5af8e062bd7de7e4da627822cae12168d635457927e891fa4d8c18c762349175a371dc51bbb426d4f

data/lib/contextualizer.rb

@@ -1,6 +1,8 @@
 require 'contextualizer/version'
 
 module Contextualizer
+  OPTIONAL = Object.new.freeze
+
   def context(*attrs, **opt_attrs)
     unless @__setter
       @__setter = Setter.new
@@ -37,19 +39,23 @@ module Contextualizer
 
   class Setter
     def initialize
-      @attrs, @opt_attrs = [], {}
+      @mandatory, @with_default, @optional = [], {}, []
     end
 
     def add_attrs(*attrs, **opt_attrs)
-      @attrs |= attrs
-      @opt_attrs.merge!(opt_attrs)
+      optional, with_default = opt_attrs.partition { |_, v| v == OPTIONAL }.map(&:to_h)
+
+      @mandatory |= attrs
+      @optional |= optional.keys
+      @with_default.merge!(with_default)
     end
 
     def set(obj, args)
       context = obj.context&.dup || {}
 
-      @opt_attrs.each { |key, default| context[key] = args.key?(key) ? args[key] : default }
-      @attrs.each do |key|
+      @with_default.each { |key, default| context[key] = args.fetch(key, default) }
+      @optional.each { |key| context[key] = args[key] if args.key?(key) }
+      @mandatory.each do |key|
         fail ":#{key} was not found in scope" unless args.key?(key)
         context[key] = args[key]
       end

data/lib/contextualizer/version.rb

@@ -1,3 +1,3 @@
 module Contextualizer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contextualizer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Pablo Herrero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler