dry-initializer 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd083cbbcdfaa027e91d0c7aa5c3ecd1f7a7b360
-  data.tar.gz: 62d78221803dee64e5941047f50d340b84437e57
+  metadata.gz: 7db8f3d16f5e690b2184d79d06d2417e2dab2810
+  data.tar.gz: 03a361fa17734d5d37d8da5f647e975e36ee8d1f
 SHA512:
-  metadata.gz: 12eaa06d640341428da9beb87c79c33b9c2ce09ada2da4229c731693c362395e8f4c132856dbbd4fe986ccbd80532bf71448de6e1c6f1ce1cd050f19bad8b2fa
-  data.tar.gz: 93bbdd93691abe4efaa68d48510690a23a6b698673fbf9d52327ecb83539c55ebce5607c494d11430390ee182661dd71e56f516d963363785c4c6214b03261a5
+  metadata.gz: f879fb0ae4169c9a402df913d7b00f4c38e9349ca7d200c43687f5c28970e81466c3152a19b61249299451213b93ee9ce971b949d3eb0f163ebce6c55304bf3b
+  data.tar.gz: cc7a1b201b934f10c1d09a09f2b22820361135c4da201c4778828836b55dd7633e0b8db8e9673071e3344a56c73498ab036f787dec8be57bd57169c07872532b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.4.0 2016-05-28
+
+### Deleted (backward-incompatible changes)
+
+* Support of modules and case equality as type constraints (@nepalez)
+
+[Compare v0.3.3...v0.4.0](https://github.com/dry-rb/dry-initializer/compare/v0.3.3..v0.4.0)
+
 ## v0.3.3 2016-05-28
 
 * Add deprecation warnings about modules and case equality as type constraints (@nepalez)

data/dry-initializer.gemspec

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

@@ -5,7 +5,6 @@ module Dry::Initializer
     require_relative "errors/order_error"
     require_relative "errors/plugin_error"
     require_relative "errors/redefinition_error"
-    require_relative "errors/type_error"
     require_relative "errors/type_constraint_error"
   end
 end

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

@@ -1,6 +1,5 @@
 class Dry::Initializer::Errors::TypeConstraintError < TypeError
   def initialize(name, type)
-    super "#{type} is inacceptable constraint for the argument '#{name}'." \
-          " Use either plain Ruby module/class, or dry-type."
+    super "#{type} used as constraint for argument '#{name}' is not a dry-type."
   end
 end

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

@@ -4,60 +4,15 @@ module Dry::Initializer::Plugins
   class TypeConstraint < Base
     def call
       return unless settings.key? :type
-      dry_type_constraint || module_type_constraint || object_type_constraint
-    end
-
-    private
-
-    def type
-      @type ||= settings[:type]
-    end
-
-    def dry_type?
-      type.respond_to? :call
-    end
-
-    def plain_type?
-      Module === type
-    end
-
-    def module_type_constraint
-      return unless plain_type?
-
-      warn "[DEPRECATION] support for ruby modules as type constraint" \
-           " is deprecated. Use dry-types instead."
-
-      "fail #{TypeError}.new(:#{name}, #{type}, @#{name})" \
-      " unless @#{name} == Dry::Initializer::UNDEFINED ||" \
-      " #{type} === @#{name}"
-    end
 
-    def dry_type_constraint
-      return unless dry_type?
+      type = settings[:type]
+      fail TypeConstraintError.new(name, type) unless type.respond_to? :call
 
       ivar = :"@#{name}"
-      constraint = type
-
-      lambda do |*|
-        value = instance_variable_get(ivar)
-        return if value == Dry::Initializer::UNDEFINED
-
-        instance_variable_set ivar, constraint[value]
-      end
-    end
-
-    def object_type_constraint
-      warn "[DEPRECATION] support for case equality (===) as type constraint" \
-           " is deprecated. Use dry-types instead."
-
-      ivar = :"@#{name}"
-      constraint = type
-
       lambda do |*|
         value = instance_variable_get(ivar)
         return if value == Dry::Initializer::UNDEFINED
-
-        fail TypeError.new(ivar, constraint, value) unless constraint === value
+        instance_variable_set ivar, type.call(value)
       end
     end
   end

data/spec/dry/type_constraint_spec.rb

@@ -0,0 +1,43 @@
+require "dry-types"
+
+describe "type constraint" do
+  context "by dry-type" 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
+
+  context "by invalid constraint" do
+    it "raises TypeError" do
+      expect {
+        class Test::Foo
+          extend Dry::Initializer::Mixin
+          param :foo, type: String
+        end
+      }.to raise_error(TypeError)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -98,7 +98,6 @@ files:
 - 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
@@ -111,16 +110,14 @@ files:
 - spec/dry/container_spec.rb
 - spec/dry/default_nil_spec.rb
 - spec/dry/default_values_spec.rb
-- spec/dry/dry_type_constraint_spec.rb
 - spec/dry/invalid_default_spec.rb
 - spec/dry/missed_default_spec.rb
-- spec/dry/object_type_constraint_spec.rb
 - spec/dry/options_tolerance_spec.rb
-- spec/dry/plain_type_constraint_spec.rb
 - spec/dry/plugin_registry_spec.rb
 - spec/dry/reader_spec.rb
 - spec/dry/repetitive_definitions_spec.rb
 - spec/dry/subclassing_spec.rb
+- spec/dry/type_constraint_spec.rb
 - spec/dry/value_coercion_via_dry_types_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dryrb/dry-initializer
@@ -152,16 +149,14 @@ test_files:
 - spec/dry/container_spec.rb
 - spec/dry/default_nil_spec.rb
 - spec/dry/default_values_spec.rb
-- spec/dry/dry_type_constraint_spec.rb
 - spec/dry/invalid_default_spec.rb
 - spec/dry/missed_default_spec.rb
-- spec/dry/object_type_constraint_spec.rb
 - spec/dry/options_tolerance_spec.rb
-- spec/dry/plain_type_constraint_spec.rb
 - spec/dry/plugin_registry_spec.rb
 - spec/dry/reader_spec.rb
 - spec/dry/repetitive_definitions_spec.rb
 - spec/dry/subclassing_spec.rb
+- spec/dry/type_constraint_spec.rb
 - spec/dry/value_coercion_via_dry_types_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

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

@@ -1,6 +0,0 @@
-class Dry::Initializer::Errors::TypeError < TypeError
-  def initialize(name, type, value)
-    super "A value #{value.inspect} assigned to the argument '#{name}'" \
-          " mismatches type constraint: #{type}."
-  end
-end

data/spec/dry/dry_type_constraint_spec.rb

@@ -1,30 +0,0 @@
-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/object_type_constraint_spec.rb

@@ -1,25 +0,0 @@
-describe "object type constraint" do
-  before do
-    class Test::Foo
-      extend Dry::Initializer::Mixin
-
-      param :foo, type: /bar/
-    end
-  end
-
-  context "in case of mismatch" do
-    subject { Test::Foo.new "baz" }
-
-    it "raises TypeError" do
-      expect { subject }.to raise_error TypeError
-    end
-  end
-
-  context "in case of match" do
-    subject { Test::Foo.new "barbar" }
-
-    it "completes the initialization" do
-      expect { subject }.not_to raise_error
-    end
-  end
-end

data/spec/dry/plain_type_constraint_spec.rb

@@ -1,33 +0,0 @@
-describe "plain type constraint" do
-  before do
-    class Test::Foo
-      extend Dry::Initializer::Mixin
-
-      param :foo, type: String
-    end
-  end
-
-  context "in case of mismatch" do
-    subject { Test::Foo.new :foo }
-
-    it "raises TypeError" do
-      expect { subject }.to raise_error TypeError, /:foo/
-    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
-
-  context "in case of soft match" do
-    subject { Test::Foo.new Class.new(String).new "foo" }
-
-    it "completes the initialization" do
-      expect { subject }.not_to raise_error
-    end
-  end
-end