dry-types 1.2.2 → 1.5.1

data/lib/dry/types/result.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
+require "dry/core/equalizer"
 
 module Dry
   module Types
@@ -8,7 +8,7 @@ module Dry
     #
     # @api public
     class Result
-      include Dry::Equalizer(:input, inspect: false, immutable: true)
+      include ::Dry::Equalizer(:input, immutable: true)
 
       # @return [Object]
       attr_reader :input
@@ -43,7 +43,7 @@ module Dry
       #
       # @api public
       class Failure < Result
-        include Dry::Equalizer(:input, :error, inspect: false, immutable: true)
+        include ::Dry::Equalizer(:input, :error, immutable: true)
 
         # @return [#to_s]
         attr_reader :error

data/lib/dry/types/schema.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/types/fn_container'
+require "dry/types/fn_container"
 
 module Dry
   module Types
@@ -83,7 +83,7 @@ module Dry
         call_unsafe(hash, options)
       end
 
-      # @param [Hash] hash
+      # @param input [Hash] hash
       #
       # @yieldparam [Failure] failure
       # @yieldreturn [Result]
@@ -145,18 +145,10 @@ module Dry
       #
       # @api public
       def to_ast(meta: true)
-        if RUBY_VERSION >= "2.5"
-          opts = options.slice(:key_transform_fn, :type_transform_fn, :strict)
-        else
-          opts = options.select { |k, _|
-            k == :key_transform_fn || k == :type_transform_fn || k == :strict
-          }
-        end
-
         [
           :schema,
           [keys.map { |key| key.to_ast(meta: meta) },
-           opts,
+           options.slice(:key_transform_fn, :type_transform_fn, :strict),
            meta ? self.meta : EMPTY_HASH]
         ]
       end
@@ -179,7 +171,7 @@ module Dry
         with(strict: strict)
       end
 
-      # Injects a key transformation function
+      # Inject a key transformation function
       #
       # @param [#call,nil] proc
       # @param [#call,nil] block
@@ -190,7 +182,7 @@ module Dry
       def with_key_transform(proc = nil, &block)
         fn = proc || block
 
-        raise ArgumentError, 'a block or callable argument is required' if fn.nil?
+        raise ArgumentError, "a block or callable argument is required" if fn.nil?
 
         handle = Dry::Types::FnContainer.register(fn)
         with(key_transform_fn: handle)
@@ -284,6 +276,27 @@ module Dry
         Lax.new(schema(keys.map(&:lax)))
       end
 
+      # Merge given schema keys into current schema
+      #
+      # A new instance is returned.
+      #
+      # @param other [Schema] schema
+      # @return [Schema]
+      #
+      # @api public
+      def merge(other)
+        schema(other.keys)
+      end
+
+      # Empty schema with the same options
+      #
+      # @return [Schema]
+      #
+      # @api public
+      def clear
+        with(keys: EMPTY_ARRAY)
+      end
+
       private
 
       # @param [Array<Dry::Types::Schema::Keys>] keys

data/lib/dry/types/schema/key.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
-require 'dry/core/deprecations'
+require "dry/core/equalizer"
+require "dry/core/deprecations"
 
 module Dry
   module Types
@@ -103,6 +103,15 @@ module Dry
           __new__(type.lax).required(false)
         end
 
+        # Make wrapped type optional
+        #
+        # @return [Key]
+        #
+        # @api public
+        def optional
+          __new__(type.optional)
+        end
+
         # Dump to internal AST representation
         #
         # @return [Array]
@@ -122,13 +131,13 @@ module Dry
         # @see Dry::Types::Meta#meta
         #
         # @api public
-        def meta(data = nil)
-          if data.nil? || !data.key?(:omittable)
+        def meta(data = Undefined)
+          if Undefined.equal?(data) || !data.key?(:omittable)
             super
           else
             self.class.warn(
-              'Using meta for making schema keys is deprecated, ' \
-              'please use .omittable or .required(false) instead' \
+              "Using meta for making schema keys is deprecated, " \
+              "please use .omittable or .required(false) instead" \
               "\n" + Core::Deprecations::STACK.()
             )
             super.required(!data[:omittable])

data/lib/dry/types/spec/types.rb

@@ -1,79 +1,79 @@
 # frozen_string_literal: true
 
-RSpec.shared_examples_for 'Dry::Types::Nominal without primitive' do
+RSpec.shared_examples_for "Dry::Types::Nominal without primitive" do
   def be_boolean
     satisfy { |x| x == true || x == false }
   end
 
-  describe '#constrained?' do
-    it 'returns a boolean value' do
+  describe "#constrained?" do
+    it "returns a boolean value" do
       expect(type.constrained?).to be_boolean
     end
   end
 
-  describe '#default?' do
-    it 'returns a boolean value' do
+  describe "#default?" do
+    it "returns a boolean value" do
       expect(type.default?).to be_boolean
     end
   end
 
-  describe '#valid?' do
-    it 'returns a boolean value' do
+  describe "#valid?" do
+    it "returns a boolean value" do
       expect(type.valid?(1)).to be_boolean
     end
   end
 
-  describe '#eql?' do
-    it 'has #eql? defined' do
+  describe "#eql?" do
+    it "has #eql? defined" do
       expect(type).to eql(type)
     end
   end
 
-  describe '#==' do
-    it 'has #== defined' do
+  describe "#==" do
+    it "has #== defined" do
       expect(type).to eq(type)
     end
   end
 
-  describe '#optional?' do
-    it 'returns a boolean value' do
+  describe "#optional?" do
+    it "returns a boolean value" do
       expect(type.optional?).to be_boolean
     end
   end
 
-  describe '#to_s' do
-    it 'returns a custom string representation' do
-      expect(type.to_s).to start_with('#<Dry::Types') if type.class.name.start_with?('Dry::Types')
+  describe "#to_s" do
+    it "returns a custom string representation" do
+      expect(type.to_s).to start_with("#<Dry::Types") if type.class.name.start_with?("Dry::Types")
     end
   end
 
-  describe '#to_proc' do
+  describe "#to_proc" do
     subject(:callable) { type.to_proc }
 
-    it 'converts a type to a proc' do
+    it "converts a type to a proc" do
       expect(callable).to be_a(Proc)
     end
   end
 end
 
-RSpec.shared_examples_for 'Dry::Types::Nominal#meta' do
-  describe '#meta' do
-    it 'allows setting meta information' do
-      with_meta = type.meta(foo: :bar).meta(baz: '1')
+RSpec.shared_examples_for "Dry::Types::Nominal#meta" do
+  describe "#meta" do
+    it "allows setting meta information" do
+      with_meta = type.meta(foo: :bar).meta(baz: "1")
 
       expect(with_meta).to be_instance_of(type.class)
-      expect(with_meta.meta).to eql(foo: :bar, baz: '1')
+      expect(with_meta.meta).to eql(foo: :bar, baz: "1")
     end
 
-    it 'equalizes on empty meta' do
+    it "equalizes on empty meta" do
       expect(type).to eql(type.meta({}))
     end
 
-    it 'equalizes on filled meta' do
-      expect(type).to_not eql(type.meta(i_am: 'different'))
+    it "equalizes on filled meta" do
+      expect(type).to_not eql(type.meta(i_am: "different"))
     end
 
-    it 'is locally immutable' do
+    it "is locally immutable" do
       expect(type.meta).to be_a ::Hash
       expect(type.meta).to be_frozen
       expect(type.meta).not_to have_key :immutable_test
@@ -84,24 +84,24 @@ RSpec.shared_examples_for 'Dry::Types::Nominal#meta' do
     end
   end
 
-  describe '#pristine' do
-    it 'erases meta' do
+  describe "#pristine" do
+    it "erases meta" do
       expect(type.meta(foo: :bar).pristine).to eql(type)
     end
   end
 end
 
 RSpec.shared_examples_for Dry::Types::Nominal do
-  it_behaves_like 'Dry::Types::Nominal without primitive'
+  it_behaves_like "Dry::Types::Nominal without primitive"
 
-  describe '#primitive' do
-    it 'returns a class' do
+  describe "#primitive" do
+    it "returns a class" do
       expect(type.primitive).to be_instance_of(Class)
     end
   end
 
-  describe '#constructor' do
-    it 'returns a constructor' do
+  describe "#constructor" do
+    it "returns a constructor" do
       constructor = type.constructor(&:to_s)
 
       expect(constructor).to be_a(Dry::Types::Type)
@@ -109,33 +109,56 @@ RSpec.shared_examples_for Dry::Types::Nominal do
   end
 end
 
-RSpec.shared_examples_for 'a constrained type' do |options = { inputs: Object.new }|
+RSpec.shared_examples_for "a constrained type" do |options = {inputs: Object.new}|
   inputs = options[:inputs]
 
   let(:fallback) { Object.new }
 
-  describe '#call' do
-    it 'yields a block on failure' do
+  describe "#call" do
+    it "yields a block on failure" do
       Array(inputs).each do |input|
         expect(type.(input) { fallback }).to be(fallback)
       end
     end
 
-    it 'throws an error on invalid input' do
+    it "throws an error on invalid input" do
       Array(inputs).each do |input|
         expect { type.(input) }.to raise_error(Dry::Types::CoercionError)
       end
     end
   end
+
+  describe "#constructor" do
+    let(:wrapping_constructor) do
+      type.constructor { |input, type| type.(input) { fallback } }
+    end
+
+    it "can be wrapped" do
+      Array(inputs).each do |input|
+        expect(wrapping_constructor.(input)).to be(fallback)
+      end
+    end
+  end
 end
 
-RSpec.shared_examples_for 'a nominal type' do |inputs: Object.new|
-  describe '#call' do
-    it 'always returns the input back' do
+RSpec.shared_examples_for "a nominal type" do |inputs: Object.new|
+  describe "#call" do
+    it "always returns the input back" do
       Array(inputs).each do |input|
-        expect(type.(input) { fail }).to be(input)
+        expect(type.(input) { raise }).to be(input)
         expect(type.(input)).to be(input)
       end
     end
   end
 end
+
+RSpec.shared_examples_for "a composable constructor" do
+  describe "#constructor" do
+    it "has aliases for composition" do
+      expect(type.method(:append)).to eql(type.method(:constructor))
+      expect(type.method(:prepend)).to eql(type.method(:constructor))
+      expect(type.method(:<<)).to eql(type.method(:constructor))
+      expect(type.method(:>>)).to eql(type.method(:constructor))
+    end
+  end
+end

data/lib/dry/types/sum.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/types/options'
-require 'dry/types/meta'
+require "dry/core/equalizer"
+require "dry/types/options"
+require "dry/types/meta"
 
 module Dry
   module Types
@@ -50,7 +51,7 @@ module Dry
       #
       # @api public
       def name
-        [left, right].map(&:name).join(' | ')
+        [left, right].map(&:name).join(" | ")
       end
 
       # @return [false]
@@ -142,8 +143,8 @@ module Dry
       # @see [Meta#meta]
       #
       # @api public
-      def meta(data = nil)
-        if data.nil?
+      def meta(data = Undefined)
+        if Undefined.equal?(data)
           optional? ? right.meta : super
         elsif optional?
           self.class.new(left, right.meta(data), **options)

data/lib/dry/types/type.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/core/deprecations'
+require "dry/core/deprecations"
 
 module Dry
   module Types

data/lib/dry/types/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Types
-    VERSION = '1.2.2'
+    VERSION = "1.5.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.5.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -44,34 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
-- !ruby/object:Gem::Dependency
-  name: dry-equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -132,104 +118,67 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0'
 description: Type system for Ruby supporting coercions, constraints and complex types
-  like structs, value objects, enums etc.
+  like structs, value objects, enums etc
 email:
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".github/ISSUE_TEMPLATE/----please-don-t-ask-for-support-via-issues.md"
-- ".github/ISSUE_TEMPLATE/---bug-report.md"
-- ".github/ISSUE_TEMPLATE/---feature-request.md"
-- ".github/workflows/custom_ci.yml"
-- ".github/workflows/docsite.yml"
-- ".github/workflows/sync_configs.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".yardopts"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- benchmarks/hash_schemas.rb
-- benchmarks/lax_schema.rb
-- benchmarks/profile_invalid_input.rb
-- benchmarks/profile_lax_schema_valid.rb
-- benchmarks/profile_valid_input.rb
-- benchmarks/schema_valid_vs_invalid.rb
-- benchmarks/setup.rb
-- docsite/source/array-with-member.html.md
-- docsite/source/built-in-types.html.md
-- docsite/source/constraints.html.md
-- docsite/source/custom-types.html.md
-- docsite/source/default-values.html.md
-- docsite/source/enum.html.md
-- docsite/source/extensions.html.md
-- docsite/source/extensions/maybe.html.md
-- docsite/source/extensions/monads.html.md
-- docsite/source/getting-started.html.md
-- docsite/source/hash-schemas.html.md
-- docsite/source/index.html.md
-- docsite/source/map.html.md
-- docsite/source/optional-values.html.md
-- docsite/source/sum.html.md
 - dry-types.gemspec
 - lib/dry-types.rb
 - lib/dry/types.rb
@@ -249,6 +198,7 @@ files:
 - lib/dry/types/constraints.rb
 - lib/dry/types/constructor.rb
 - lib/dry/types/constructor/function.rb
+- lib/dry/types/constructor/wrapper.rb
 - lib/dry/types/container.rb
 - lib/dry/types/core.rb
 - lib/dry/types/decorator.rb
@@ -282,8 +232,7 @@ files:
 - lib/dry/types/sum.rb
 - lib/dry/types/type.rb
 - lib/dry/types/version.rb
-- log/.gitkeep
-homepage: https://github.com/dry-rb/dry-types
+homepage: https://dry-rb.org/gems/dry-types
 licenses:
 - MIT
 metadata:
@@ -299,16 +248,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Type system for Ruby supporting coercions, constraints and complex types
-  like structs, value objects, enums etc.
+  like structs, value objects, enums etc
 test_files: []