dry-initializer 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37ac42279e4e9b15878d9b97d369ec986c298a19
-  data.tar.gz: d151c2e841969c7c726f77ec7148168798b819f2
+  metadata.gz: 77c08e7da9990b73b8c94815830a19694b424317
+  data.tar.gz: df1ab88700f059cd3327e7c1745d41aaa901000a
 SHA512:
-  metadata.gz: f5b4b8b3551d90860e091204e5b56c42f4d4679bdf0bda21dec183024566ddae301c5def3b6f5edb4b3ac68a3f83666239e054eb333243c29572a53b39341ef1
-  data.tar.gz: 03bf3a13c91c5c7f9e1d4423885f77925e51cac17e3a0b48d4affefcb501837a459c6814e72b2f664eec48caee9b9e5b87934a814590fa3df3f8a5b5630f9f49
+  metadata.gz: 8b04de090fba7b94c917791ebdbff775e3dfd4ae4bfb2c7d51ec9785ae7007324802870c476daf348a397a0ef3ff8c34d70c17fa28777cbb338eb4de44acb137
+  data.tar.gz: 8bb88fc5ada80331a4c1a8d1a076200294db7d2c66009f6da79edef7742fe03e5094d69f5ac97ee57c336354504f00dcc95bf02ac527d21880dfb0ba2be043f4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.2.0 2017-03-05
+
+# Fixed
+- The `@__options__` variable collects renamed options after default values and coercions were applied (nepalez)
+
+[Compare v1.1.3...v1.2.0](https://github.com/dry-rb/dry-initializer/compare/v1.1.3...v1.2.0)
+
 ## v1.1.3 2017-03-01
 
 # Added
@@ -15,7 +22,7 @@
 ## v1.1.1 2017-02-04
 
 # Bugs Fixed
-- `@__option__` collects defined options only (nepalez)
+- `@__options__` collects defined options only (nepalez)
 
 [Compare v1.1.0...v1.1.1](https://github.com/dry-rb/dry-initializer/compare/v1.1.0...v1.1.1)
 

data/dry-initializer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "dry-initializer"
-  gem.version  = "1.1.3"
+  gem.version  = "1.2.0"
   gem.author   = ["Vladimir Kochnev (marshall-lee)", "Andrew Kozin (nepalez)"]
   gem.email    = ["hashtable@yandex.ru", "andrew.kozin@gmail.com"]
   gem.homepage = "https://github.com/dryrb/dry-initializer"

data/lib/dry/initializer/builder.rb

@@ -42,9 +42,10 @@ module Dry::Initializer
     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 @@ module Dry::Initializer
 
     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 @@ module Dry::Initializer
       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(" ")

data/lib/dry/initializer/option.rb

@@ -20,6 +20,11 @@ module Dry::Initializer
       "Dry::Initializer::UNDEFINED"
     end
 
+    def postsetter
+      "@__options__[:#{target}] = @#{target}" \
+      " unless @#{target} == Dry::Initializer::UNDEFINED"
+    end
+
     # part of __defaults__
     def default_hash
       super :option

data/lib/dry/initializer/param.rb

@@ -16,6 +16,8 @@ module Dry::Initializer
       safe_setter
     end
 
+    def postsetter; end
+
     # part of __defaults__
     def default_hash
       super :param

data/spec/options_var_spec.rb

@@ -18,22 +18,18 @@ describe "@__options__" do
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec