dry-initializer 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 852519c02a938d27a827cff9c4cfd1e40c9c9dac
-  data.tar.gz: 94923136d38c0afbc74ffa76ed35c4074c9ba75b
+  metadata.gz: 5bb3cc8fc0769ecd8c81518372df7bb0d74969f4
+  data.tar.gz: ace5842b26ce417325dbd6b1f653a3ffd1212c47
 SHA512:
-  metadata.gz: c4195fe8176762d89b1593f05cde79e4c249dda71ace60fb070a75f92222f344d349cc97b3567e032d3aa67ac4556e97bc4282133fac724ea655decc1a4e95e7
-  data.tar.gz: 0d50b2012d31467424ff6c232c5c3d8fff0e5d601eacf533c23f080933205aaa384948b98cc0831496ec6ac30b38697bf99554ef8d79b3f04f0922ef10de0b7e
+  metadata.gz: 48e0d784c9b40a88473e22bbb075ef31074ea207f864093f144a7792c3e485b8ffe92a95fd164d3b27a1301131c4b10006bd9a6631e2ed0509c49e1bc7263551
+  data.tar.gz: fc4bf50667a8a5164d957851cad69976941a240be37aa3bc8c68201dadfdce1a521d687e327a42bc22c87d72378c10169b1691a502ffa228895a6e83bba435e7

data/.rubocop.yml

@@ -5,12 +5,21 @@ AllCops:
   StyleGuideCopsOnly: true
   TargetRubyVersion:  2.2
 
+Bundler/DuplicatedGem:
+  Enabled: false
+
 Style/CaseEquality:
   Enabled: false
 
 Style/ClassVars:
   Enabled: false
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
 Style/DoubleNegation:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.1.1 2017-02-04
+
+# Bugs Fixed
+- `@__option__` 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)
+
 ## v1.1.0 2017-01-28
 
 # Added:

data/Gemfile

@@ -4,8 +4,6 @@ source "https://rubygems.org"
 gemspec
 
 group :benchmarks do
-  gem "benchmark-ips", "~> 2.5"
-
   if RUBY_VERSION < "2.4"
     gem "activesupport", "< 5"
   else
@@ -15,13 +13,14 @@ group :benchmarks do
   gem "active_attr"
   gem "anima"
   gem "attr_extras"
+  gem "benchmark-ips", "~> 2.5"
   gem "concord"
   gem "fast_attributes"
   gem "kwattr"
+  gem "ruby-prof"
   gem "value_struct"
   gem "values"
   gem "virtus"
-  gem "ruby-prof"
 end
 
 group :development, :test do

data/dry-initializer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "dry-initializer"
-  gem.version  = "1.1.0"
+  gem.version  = "1.1.1"
   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/attribute.rb

@@ -88,5 +88,15 @@ module Dry::Initializer
       return if coercer.nil? || coercer.respond_to?(:call)
       fail TypeConstraintError.new(source, coercer)
     end
+
+    def default_hash(type)
+      default ? { :"#{type}_#{source}" => default } : {}
+    end
+
+    def coercer_hash(type)
+      return {} unless coercer
+      value = proc { |v| v == Dry::Initializer::UNDEFINED ? v : coercer.(v) }
+      { :"#{type}_#{source}" => value }
+    end
   end
 end

data/lib/dry/initializer/builder.rb

@@ -33,7 +33,7 @@ module Dry::Initializer
     def code
       <<-RUBY.gsub(/^ +\|/, "")
         |def __initialize__(#{initializer_signatures})
-        |  @__options__ = __options__
+        |  @__options__ = #{defined_options}
         |#{initializer_presetters}
         |#{initializer_setters}
         |end
@@ -75,6 +75,15 @@ module Dry::Initializer
       end.compact.uniq.join("\n")
     end
 
+    def defined_options
+      if @options.any?
+        keys = @options.map(&:target).join(" ")
+        "__options__.select { |key| %i(#{keys}).include? key }"
+      else
+        "{}"
+      end
+    end
+
     def getters
       attributes.map(&:getter).compact.uniq.join("\n")
     end

data/lib/dry/initializer/exceptions/params_order_error.rb

@@ -1,5 +1,5 @@
 module Dry::Initializer
-  class ParamsOrderError < SyntaxError
+  class ParamsOrderError < RuntimeError
     def initialize(required, optional)
       super "Optional param '#{optional}'" \
             " should not preceed required '#{required}'"

data/lib/dry/initializer/option.rb

@@ -22,14 +22,12 @@ module Dry::Initializer
 
     # part of __defaults__
     def default_hash
-      default ? { :"option_#{source}" => default } : {}
+      super :option
     end
 
     # part of __coercers__
     def coercer_hash
-      return {} unless coercer
-      value = proc { |v| (v == Dry::Initializer::UNDEFINED) ? v : coercer.(v) }
-      { :"option_#{source}" => value }
+      super :option
     end
 
     private

data/lib/dry/initializer/param.rb

@@ -18,14 +18,12 @@ module Dry::Initializer
 
     # part of __defaults__
     def default_hash
-      default ? { :"param_#{target}" => default } : {}
+      super :param
     end
 
     # part of __coercers__
     def coercer_hash
-      return {} unless coercer
-      value = proc { |v| (v == Dry::Initializer::UNDEFINED) ? v : coercer.(v) }
-      { :"param_#{target}" => value }
+      super :param
     end
 
     private

data/spec/missed_default_spec.rb

@@ -9,6 +9,6 @@ describe "missed default values" do
   end
 
   it "raises SyntaxError" do
-    expect { subject }.to raise_error SyntaxError, /bar/
+    expect { subject }.to raise_error RuntimeError, /bar/
   end
 end

data/spec/options_var_spec.rb

@@ -30,8 +30,8 @@ describe "@__options__" do
       expect(subject.instance_variable_get(:@__options__)).to eq({})
     end
 
-    it "is set to hash of assigned options" do
-      subject = Test::Foo.new(1, baz: :QUX)
+    it "slices allowed options only" do
+      subject = Test::Foo.new(1, baz: :QUX, qux: :BAZ)
 
       expect(subject.instance_variable_get(:@__options__)).to eq({ baz: :QUX })
     end

metadata

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