dry-initializer 1.4.1 → 2.0.0

data/spec/definition_spec.rb

@@ -18,10 +18,10 @@ describe "definition" do
     end
   end
 
-  it_behaves_like :initializer, "extend Dry::Initializer::Mixin" do
+  it_behaves_like :initializer, "extend Dry::Initializer" do
     before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
         param  :foo
         option :bar
       end
@@ -41,10 +41,12 @@ describe "definition" do
   it_behaves_like :initializer, "include Dry::Initializer with block" do
     before do
       class Test::Foo
-        include Dry::Initializer.define {
-          param  :foo
-          option :bar
-        }
+        include(
+          Dry::Initializer.define do
+            param  :foo
+            option :bar
+          end
+        )
       end
     end
   end
@@ -63,21 +65,26 @@ describe "definition" do
   it_behaves_like :initializer, "include Dry::Initializer[undefined: false]" do
     before do
       class Test::Foo
-        include Dry::Initializer[undefined: false].define {
-          param  :foo
-          option :bar
-        }
+        include(
+          Dry::Initializer[undefined: false].define do
+            param  :foo
+            option :bar
+          end
+        )
       end
     end
   end
 
+  # @deprecated
   it_behaves_like :initializer, "include Dry::Initializer::Mixin" do
     before do
       class Test::Foo
-        include Dry::Initializer::Mixin.define {
-          param  :foo
-          option :bar
-        }
+        include(
+          Dry::Initializer::Mixin.define do
+            param  :foo
+            option :bar
+          end
+        )
       end
     end
   end

data/spec/invalid_default_spec.rb

@@ -1,13 +1,13 @@
 describe "invalid default value assignment" do
   subject do
     class Test::Foo
-      extend Dry::Initializer::Mixin
+      extend Dry::Initializer
 
       param :foo, default: 1
     end
   end
 
   it "raises TypeError" do
-    expect { subject }.to raise_error TypeError, /1/
+    expect { subject }.to raise_error TypeError
   end
 end

data/spec/missed_default_spec.rb

@@ -1,7 +1,7 @@
 describe "missed default values" do
   subject do
     class Test::Foo
-      extend Dry::Initializer::Mixin
+      extend Dry::Initializer
 
       param :foo, default:  proc { :FOO }
       param :bar, required: true
@@ -9,6 +9,6 @@ describe "missed default values" do
   end
 
   it "raises SyntaxError" do
-    expect { subject }.to raise_error RuntimeError, /bar/
+    expect { subject }.to raise_error SyntaxError, /bar/
   end
 end

data/spec/optional_spec.rb

@@ -2,7 +2,7 @@ describe "optional value" do
   context "when has no default value" do
     before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
         param :foo
         param :bar, optional: true
@@ -49,7 +49,7 @@ describe "optional value" do
   context "when has a default value" do
     before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
         param :foo
         param :bar, optional: true, default: proc { "baz" }

data/spec/options_tolerance_spec.rb

@@ -1,7 +1,7 @@
 describe "options tolerance" do
   before do
     class Test::Foo
-      extend Dry::Initializer::Mixin
+      extend Dry::Initializer
     end
   end
 

data/spec/public_attributes_utility_spec.rb

@@ -0,0 +1,22 @@
+describe Dry::Initializer, ".dry_initializer.public_attributes" do
+  subject { instance.class.dry_initializer.public_attributes(instance) }
+
+  context "when class has params" do
+    before do
+      class Test::Foo
+        extend Dry::Initializer
+        param  :foo, proc(&:to_s)
+        option :moo, optional: true
+        option :bar, default: proc { 1 },     reader: false
+        option :baz, optional: true,          reader: :protected
+        option :qux, proc(&:to_s), as: :quxx, reader: :private
+      end
+    end
+
+    let(:instance) { Test::Foo.new(:FOO, bar: :BAR, baz: :BAZ, qux: :QUX) }
+
+    it "collects public options only" do
+      expect(subject).to eq({ foo: "FOO", moo: nil })
+    end
+  end
+end

data/spec/reader_spec.rb

@@ -9,7 +9,7 @@ describe "reader" do
   context "with reader: :public or no reader: option" do
     subject do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
         param  :foo
         param  :foo2, reader: :public
@@ -28,17 +28,17 @@ describe "reader" do
   end
 
   context "with reader: false" do
-    subject do
+    before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
         param  :foo, reader: false
         option :bar, reader: false
       end
-
-      Test::Foo.new 1, bar: 2
     end
 
+    subject { Test::Foo.new 1, bar: 2 }
+
     it_behaves_like "it has no public attr_reader"
 
     it "keeps assigning variables" do
@@ -48,17 +48,17 @@ describe "reader" do
   end
 
   context "with reader: :private" do
-    subject do
+    before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
         param  :foo, reader: :private
         option :bar, reader: :private
       end
-
-      Test::Foo.new 1, bar: 2
     end
 
+    subject { Test::Foo.new 1, bar: 2 }
+
     it_behaves_like "it has no public attr_reader"
 
     it "adds a private attr_reader" do
@@ -70,7 +70,7 @@ describe "reader" do
   context "with reader: :protected" do
     subject do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
         param  :foo, reader: :protected
         option :bar, reader: :protected
@@ -81,7 +81,7 @@ describe "reader" do
 
     it "adds a protected attr_reader" do
       protected_instance_methods = subject.class.protected_instance_methods
-      expect(protected_instance_methods).to match_array([:foo, :bar])
+      expect(protected_instance_methods).to match_array(%i[foo bar])
     end
   end
 end

data/spec/repetitive_definitions_spec.rb

@@ -4,7 +4,7 @@ describe "repetitive definitions" do
   context "of params" do
     before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
         param :foo, default: proc { 0 }
         param :bar, default: proc { 1 }
@@ -20,7 +20,7 @@ describe "repetitive definitions" do
   context "of options" do
     before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
         option :foo, default: proc { 0 }
         option :bar, default: proc { 1 }
@@ -36,7 +36,7 @@ describe "repetitive definitions" do
   context "of param and option" do
     before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
         param  :foo, default: proc { 0 }
         option :bar, default: proc { 1 }
@@ -52,9 +52,9 @@ describe "repetitive definitions" do
   context "of optional param and option" do
     before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
 
-        param  :foo, optional: true
+        param  :baz, optional: true, as: :foo
         option :bar, optional: true
         option :foo, optional: true
       end

data/spec/several_assignments_spec.rb

@@ -1,7 +1,7 @@
 describe "attribute with several assignments" do
   before do
     class Test::Foo
-      extend Dry::Initializer::Mixin
+      extend Dry::Initializer
 
       option :bar, proc(&:to_s),    optional: true
       option :"some foo", as: :bar, optional: true

data/spec/spec_helper.rb

@@ -1,4 +1,9 @@
 require "dry/initializer"
+begin
+  require "pry"
+rescue
+  nil
+end
 
 RSpec.configure do |config|
   config.order = :random

data/spec/subclassing_spec.rb

@@ -1,8 +1,7 @@
 describe "subclassing" do
   before do
     class Test::Foo
-      extend Dry::Initializer::Mixin
-
+      extend Dry::Initializer[undefined: false]
       param  :foo
       option :bar
     end
@@ -21,6 +20,11 @@ describe "subclassing" do
     Test::Bar.new 1, 2, bar: 3, qux: 4
   end
 
+  it "preserves null definition" do
+    expect(Test::Foo.dry_initializer.null).to be_nil
+    expect(Test::Bar.dry_initializer.null).to be_nil
+  end
+
   it "preserves definitions made in the superclass" do
     expect(instance_of_subclass.foo).to eql 1
     expect(instance_of_subclass.baz).to eql 2
@@ -37,7 +41,7 @@ describe "subclassing" do
     called = false
     mixin = Module.new { define_method(:inherited) { |_| called = true } }
 
-    base = Class.new { extend mixin; extend Dry::Initializer::Mixin }
+    base = Class.new { extend mixin; extend Dry::Initializer }
     Class.new(base)
 
     expect(called).to be true

data/spec/type_argument_spec.rb

@@ -3,7 +3,7 @@ require "dry-types"
 describe "type argument" do
   before do
     class Test::Foo
-      extend Dry::Initializer::Mixin
+      extend Dry::Initializer
       param  :foo, Dry::Types["strict.string"]
       option :bar, Dry::Types["strict.string"]
     end

data/spec/type_constraint_spec.rb

@@ -4,7 +4,7 @@ describe "type constraint" do
   context "by dry-type" do
     before do
       class Test::Foo
-        extend Dry::Initializer::Mixin
+        extend Dry::Initializer
         param :foo, Dry::Types["strict.string"], optional: true
       end
     end
@@ -39,7 +39,7 @@ describe "type constraint" do
     it "raises TypeError" do
       expect do
         class Test::Foo
-          extend Dry::Initializer::Mixin
+          extend Dry::Initializer
           param :foo, type: String
         end
       end.to raise_error(TypeError)

data/spec/value_coercion_via_dry_types_spec.rb

@@ -7,7 +7,7 @@ describe "value coercion via dry-types" do
     end
 
     class Test::Foo
-      extend Dry::Initializer::Mixin
+      extend Dry::Initializer
 
       param  :foo, type: Test::Types::Coercible::String
       option :bar, proc(&:to_i), default: proc { "16" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -68,9 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.42'
 description: 
-email:
-- hashtable@yandex.ru
-- andrew.kozin@gmail.com
+email: andrew.kozin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -88,36 +86,37 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- benchmarks/options.rb
-- benchmarks/params.rb
-- benchmarks/params_vs_options.rb
-- benchmarks/profiler.rb
-- benchmarks/several_defaults.rb
+- benchmarks/compare_several_defaults.rb
+- benchmarks/plain_options.rb
+- benchmarks/plain_params.rb
+- benchmarks/with_coercion.rb
 - benchmarks/with_defaults.rb
-- benchmarks/with_types.rb
-- benchmarks/with_types_and_defaults.rb
-- benchmarks/without_options.rb
+- benchmarks/with_defaults_and_coercion.rb
 - dry-initializer.gemspec
 - lib/dry-initializer.rb
 - lib/dry/initializer.rb
-- lib/dry/initializer/attribute.rb
-- lib/dry/initializer/builder.rb
-- lib/dry/initializer/class_dsl.rb
-- lib/dry/initializer/exceptions/default_value_error.rb
-- lib/dry/initializer/exceptions/params_order_error.rb
-- lib/dry/initializer/exceptions/type_constraint_error.rb
-- lib/dry/initializer/instance_dsl.rb
-- lib/dry/initializer/option.rb
-- lib/dry/initializer/param.rb
+- lib/dry/initializer/builders.rb
+- lib/dry/initializer/builders/attribute.rb
+- lib/dry/initializer/builders/initializer.rb
+- lib/dry/initializer/builders/reader.rb
+- lib/dry/initializer/builders/signature.rb
+- lib/dry/initializer/config.rb
+- lib/dry/initializer/definition.rb
+- lib/dry/initializer/dsl.rb
+- lib/dry/initializer/mixin.rb
+- lib/dry/initializer/mixin/local.rb
+- lib/dry/initializer/mixin/root.rb
+- lib/tasks/benchmark.rake
+- lib/tasks/profile.rake
+- spec/attributes_spec.rb
 - spec/custom_initializer_spec.rb
 - spec/default_values_spec.rb
 - spec/definition_spec.rb
-- spec/gem_enhancement_spec.rb
 - spec/invalid_default_spec.rb
 - spec/missed_default_spec.rb
 - spec/optional_spec.rb
 - spec/options_tolerance_spec.rb
-- spec/options_var_spec.rb
+- spec/public_attributes_utility_spec.rb
 - spec/reader_spec.rb
 - spec/repetitive_definitions_spec.rb
 - spec/several_assignments_spec.rb
@@ -138,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -151,15 +150,15 @@ signing_key:
 specification_version: 4
 summary: DSL for declaring params and options of the initializer
 test_files:
+- spec/attributes_spec.rb
 - spec/custom_initializer_spec.rb
 - spec/default_values_spec.rb
 - spec/definition_spec.rb
-- spec/gem_enhancement_spec.rb
 - spec/invalid_default_spec.rb
 - spec/missed_default_spec.rb
 - spec/optional_spec.rb
 - spec/options_tolerance_spec.rb
-- spec/options_var_spec.rb
+- spec/public_attributes_utility_spec.rb
 - spec/reader_spec.rb
 - spec/repetitive_definitions_spec.rb
 - spec/several_assignments_spec.rb
@@ -168,3 +167,4 @@ test_files:
 - spec/type_argument_spec.rb
 - spec/type_constraint_spec.rb
 - spec/value_coercion_via_dry_types_spec.rb
+has_rdoc: 

data/benchmarks/options.rb

@@ -1,54 +0,0 @@
-Bundler.require(:benchmarks)
-
-require "dry-initializer"
-class NoOptsTest
-  extend Dry::Initializer::Mixin
-
-  param  :foo
-  option :bar
-end
-
-class DefaultsTest
-  extend Dry::Initializer::Mixin
-
-  param  :foo, default: proc { "FOO" }
-  option :bar, default: proc { "BAR" }
-end
-
-class TypesTest
-  extend Dry::Initializer::Mixin
-
-  param  :foo, proc(&:to_s)
-  option :bar, proc(&:to_s)
-end
-
-class DefaultsAndTypesTest
-  extend Dry::Initializer::Mixin
-
-  param  :foo, proc(&:to_s), default: proc { "FOO" }
-  option :bar, proc(&:to_s), default: proc { "BAR" }
-end
-
-puts "Benchmark for various options"
-
-Benchmark.ips do |x|
-  x.config time: 15, warmup: 10
-
-  x.report("no opts") do
-    NoOptsTest.new "foo", bar: "bar"
-  end
-
-  x.report("with defaults") do
-    DefaultsTest.new
-  end
-
-  x.report("with types") do
-    TypesTest.new "foo", bar: "bar"
-  end
-
-  x.report("with defaults and types") do
-    DefaultsAndTypesTest.new
-  end
-
-  x.compare!
-end

data/benchmarks/params_vs_options.rb

@@ -1,35 +0,0 @@
-Bundler.require(:benchmarks)
-
-require "dry-initializer"
-
-class ParamDefaults
-  extend Dry::Initializer::Mixin
-
-  param :foo, default: proc { "FOO" }
-  param :bar, default: proc { "BAR" }
-  param :baz, default: proc { "BAZ" }
-end
-
-class OptionDefaults
-  extend Dry::Initializer::Mixin
-
-  option :foo, default: proc { "FOO" }
-  option :bar, default: proc { "BAR" }
-  option :baz, default: proc { "BAZ" }
-end
-
-puts "Benchmark for param's vs. option's defaults"
-
-Benchmark.ips do |x|
-  x.config time: 15, warmup: 10
-
-  x.report("param's defaults") do
-    ParamDefaults.new
-  end
-
-  x.report("option's defaults") do
-    OptionDefaults.new
-  end
-
-  x.compare!
-end

data/benchmarks/profiler.rb

@@ -1,28 +0,0 @@
-require "dry-initializer"
-require "ruby-prof"
-require "fileutils"
-
-class User
-  extend Dry::Initializer
-
-  param  :first_name,  proc(&:to_s), default: proc { "Unknown" }
-  param  :second_name, proc(&:to_s), default: proc { "Unknown" }
-  option :email,       proc(&:to_s), optional: true
-  option :phone,       proc(&:to_s), optional: true
-end
-
-result = RubyProf.profile do
-  1_000.times { User.new :Andy, email: :"andy@example.com" }
-end
-
-FileUtils.mkdir_p "./tmp"
-
-FileUtils.touch "./tmp/profile.dot"
-File.open("./tmp/profile.dot", "w+") do |output|
-  RubyProf::DotPrinter.new(result).print(output, min_percent: 0)
-end
-
-FileUtils.touch "./tmp/profile.html"
-File.open("./tmp/profile.html", "w+") do |output|
-  RubyProf::CallStackPrinter.new(result).print(output, min_percent: 0)
-end