dry-initializer 0.1.1 → 0.2.0

data/lib/dry/initializer/signature.rb

@@ -0,0 +1,47 @@
+module Dry::Initializer
+  # Mutable container for chunks of code describing argument signatures.
+  # Responcible for building the resulting signature for the initializer args.
+  class Signature
+    include Enumerable
+    include Errors
+
+    def initialize
+      @list ||= []
+    end
+
+    def add(*args)
+      signature = Plugins::Signature.new(*args)
+
+      validates_uniqueness_of signature
+      validates_order_of signature
+
+      @list << signature
+      self
+    end
+
+    def call
+      map(&:call).join(", ")
+    end
+
+    private
+
+    def each
+      (@list.select(&:param?) + @list.reject(&:param?)).each do |item|
+        yield item
+      end
+    end
+
+    def validates_uniqueness_of(signature)
+      return unless include? signature
+
+      fail RedefinitionError.new(signature.name)
+    end
+
+    def validates_order_of(signature)
+      return unless signature.param? && !signature.default?
+      return unless any? { |item| item.param? && item.default? }
+
+      fail OrderError.new(signature.name)
+    end
+  end
+end

data/spec/dry/container_spec.rb

@@ -1,5 +1,5 @@
-describe "base example" do
-  context 'using block syntax' do
+describe "container" do
+  context "with block syntax" do
     before do
       class Test::Foo
         include Dry::Initializer.define {
@@ -21,7 +21,7 @@ describe "base example" do
     end
   end
 
-  context 'using lambda syntax' do
+  context "with lambda syntax" do
     before do
       class Test::Foo
         include Dry::Initializer.define -> do

data/spec/dry/dry_type_constraint_spec.rb

@@ -0,0 +1,30 @@
+require "dry-types"
+
+describe "Dry type constraint" do
+  before do
+    module Test::Types
+      include Dry::Types.module
+    end
+
+    class Test::Foo
+      extend Dry::Initializer::Mixin
+      param :foo, type: Test::Types::Strict::String
+    end
+  end
+
+  context "in case of mismatch" do
+    subject { Test::Foo.new 1 }
+
+    it "raises TypeError" do
+      expect { subject }.to raise_error TypeError, /1/
+    end
+  end
+
+  context "in case of match" do
+    subject { Test::Foo.new "foo" }
+
+    it "completes the initialization" do
+      expect { subject }.not_to raise_error
+    end
+  end
+end

data/spec/dry/invalid_default_spec.rb

@@ -8,6 +8,6 @@ describe "invalid default value assignment" do
   end
 
   it "raises TypeError" do
-    expect { subject }.to raise_error SyntaxError, /1/
+    expect { subject }.to raise_error TypeError, /1/
   end
 end

data/spec/dry/{proc_type_spec.rb → object_type_constraint_spec.rb}

@@ -1,14 +1,14 @@
-describe "proc type" do
+describe "object type constraint" do
   before do
     class Test::Foo
       extend Dry::Initializer::Mixin
 
-      param :foo, type: proc { |val| fail(TypeError) unless String === val }
+      param :foo, type: /bar/
     end
   end
 
   context "in case of mismatch" do
-    subject { Test::Foo.new :foo }
+    subject { Test::Foo.new 'baz' }
 
     it "raises TypeError" do
       expect { subject }.to raise_error TypeError
@@ -16,7 +16,7 @@ describe "proc type" do
   end
 
   context "in case of match" do
-    subject { Test::Foo.new "foo" }
+    subject { Test::Foo.new 'barbar' }
 
     it "completes the initialization" do
       expect { subject }.not_to raise_error

data/spec/dry/{poro_type_spec.rb → plain_type_constraint_spec.rb}

@@ -1,4 +1,4 @@
-describe "PORO type" do
+describe "plain type constraint" do
   before do
     class Test::Foo
       extend Dry::Initializer::Mixin

data/spec/dry/value_coercion_via_dry_types_spec.rb

@@ -0,0 +1,21 @@
+require "dry-types"
+
+describe "value coercion via dry-types" do
+  before do
+    module Test::Types
+      include Dry::Types.module
+    end
+
+    class Test::Foo
+      extend Dry::Initializer::Mixin
+
+      param :foo, type: Test::Types::Coercible::String
+    end
+  end
+
+  subject { Test::Foo.new :foo }
+
+  it "coerces values" do
+    expect(subject.foo).to eql "foo"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,50 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+  name: rspec
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
+  name: dry-types
+  prerelease: false
 description: 
 email:
 - hashtable@yandex.ru
@@ -85,30 +85,35 @@ files:
 - dry-initializer.gemspec
 - lib/dry-initializer.rb
 - lib/dry/initializer.rb
-- lib/dry/initializer/argument.rb
-- lib/dry/initializer/arguments.rb
 - lib/dry/initializer/builder.rb
 - lib/dry/initializer/errors.rb
-- lib/dry/initializer/errors/existing_argument_error.rb
-- lib/dry/initializer/errors/invalid_default_value_error.rb
-- lib/dry/initializer/errors/invalid_type_error.rb
-- lib/dry/initializer/errors/key_error.rb
-- lib/dry/initializer/errors/missed_default_value_error.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/errors/type_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
 - spec/dry/base_spec.rb
 - spec/dry/container_spec.rb
 - spec/dry/default_nil_spec.rb
 - spec/dry/default_values_spec.rb
-- spec/dry/dry_type_spec.rb
+- spec/dry/dry_type_constraint_spec.rb
 - spec/dry/invalid_default_spec.rb
-- spec/dry/invalid_type_spec.rb
 - spec/dry/missed_default_spec.rb
-- spec/dry/poro_type_spec.rb
-- spec/dry/proc_type_spec.rb
+- spec/dry/object_type_constraint_spec.rb
+- spec/dry/plain_type_constraint_spec.rb
 - spec/dry/reader_spec.rb
 - spec/dry/repetitive_definitions_spec.rb
 - spec/dry/subclassing_spec.rb
+- spec/dry/value_coercion_via_dry_types_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dryrb/dry-initializer
 licenses:
@@ -130,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: DSL for declaring params and options of the initializer
@@ -139,14 +144,13 @@ test_files:
 - spec/dry/container_spec.rb
 - spec/dry/default_nil_spec.rb
 - spec/dry/default_values_spec.rb
-- spec/dry/dry_type_spec.rb
+- spec/dry/dry_type_constraint_spec.rb
 - spec/dry/invalid_default_spec.rb
-- spec/dry/invalid_type_spec.rb
 - spec/dry/missed_default_spec.rb
-- spec/dry/poro_type_spec.rb
-- spec/dry/proc_type_spec.rb
+- spec/dry/object_type_constraint_spec.rb
+- spec/dry/plain_type_constraint_spec.rb
 - spec/dry/reader_spec.rb
 - spec/dry/repetitive_definitions_spec.rb
 - spec/dry/subclassing_spec.rb
+- spec/dry/value_coercion_via_dry_types_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/dry/initializer/argument.rb

@@ -1,96 +0,0 @@
-module Dry::Initializer
-  # A simple structure describes an argument (either param, or option)
-  #
-  # @api private
-  #
-  class Argument
-    include Errors
-
-    UNDEFINED = Object.new.freeze
-
-    # @!attribute [r] option
-    # @return [Boolean]
-    #   Whether this is an option, or param of the initializer
-    attr_reader :option
-
-    # @!attribute [r] name
-    # @return [Symbol] the name of the argument
-    attr_reader :name
-
-    # @!attribute [r] default
-    # @return [Boolean] whether the argument has a default value
-    attr_reader :default
-
-    # @!attribute [r] default_value
-    # @return [Object] the default value of the argument
-    attr_reader :default_value
-
-    # @!attribute [r] type
-    # @return [Class, nil] a type constraint
-    attr_reader :type
-
-    # @!attribute [r] reader
-    # @return [Boolean] whether an attribute reader is defined for the argument
-    attr_reader :reader
-
-    def initialize(name, option:, reader: true, **options)
-      @name   = name.to_sym
-      @option = option
-      @reader = reader
-      assign_default_value(options)
-      assign_type(options)
-    end
-
-    def ==(other)
-      other.name == name
-    end
-
-    def signature
-      case [option, default]
-      when [false, false] then name
-      when [false, true]  then "#{name} = Dry::Initializer::Argument::UNDEFINED"
-      when [true, false]  then "#{name}:"
-      else
-        "#{name}: Dry::Initializer::Argument::UNDEFINED"
-      end
-    end
-
-    def assignment
-      "@#{name} = #{name}"
-    end
-
-    def default_assignment
-      "@#{name} = instance_eval(&__arguments__[:#{name}].default_value)" \
-      " if #{name} == Dry::Initializer::Argument::UNDEFINED"
-    end
-
-    def type_constraint
-      "__arguments__[:#{name}].type.call(@#{name})"
-    end
-
-    private
-
-    def assign_default_value(options)
-      @default = options.key? :default
-      return unless @default
-
-      @default_value = options[:default]
-      return if Proc === @default_value
-
-      fail InvalidDefaultValueError.new(@default_value)
-    end
-
-    def assign_type(options)
-      return unless options.key? :type
-
-      type = options[:type]
-      type = plain_type_to_proc(type) if Module === type
-      fail InvalidTypeError.new(type) unless type.respond_to? :call
-      @type = type
-    end
-
-    def plain_type_to_proc(type)
-      proc { |value| fail TypeError.new(type, value) unless type === value }
-    end
-  end
-end

data/lib/dry/initializer/arguments.rb

@@ -1,85 +0,0 @@
-module Dry::Initializer
-  # Collection of definitions for arguments
-  #
-  # @api private
-  #
-  class Arguments
-    include Errors
-    include Enumerable
-
-    def initialize(**arguments)
-      @arguments = arguments
-    end
-
-    def add(name, options)
-      validate_uniqueness(name)
-      validate_presence_of_default(name, options)
-
-      new_argument = Argument.new(name, options)
-      self.class.new @arguments.merge(name.to_sym => new_argument)
-    end
-
-    def declaration
-      <<-RUBY
-        attr_reader #{select(&:reader).map { |arg| ":#{arg.name}" }.join(", ")}
-        define_method :initialize do |#{signature}|
-          #{assign_arguments}
-          #{take_declarations}
-          #{assign_defaults}
-          #{check_constraints}
-        end
-      RUBY
-    end
-
-    def [](name)
-      @arguments[name]
-    end
-
-    private
-
-    def each
-      @arguments.each { |_, argument| yield(argument) }
-    end
-
-    def params
-      reject(&:option)
-    end
-
-    def options
-      select(&:option)
-    end
-
-    def validate_uniqueness(name)
-      fail ExistingArgumentError.new(name) if self[name.to_sym]
-    end
-
-    def validate_presence_of_default(name, options)
-      return if options.key? :default
-      return if options[:option]
-      return unless params.any?(&:default)
-
-      fail MissedDefaultValueError.new(name)
-    end
-
-    def signature
-      (params + options).map(&:signature).join(", ")
-    end
-
-    def assign_arguments
-      map(&:assignment).join("\n")
-    end
-
-    def take_declarations
-      return unless any?(&:default) || any?(&:type)
-      "__arguments__ = self.class.send(:arguments_builder).arguments"
-    end
-
-    def assign_defaults
-      select(&:default).map(&:default_assignment).join("\n")
-    end
-
-    def check_constraints
-      select(&:type).map(&:type_constraint).join("\n")
-    end
-  end
-end