Make @__options__ to collect renamed keys with defaults and coercions

dry-rb · Mar 5, 2017 · 363ba5c · 363ba5c
1 parent e8f62a9
commit 363ba5c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/lib/dry/initializer/builder.rb b/lib/dry/initializer/builder.rb
@@ -42,9 +42,10 @@ def clear_method(mixin, name)
     def code
       <<-RUBY.gsub(/^ +\|/, "")
         |def __initialize__(#{initializer_signatures})
-        |  @__options__ = #{defined_options}
+        |  @__options__ = {}
         |#{initializer_presetters}
         |#{initializer_setters}
+        |#{initializer_postsetters}
         |end
         |private :__initialize__
         |private :__defaults__
@@ -72,9 +73,8 @@ def initializer_signatures
 
     def initializer_presetters
       dups = duplications
-      attributes
-        .map { |a| "  #{a.presetter}" if dups.include? a.target }
-        .compact.uniq.join("\n")
+      attributes.map { |a| "  #{a.presetter}" if dups.include? a.target }
+                .compact.uniq.join("\n")
     end
 
     def initializer_setters
@@ -84,6 +84,10 @@ def initializer_setters
       end.compact.uniq.join("\n")
     end
 
+    def initializer_postsetters
+      attributes.map { |a| "  #{a.postsetter}" }.compact.uniq.join("\n")
+    end
+
     def defined_options
       if @options.any?
         keys = @options.map(&:target).join(" ")

diff --git a/lib/dry/initializer/option.rb b/lib/dry/initializer/option.rb
@@ -20,6 +20,11 @@ def fast_setter
       "Dry::Initializer::UNDEFINED"
     end
 
+    def postsetter
+      "@__options__[:#{target}] = @#{target}" \
+      " unless @#{target} == Dry::Initializer::UNDEFINED"
+    end
+
     # part of __defaults__
     def default_hash
       super :option

diff --git a/lib/dry/initializer/param.rb b/lib/dry/initializer/param.rb
@@ -16,6 +16,8 @@ def fast_setter
       safe_setter
     end
 
+    def postsetter; end
+
     # part of __defaults__
     def default_hash
       super :param

diff --git a/spec/options_var_spec.rb b/spec/options_var_spec.rb
@@ -18,22 +18,18 @@ class Test::Foo
     before do
       class Test::Foo
         extend Dry::Initializer::Mixin
-        param  :foo
-        option :bar, optional: true
+        option :foo
+        option :bar, default: proc { 1 }
         option :baz, optional: true
+        option :qux, proc(&:to_s), as: :quxx
       end
     end
 
-    it "is set to empty hash if no options assigned" do
-      subject = Test::Foo.new(1)
-
-      expect(subject.instance_variable_get(:@__options__)).to eq({})
-    end
-
-    it "slices allowed options only" do
-      subject = Test::Foo.new(1, baz: :QUX, qux: :BAZ)
+    it "collects coerced and renamed options with default values" do
+      subject = Test::Foo.new(foo: :FOO, qux: :QUX)
 
-      expect(subject.instance_variable_get(:@__options__)).to eq({ baz: :QUX })
+      expect(subject.instance_variable_get(:@__options__))
+        .to eq({ foo: :FOO, bar: 1, quxx: "QUX" })
     end
   end
 end