dry-initializer 0.11.0 → 1.0.0

data/spec/missed_default_spec.rb

@@ -3,8 +3,8 @@ describe "missed default values" do
     class Test::Foo
       extend Dry::Initializer::Mixin
 
-      param :foo, default: proc { :FOO }
-      param :bar
+      param :foo, default:  proc { :FOO }
+      param :bar, required: true
     end
   end
 

data/spec/optional_spec.rb

@@ -9,22 +9,27 @@ describe "optional value" do
       end
     end
 
-    it "is left UNDEFINED by default" do
+    it "quacks like nil" do
       subject = Test::Foo.new(1)
 
-      expect(subject.foo).to eq 1
-      expect(subject.bar).to eq Dry::Initializer::UNDEFINED
+      expect(subject.bar).to eq nil
+    end
+
+    it "keeps info about been UNDEFINED" do
+      subject = Test::Foo.new(1)
+
+      expect(subject.instance_variable_get(:@bar))
+        .to eq Dry::Initializer::UNDEFINED
     end
 
     it "can be set explicitly" do
       subject = Test::Foo.new(1, "qux")
 
-      expect(subject.foo).to eq 1
       expect(subject.bar).to eq "qux"
     end
   end
 
-  context "when has default value" do
+  context "when has a default value" do
     before do
       class Test::Foo
         extend Dry::Initializer::Mixin
@@ -37,8 +42,13 @@ describe "optional value" do
     it "is takes default value" do
       subject = Test::Foo.new(1)
 
-      expect(subject.foo).to eq 1
       expect(subject.bar).to eq "baz"
     end
+
+    it "can be set explicitly" do
+      subject = Test::Foo.new(1, "qux")
+
+      expect(subject.bar).to eq "qux"
+    end
   end
 end

data/spec/options_var_spec.rb

@@ -0,0 +1,39 @@
+describe "@__options__" do
+  context "when class has no options" do
+    before do
+      class Test::Foo
+        extend Dry::Initializer::Mixin
+        param :foo
+      end
+    end
+
+    it "is set to empty hash" do
+      subject = Test::Foo.new(1)
+
+      expect(subject.instance_variable_get(:@__options__)).to eq({})
+    end
+  end
+
+  context "when class has options" do
+    before do
+      class Test::Foo
+        extend Dry::Initializer::Mixin
+        param  :foo
+        option :bar, optional: true
+        option :baz, optional: true
+      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 "is set to hash of assigned options" do
+      subject = Test::Foo.new(1, baz: :QUX)
+
+      expect(subject.instance_variable_get(:@__options__)).to eq({ baz: :QUX })
+    end
+  end
+end

data/spec/repetitive_definitions_spec.rb

@@ -1,49 +1,69 @@
 describe "repetitive definitions" do
+  subject { Test::Foo.new }
+
   context "of params" do
-    subject do
+    before do
       class Test::Foo
         extend Dry::Initializer::Mixin
 
-        param :foo
-        param :bar
-        param :foo
+        param :foo, default: proc { 0 }
+        param :bar, default: proc { 1 }
+        param :foo, default: proc { 2 }
       end
     end
 
-    it "raise SyntaxError" do
-      expect { subject }.to raise_error SyntaxError, /foo/
+    it "reloads the attribute" do
+      expect(subject.foo).to eq 2
     end
   end
 
   context "of options" do
-    subject do
+    before do
       class Test::Foo
         extend Dry::Initializer::Mixin
 
-        option :foo
-        option :bar
-        option :foo
+        option :foo, default: proc { 0 }
+        option :bar, default: proc { 1 }
+        option :foo, default: proc { 2 }
       end
     end
 
-    it "raise SyntaxError" do
-      expect { subject }.to raise_error SyntaxError, /foo/
+    it "reloads the attribute" do
+      expect(subject.foo).to eq 2
     end
   end
 
   context "of param and option" do
-    subject do
+    before do
+      class Test::Foo
+        extend Dry::Initializer::Mixin
+
+        param  :foo, default: proc { 0 }
+        option :bar, default: proc { 1 }
+        option :foo, default: proc { 2 }
+      end
+    end
+
+    it "reloads the attribute" do
+      expect(subject.foo).to eq 2
+    end
+  end
+
+  context "of optional param and option" do
+    before do
       class Test::Foo
         extend Dry::Initializer::Mixin
 
-        param  :foo
-        option :bar
-        option :foo
+        param  :foo, optional: true
+        option :bar, optional: true
+        option :foo, optional: true
       end
     end
 
-    it "raise SyntaxError" do
-      expect { subject }.to raise_error SyntaxError, /foo/
+    it "allows various assignments" do
+      expect(Test::Foo.new(1).foo).to eq 1
+      expect(Test::Foo.new(foo: 2).foo).to eq 2
+      expect(Test::Foo.new(1, foo: 2).foo).to eq 2
     end
   end
 end

data/spec/type_constraint_spec.rb

@@ -5,7 +5,7 @@ describe "type constraint" do
     before do
       class Test::Foo
         extend Dry::Initializer::Mixin
-        param :foo, type: Dry::Types["strict.string"], optional: true
+        param :foo, Dry::Types["strict.string"], optional: true
       end
     end
 
@@ -28,8 +28,8 @@ describe "type constraint" do
     context "if optional value not set" do
       subject { Test::Foo.new }
 
-      it "completes the initialization" do
-        expect { subject }.not_to raise_error
+      it "applies type constraint to Dry::Initializer::UNDEFINED" do
+        expect { subject }.to raise_error Dry::Types::ConstraintError
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -99,21 +99,13 @@ files:
 - dry-initializer.gemspec
 - lib/dry-initializer.rb
 - lib/dry/initializer.rb
+- lib/dry/initializer/attribute.rb
 - lib/dry/initializer/builder.rb
-- lib/dry/initializer/errors.rb
-- lib/dry/initializer/errors/default_value_error.rb
-- lib/dry/initializer/errors/order_error.rb
-- lib/dry/initializer/errors/plugin_error.rb
-- lib/dry/initializer/errors/redefinition_error.rb
-- lib/dry/initializer/errors/type_constraint_error.rb
-- lib/dry/initializer/mixin.rb
-- lib/dry/initializer/plugins.rb
-- lib/dry/initializer/plugins/base.rb
-- lib/dry/initializer/plugins/default_proc.rb
-- lib/dry/initializer/plugins/signature.rb
-- lib/dry/initializer/plugins/type_constraint.rb
-- lib/dry/initializer/plugins/variable_setter.rb
-- lib/dry/initializer/signature.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/option.rb
+- lib/dry/initializer/param.rb
 - spec/base_spec.rb
 - spec/container_spec.rb
 - spec/custom_initializer_spec.rb
@@ -123,7 +115,7 @@ files:
 - spec/missed_default_spec.rb
 - spec/optional_spec.rb
 - spec/options_tolerance_spec.rb
-- spec/plugin_registry_spec.rb
+- spec/options_var_spec.rb
 - spec/reader_spec.rb
 - spec/renaming_options_spec.rb
 - spec/repetitive_definitions_spec.rb
@@ -166,7 +158,7 @@ test_files:
 - spec/missed_default_spec.rb
 - spec/optional_spec.rb
 - spec/options_tolerance_spec.rb
-- spec/plugin_registry_spec.rb
+- spec/options_var_spec.rb
 - spec/reader_spec.rb
 - spec/renaming_options_spec.rb
 - spec/repetitive_definitions_spec.rb

data/lib/dry/initializer/errors.rb

@@ -1,10 +0,0 @@
-module Dry::Initializer
-  # Collection of gem-specific exceptions
-  module Errors
-    require_relative "errors/default_value_error"
-    require_relative "errors/order_error"
-    require_relative "errors/plugin_error"
-    require_relative "errors/redefinition_error"
-    require_relative "errors/type_constraint_error"
-  end
-end

data/lib/dry/initializer/errors/default_value_error.rb

@@ -1,6 +0,0 @@
-class Dry::Initializer::Errors::DefaultValueError < TypeError
-  def initialize(name, value)
-    super "Cannot set #{value.inspect} directly as a default value" \
-          " of the argument '#{name}'. Wrap it to either proc or lambda."
-  end
-end

data/lib/dry/initializer/errors/order_error.rb

@@ -1,7 +0,0 @@
-class Dry::Initializer::Errors::OrderError < SyntaxError
-  def initialize(name)
-    super "Cannot define the required param '#{name}' after optional ones." \
-          " Either provide a default value for the '#{name}', or declare it" \
-          " before params with default values."
-  end
-end

data/lib/dry/initializer/errors/plugin_error.rb

@@ -1,6 +0,0 @@
-class Dry::Initializer::Errors::PluginError < TypeError
-  def initialize(plugin)
-    super "#{plugin} is not a valid plugin." \
-          " Use a subclass of Dry::Initialier::Plugins::Base."
-  end
-end

data/lib/dry/initializer/errors/redefinition_error.rb

@@ -1,5 +0,0 @@
-class Dry::Initializer::Errors::RedefinitionError < SyntaxError
-  def initialize(name)
-    super "The argument '#{name}' is already defined."
-  end
-end

data/lib/dry/initializer/errors/type_constraint_error.rb

@@ -1,5 +0,0 @@
-class Dry::Initializer::Errors::TypeConstraintError < TypeError
-  def initialize(name, type)
-    super "#{type} used as constraint for argument '#{name}' is not a dry-type."
-  end
-end

data/lib/dry/initializer/mixin.rb

@@ -1,77 +0,0 @@
-module Dry::Initializer
-  # Class-level DSL for the initializer
-  module Mixin
-    # Declares a plain argument
-    #
-    # @param [#to_sym] name
-    #
-    # @option options [Object]  :default The default value
-    # @option options [#call]   :type    The type constraings via `dry-types`
-    # @option options [Boolean] :reader (true) Whether to define attr_reader
-    #
-    # @return [self] itself
-    #
-    def param(name, type = nil, **options)
-      options[:type]   = type if type
-      options[:option] = false
-      @__initializer_builder__ = __initializer_builder__.define(name, **options)
-      __initializer_builder__.call(__initializer_mixin__)
-    end
-
-    # Declares a named argument
-    #
-    # @param  (see #param)
-    # @option (see #param)
-    # @return (see #param)
-    #
-    def option(name, type = nil, **options)
-      options[:type]   = type if type
-      options[:option] = true
-      @__initializer_builder__ = __initializer_builder__.define(name, **options)
-      __initializer_builder__.call(__initializer_mixin__)
-    end
-
-    # Adds new plugin to the builder
-    #
-    # @param  [Dry::Initializer::Plugins::Base] plugin
-    # @return [self] itself
-    #
-    def register_initializer_plugin(plugin)
-      @__initializer_builder__ = __initializer_builder__.register(plugin)
-      __initializer_builder__.call(__initializer_mixin__)
-    end
-
-    private
-
-    def __initializer_mixin__
-      @__initializer_mixin__ ||= Module.new do
-        def initialize(*args)
-          __initialize__(*args)
-        end
-      end
-    end
-
-    def __initializer_builder__
-      @__initializer_builder__ ||= Builder.new
-    end
-
-    def inherited(klass)
-      new_builder = __initializer_builder__.dup
-      klass.instance_variable_set :@__initializer_builder__, new_builder
-
-      new_mixin = Module.new
-      new_builder.call(new_mixin)
-      klass.instance_variable_set :@__initializer_mixin__, new_mixin
-      klass.include new_mixin
-
-      super
-    end
-
-    def self.extended(klass)
-      super
-      mixin = klass.send(:__initializer_mixin__)
-      klass.send(:__initializer_builder__).call(mixin)
-      klass.include mixin
-    end
-  end
-end

data/lib/dry/initializer/plugins.rb

@@ -1,10 +0,0 @@
-module Dry::Initializer
-  # Namespace for code plugins builders
-  module Plugins
-    require_relative "plugins/base"
-    require_relative "plugins/default_proc"
-    require_relative "plugins/signature"
-    require_relative "plugins/type_constraint"
-    require_relative "plugins/variable_setter"
-  end
-end

data/lib/dry/initializer/plugins/base.rb

@@ -1,47 +0,0 @@
-module Dry::Initializer::Plugins
-  # Base class for plugins
-  #
-  # A plugin should has class method [.call] that takes argument name and
-  # settings and return a chunk of code for the #initialize method body.
-  #
-  class Base
-    include Dry::Initializer::Errors
-
-    # Builds the proc for the `__after_initializer__` callback
-    #
-    # @param [#to_s] name
-    # @param [Hash<Symbol, Object>] settings
-    #
-    # @return [String, Proc, nil]
-    #
-    def self.call(name, settings)
-      new(name, settings).call
-    end
-
-    # @private
-    attr_reader :name, :settings
-
-    # Initializes a builder with argument name and settings
-    # @param (see .call)
-    def initialize(name, settings)
-      @name     = name
-      @settings = settings
-    end
-
-    # Checks equality to another instance by name
-    # @return [Boolean]
-    def ==(other)
-      other.instance_of?(self.class) && (other.name == name)
-    end
-
-    # Builds a chunk of code
-    # @return (see .call)
-    def call; end
-
-    # Returns the name for the attribute
-    # @return (see .name)
-    def rename
-      @rename ||= settings[:option] ? (settings[:as] || name) : name
-    end
-  end
-end