dry-types 0.14.1 → 0.15.0

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

@@ -1,4 +1,4 @@
-RSpec.shared_examples_for 'Dry::Types::Definition without primitive' do
+RSpec.shared_examples_for 'Dry::Types::Nominal without primitive' do
   def be_boolean
     satisfy { |x| x == true || x == false  }
   end
@@ -38,9 +38,17 @@ RSpec.shared_examples_for 'Dry::Types::Definition without primitive' do
       expect(type.optional?).to be_boolean
     end
   end
+
+  describe '#to_s' do
+    it 'returns a custom string representation' do
+      if type.class.name.start_with?('Dry::Types')
+        expect(type.to_s).to start_with('#<Dry::Types')
+      end
+    end
+  end
 end
 
-RSpec.shared_examples_for 'Dry::Types::Definition#meta' do
+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')
@@ -75,8 +83,8 @@ RSpec.shared_examples_for 'Dry::Types::Definition#meta' do
   end
 end
 
-RSpec.shared_examples_for Dry::Types::Definition do
-  it_behaves_like 'Dry::Types::Definition without primitive'
+RSpec.shared_examples_for Dry::Types::Nominal do
+  it_behaves_like 'Dry::Types::Nominal without primitive'
 
   describe '#primitive' do
     it 'returns a class' do

data/lib/dry/types/sum.rb

@@ -4,9 +4,10 @@ module Dry
   module Types
     class Sum
       include Type
-      include Dry::Equalizer(:left, :right, :options, :meta)
       include Builder
       include Options
+      include Printable
+      include Dry::Equalizer(:left, :right, :options, :meta, inspect: false)
 
       # @return [Type]
       attr_reader :left
@@ -29,9 +30,9 @@ module Dry
         # @return [Object]
         # @raise [ConstraintError] if given +input+ not passing {#try}
         def call(input)
-          try(input) do |result|
+          try(input) { |result|
             raise ConstraintError.new(result, input)
-          end.input
+          }.input
         end
         alias_method :[], :call
       end
@@ -62,7 +63,7 @@ module Dry
 
       # @return [Boolean]
       def optional?
-        left == Types['strict.nil']
+        primitive?(nil)
       end
 
       # @param [Object] input
@@ -73,16 +74,14 @@ module Dry
       alias_method :[], :call
 
       def try(input, &block)
-        result = left.try(input) do
-          right.try(input)
-        end
-
-        return result if result.success?
-
-        if block
-          yield(result)
-        else
-          result
+        left.try(input) do
+          right.try(input) do |failure|
+            if block_given?
+              yield(failure)
+            else
+              failure
+            end
+          end
         end
       end
 
@@ -119,7 +118,7 @@ module Dry
 
       # @api public
       #
-      # @see Definition#to_ast
+      # @see Nominal#to_ast
       def to_ast(meta: true)
         [:sum, [left.to_ast(meta: meta), right.to_ast(meta: meta), meta ? self.meta : EMPTY_HASH]]
       end

data/lib/dry/types/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Types
-    VERSION = '0.14.1'.freeze
+    VERSION = '0.15.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -85,6 +85,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,6 +95,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: dry-logic
   requirement: !ruby/object:Gem::Requirement
@@ -190,8 +196,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -213,8 +221,6 @@ files:
 - lib/dry/types/coercions/json.rb
 - lib/dry/types/coercions/params.rb
 - lib/dry/types/compat.rb
-- lib/dry/types/compat/form_types.rb
-- lib/dry/types/compat/int.rb
 - lib/dry/types/compiler.rb
 - lib/dry/types/constrained.rb
 - lib/dry/types/constrained/coercible.rb
@@ -224,22 +230,26 @@ files:
 - lib/dry/types/core.rb
 - lib/dry/types/decorator.rb
 - lib/dry/types/default.rb
-- lib/dry/types/definition.rb
 - lib/dry/types/enum.rb
 - lib/dry/types/errors.rb
 - lib/dry/types/extensions.rb
 - lib/dry/types/extensions/maybe.rb
 - lib/dry/types/fn_container.rb
 - lib/dry/types/hash.rb
-- lib/dry/types/hash/schema.rb
-- lib/dry/types/hash/schema_builder.rb
+- lib/dry/types/hash/constructor.rb
 - lib/dry/types/inflector.rb
 - lib/dry/types/json.rb
 - lib/dry/types/map.rb
+- lib/dry/types/module.rb
+- lib/dry/types/nominal.rb
 - lib/dry/types/options.rb
 - lib/dry/types/params.rb
+- lib/dry/types/printable.rb
+- lib/dry/types/printer.rb
 - lib/dry/types/result.rb
 - lib/dry/types/safe.rb
+- lib/dry/types/schema.rb
+- lib/dry/types/schema/key.rb
 - lib/dry/types/spec/types.rb
 - lib/dry/types/sum.rb
 - lib/dry/types/type.rb
@@ -268,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Type system for Ruby supporting coercions, constraints and complex types

data/lib/dry/types/compat/form_types.rb

@@ -1,27 +0,0 @@
-require 'dry/core/deprecations'
-
-Dry::Core::Deprecations.warn('Form types were renamed to Params', tag: :'dry-types')
-
-module Dry
-  module Types
-    container.keys.grep(/^params\./).each do |key|
-      next if key.start_with?('params.int')
-      register(key.sub('params.', 'form.'), container[key])
-    end
-
-    register('form.int', self['params.integer'])
-    register('form.integer', self['params.integer'])
-
-    class Compiler
-      def visit_form_hash(node)
-        schema, meta = node
-        merge_with('params.hash', :symbolized, schema).meta(meta)
-      end
-
-      def visit_form_array(node)
-        member, meta = node
-        registry['params.array'].of(visit(member)).meta(meta)
-      end
-    end
-  end
-end

data/lib/dry/types/compat/int.rb

@@ -1,14 +0,0 @@
-require 'dry/core/deprecations'
-
-Dry::Core::Deprecations.warn('Int type was renamed to Integer', tag: :'dry-types')
-
-module Dry
-  module Types
-    register('int', self['integer'])
-    register('strict.int', self['strict.integer'])
-    register('coercible.int', self['coercible.integer'])
-    register('optional.strict.int', self['optional.strict.integer'])
-    register('optional.coercible.int', self['optional.coercible.integer'])
-    register('params.int', self['params.integer'])
-  end
-end

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

@@ -1,199 +0,0 @@
-require 'dry/types/fn_container'
-
-module Dry
-  module Types
-    class Hash < Definition
-      # The built-in Hash type has constructors that you can use to define
-      # hashes with explicit schemas and coercible values using the built-in types.
-      #
-      # Basic {Schema} evaluates default values for keys missing in input hash
-      # (see {Schema#resolve_missing_value})
-      #
-      # @see Dry::Types::Default#evaluate
-      # @see Dry::Types::Default::Callable#evaluate
-      class Schema < Hash
-        NO_TRANSFORM = Dry::Types::FnContainer.register { |x| x }
-        SYMBOLIZE_KEY = Dry::Types::FnContainer.register(:to_sym.to_proc)
-
-        # @return [Hash{Symbol => Definition}]
-        attr_reader :member_types
-
-        # @return [#call]
-        attr_reader :transform_key
-
-        # @param [Class] _primitive
-        # @param [Hash] options
-        # @option options [Hash{Symbol => Definition}] :member_types
-        # @option options [String] :key_transform_fn
-        def initialize(_primitive, **options)
-          @member_types = options.fetch(:member_types)
-
-          meta = options[:meta] || EMPTY_HASH
-          key_fn = meta.fetch(:key_transform_fn, NO_TRANSFORM)
-
-          @transform_key = Dry::Types::FnContainer[key_fn]
-
-          super
-        end
-
-        # @param [Hash] hash
-        # @return [Hash{Symbol => Object}]
-        def call(hash)
-          coerce(hash)
-        end
-        alias_method :[], :call
-
-        # @param [Hash] hash
-        # @yieldparam [Failure] failure
-        # @yieldreturn [Result]
-        # @return [Logic::Result]
-        # @return [Object] if coercion fails and a block is given
-        def try(hash)
-          if hash.is_a?(::Hash)
-            success = true
-            output  = {}
-
-            begin
-              result = try_coerce(hash) do |key, member_result|
-                success &&= member_result.success?
-                output[key] = member_result.input
-
-                member_result
-              end
-            rescue ConstraintError, UnknownKeysError, SchemaError, MissingKeyError => e
-              success = false
-              result = e
-            end
-          else
-            success = false
-            output = hash
-            result = "#{hash} must be a hash"
-          end
-
-          if success
-            success(output)
-          else
-            failure = failure(output, result)
-            block_given? ? yield(failure) : failure
-          end
-        end
-
-        # @param meta [Boolean] Whether to dump the meta to the AST
-        # @return [Array] An AST representation
-        def to_ast(meta: true)
-          [
-            :hash_schema,
-            [
-              member_types.map { |name, member| [:member, [name, member.to_ast(meta: meta)]] },
-              meta ? self.meta : EMPTY_HASH
-            ]
-          ]
-        end
-
-        # @param [Hash] hash
-        # @return [Boolean]
-        def valid?(hash)
-          result = try(hash)
-          result.success?
-        end
-        alias_method :===, :valid?
-
-        # Whether the schema rejects unknown keys
-        # @return [Boolean]
-        def strict?
-          meta.fetch(:strict, false)
-        end
-
-        # Make the schema intolerant to unknown keys
-        # @return [Schema]
-        def strict
-          meta(strict: true)
-        end
-
-        # Injects a key transformation function
-        # @param [#call,nil] proc
-        # @param [#call,nil] block
-        # @return [Schema]
-        def with_key_transform(proc = nil, &block)
-          fn = proc || block
-
-          if fn.nil?
-            raise ArgumentError, "a block or callable argument is required"
-          end
-
-          handle = Dry::Types::FnContainer.register(fn)
-          meta(key_transform_fn: handle)
-        end
-
-        # @param [{Symbol => Definition}] type_map
-        # @return [Schema]
-        def schema(type_map)
-          member_types = self.member_types.merge(transform_types(type_map))
-          Schema.new(primitive, **options, member_types: member_types, meta: meta)
-        end
-
-        private
-
-        def resolve(hash)
-          result = {}
-
-          hash.each do |key, value|
-            k = transform_key.(key)
-
-            if member_types.key?(k)
-              result[k] = yield(member_types[k], k, value)
-            elsif strict?
-              raise UnknownKeysError.new(*unexpected_keys(hash.keys))
-            end
-          end
-
-          if result.size < member_types.size
-            resolve_missing_keys(result, &Proc.new)
-          end
-
-          result
-        end
-
-        def resolve_missing_keys(result)
-          member_types.each do |k, type|
-            next if result.key?(k)
-
-            if type.default?
-              result[k] = yield(type, k, Undefined)
-            elsif !type.meta[:omittable]
-              raise MissingKeyError, k
-            end
-          end
-        end
-
-        # @param keys [Array<Symbol>]
-        # @return [Array<Symbol>]
-        def unexpected_keys(keys)
-          keys.map(&transform_key) - member_types.keys
-        end
-
-        # @param [Hash] hash
-        # @return [Hash{Symbol => Object}]
-        def try_coerce(hash)
-          resolve(hash) do |type, key, value|
-            yield(key, type.try(value))
-          end
-        end
-
-        # @param [Hash] hash
-        # @return [Hash{Symbol => Object}]
-        def coerce(hash)
-          resolve(hash) do |type, key, value|
-            begin
-              type.call(value)
-            rescue ConstraintError => e
-              raise SchemaError.new(key, value, e.result)
-            rescue TypeError, ArgumentError => e
-              raise SchemaError.new(key, value, e.message)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/dry/types/hash/schema_builder.rb

@@ -1,75 +0,0 @@
-require 'dry/types/hash/schema'
-require 'dry/types/fn_container'
-
-module Dry
-  module Types
-    class Hash < Definition
-      # A bulder for legacy schemas
-      # @api private
-      class SchemaBuilder
-        NIL_TO_UNDEFINED = -> v { v.nil? ? Undefined : v }
-        OMITTABLE_KEYS = %i(schema weak symbolized).freeze
-        STRICT = %i(strict strict_with_defaults).freeze
-
-        # @param primitive [Type]
-        # @option options [Hash{Symbol => Definition}] :member_types
-        # @option options [Symbol] :hash_type
-        def call(primitive, **options)
-          hash_type = options.fetch(:hash_type)
-          member_types = {}
-
-          options.fetch(:member_types).each do |k, t|
-            member_types[k] = build_type(hash_type, t)
-          end
-
-          instantiate(primitive, **options, member_types: member_types)
-        end
-
-        def instantiate(primitive, hash_type: :base, meta: EMPTY_HASH, **options)
-          meta = meta.dup
-
-          meta[:strict] = true if strict?(hash_type)
-          meta[:key_transform_fn] = Schema::SYMBOLIZE_KEY if hash_type == :symbolized
-
-          Schema.new(primitive, **options, meta: meta)
-        end
-
-        private
-
-        def omittable?(constructor)
-          OMITTABLE_KEYS.include?(constructor)
-        end
-
-        def strict?(constructor)
-          STRICT.include?(constructor)
-        end
-
-        def build_type(constructor, type)
-          type = safe(constructor, type)
-          type = default(constructor, type) if type.default?
-          type = type.meta(omittable: true) if omittable?(constructor)
-          type
-        end
-
-        def safe(constructor, type)
-          if constructor == :weak || constructor == :symbolized
-            type.safe
-          else
-            type
-          end
-        end
-
-        def default(constructor, type)
-          case constructor
-          when :strict_with_defaults
-            type
-          when :strict
-            type.type
-          else
-            type.constructor(NIL_TO_UNDEFINED)
-          end
-        end
-      end
-    end
-  end
-end