dry-types 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c98574b6a658385b9a5edd1ecee455ee8f7eb1c8
-  data.tar.gz: 4eb98a36d945929df0dd0dbf017eae91fe8c860a
+  metadata.gz: f08f7240bc96724af80fa080ce0086e3274927e1
+  data.tar.gz: 61952ddec432653f82f5d1f8edf37dd0dd8f6c55
 SHA512:
-  metadata.gz: ea546931be6f39b663a2ce48eef8bc8e5d728072dc4d0ef744c0df4c37e9082b82d91803a44c3ec746494ef0ec7c16eb4f44767d0ef60d6a89304fb7fd0d9e79
-  data.tar.gz: d4f3c4b12abecfc27932cb0c5295b45ee88af7006b730e8642c0b5d35d8a4a989d08ae1e302e3a8529c3823e27506da1e03ad5f9fe80671dd93ad04feda4353a
+  metadata.gz: 2e6fdc5887495ff175ea35397c0f912b97264485d4796c43ab85d13ff99a06e5c81ab8d8cacea3875764142a2408d348a21d980e2965002fdc9d52499dbca910
+  data.tar.gz: 758ed4045287102f4475a2b12228ae41da0c8f3f88c780589e4a2d8be945941ebd46e079b307bcf3844d788b4c706fec1ef0c7cb74708937592495a79ec7ba8a

data/.travis.yml

@@ -3,14 +3,13 @@ sudo: false
 cache: bundler
 bundler_args: --without benchmarks tools
 script:
-  - bundle exec rake spec
+  - bundle exec rake
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - rbx-2
-  - jruby-9000
+  - jruby-9.1.1.0
   - ruby-head
 env:
   global:
@@ -18,10 +17,6 @@ env:
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-  include:
-    - rvm: jruby-head
-      before_install: gem install bundler --no-ri --no-rdoc
 notifications:
   email: false
   webhooks:

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# v0.9.0 2016-09-21
+
+## Added
+
+* `Hash#strict_with_defaults` which validates presence of all required keys and respects default types for missing *values* (backus)
+* `Type#constrained?` method (flash-gordon)
+
+## Fixed
+
+* Summing two constrained types works correctly (flash-gordon)
+* `Types::Array::Member#valid?` in cases where member type is a constraint (solnic)
+* `Hash::Schema#try` handles exceptions properly and returns a failure object (solnic)
+
+## Changed
+
+* [BREAKING] Renamed `Hash##{schema=>permissive}` (backus)
+* [BREAKING] `dry-monads` dependency was made optional, Maybe types are available after `Dry::Types.load_extension(:maybe)` (flash-gordon)
+* [BREAKING] `Dry::Types::Struct` and `Dry::Types::Value` have been extracted to [`dry-struct`](https://github.com/dry-rb/dry-struct) (backus)
+* `Types::Form::Bool` supports upcased true/false values (kirs)
+* `Types::Form::{Date,DateTime,Time}` fail gracefully for invalid input (padde)
+* ice_nine dependency has been dropped as it was required by Struct only (flash-gordon)
+
+[Compare v0.8.1...v0.9.0](https://github.com/dryrb/dry-types/compare/v0.8.1...v0.9.0)
+
 # v0.8.1 2016-07-13
 
 ## Fixed
@@ -34,7 +58,7 @@
 - `Bool#default` gladly accepts `false` as its value (solnic)
 - Creating an empty schema with input processor no longer fails (lasseebert)
 
-## Changes
+## Changed
 
 - Allow multiple calls to meta (solnic)
 - Allow capitalised versions of true and false values for boolean coercions (nil0bject)

data/Gemfile

@@ -14,11 +14,9 @@ end
 
 group :benchmarks do
   gem 'sqlite3'
-  gem 'activerecord'
+  gem 'activerecord', platform: %i(jruby mri)
   gem 'benchmark-ips'
   gem 'virtus'
   gem 'fast_attributes'
   gem 'attrio'
 end
-
-gem "dry-logic", git: 'https://github.com/dry-rb/dry-logic.git', branch: "master"

data/README.md

@@ -20,7 +20,7 @@
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/Rakefile

@@ -1,6 +1,15 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+task :run_specs do
+  require 'rspec/core'
 
-task :default => :spec
+  RSpec::Core::Runner.run(['spec/dry'])
+  RSpec.clear_examples
+
+  load 'spec/dry/types.rb'
+  Dry::Types.load_extensions(:maybe)
+  RSpec::Core::Runner.run(['spec'])
+end
+
+task default: :run_specs

data/benchmarks/hash_schemas.rb

@@ -0,0 +1,51 @@
+$LOAD_PATH.unshift('lib')
+
+require 'bundler/setup'
+require 'dry-types'
+
+module SchemaBench
+  def self.hash_schema(type)
+    Dry::Types['hash'].public_send(type,
+      email:   Dry::Types['string'],
+      age:     Dry::Types['form.int'],
+      admin:   Dry::Types['form.bool'],
+      address: Dry::Types['hash'].public_send(type,
+        city: Dry::Types['string'],
+        street: Dry::Types['string']
+      )
+    )
+  end
+
+  private_class_method(:hash_schema)
+
+  SCHEMAS =
+    Dry::Types::Hash
+      .public_instance_methods(false)
+      .map { |schema_type| [schema_type, hash_schema(schema_type)] }
+      .to_h
+
+  INPUT = {
+    email: 'jane@doe.org',
+    age: '20',
+    admin: '1',
+    address: { city: 'NYC', street: 'Street 1/2' }
+  }
+end
+
+require 'benchmark/ips'
+
+Benchmark.ips do |x|
+  SchemaBench::SCHEMAS.each do |schema_type, schema|
+    x.report("#{schema_type}#call") do
+      schema.call(SchemaBench::INPUT)
+    end
+  end
+
+  SchemaBench::SCHEMAS.each do |schema_type, schema|
+    x.report("#{schema_type}#try") do
+      schema.try(SchemaBench::INPUT)
+    end
+  end
+
+  x.compare!
+end

data/dry-types.gemspec

@@ -26,17 +26,18 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.1.0"
 
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
+  spec.add_runtime_dependency 'dry-core', '~> 0.1'
   spec.add_runtime_dependency 'dry-container', '~> 0.3'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
-  spec.add_runtime_dependency 'dry-logic', '~> 0.3', '>= 0.3.0'
+  spec.add_runtime_dependency 'dry-logic', '~> 0.4', '>= 0.4.0'
   spec.add_runtime_dependency 'inflecto', '~> 0.0.0', '>= 0.0.2'
-  spec.add_runtime_dependency 'dry-monads', '>= 0.0.1'
-  spec.add_runtime_dependency 'ice_nine', '~> 0.11'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 11.0"
   spec.add_development_dependency "rspec", "~> 3.3"
+  spec.add_development_dependency 'dry-monads', '~> 0.2'
 end

data/lib/dry/types.rb

@@ -7,21 +7,19 @@ require 'concurrent'
 
 require 'dry-container'
 require 'dry-equalizer'
+require 'dry/core/extensions'
 
 require 'dry/types/version'
 require 'dry/types/container'
 require 'dry/types/definition'
 require 'dry/types/constructor'
-require 'dry/types/struct'
-require 'dry/types/value'
 
 require 'dry/types/errors'
 
 module Dry
   module Types
     extend Dry::Configurable
-
-    Undefined = Object.new.freeze
+    extend Dry::Core::Extensions
 
     setting :namespace, self
 
@@ -67,7 +65,13 @@ module Dry
             container[name]
           end
         when Class
-          self[identifier(name)]
+          type_name = identifier(name)
+
+          if container.key?(type_name)
+            self[type_name]
+          else
+            name
+          end
         end
       end
     end
@@ -102,3 +106,4 @@ module Dry
 end
 
 require 'dry/types/core' # load built-in types
+require 'dry/types/extensions'

data/lib/dry/types/array/member.rb

@@ -14,6 +14,10 @@ module Dry
         end
         alias_method :[], :call
 
+        def valid?(type)
+          super && type.all? { |el| member.valid?(el) }
+        end
+
         def try(input, &block)
           if input.is_a?(::Array)
             result = call(input, :try)

data/lib/dry/types/builder.rb

@@ -1,12 +1,16 @@
+require 'dry/core/constants'
+
 module Dry
   module Types
     module Builder
+      include Dry::Core::Constants
+
       def constrained_type
         Constrained
       end
 
       def |(other)
-        klass = is_a?(Constrained) && other.is_a?(Constrained) ? Sum::Constrained : Sum
+        klass = constrained? && other.constrained? ? Sum::Constrained : Sum
         klass.new(self, other)
       end
 
@@ -14,10 +18,6 @@ module Dry
         Types['strict.nil'] | self
       end
 
-      def maybe
-        Maybe.new(Types['strict.nil'] | self)
-      end
-
       def constrained(options)
         constrained_type.new(self, rule: Types.Rule(options))
       end
@@ -28,7 +28,7 @@ module Dry
         if value.is_a?(Proc) || valid?(value)
           Default[value].new(self, value)
         else
-          raise ConstraintError, "default value #{value.inspect} violates constraints"
+          raise ConstraintError.new("default value #{value.inspect} violates constraints", value)
         end
       end
 
@@ -50,6 +50,5 @@ end
 require 'dry/types/default'
 require 'dry/types/constrained'
 require 'dry/types/enum'
-require 'dry/types/maybe'
 require 'dry/types/safe'
 require 'dry/types/sum'

data/lib/dry/types/coercions.rb

@@ -1,25 +1,30 @@
+require 'dry/core/constants'
+
 module Dry
   module Types
     module Coercions
-      EMPTY_STRING = ''.freeze
+      include Dry::Core::Constants
 
       def to_nil(input)
         input unless empty_str?(input)
       end
 
       def to_date(input)
+        return input unless input.respond_to?(:to_str)
         Date.parse(input)
       rescue ArgumentError
         input
       end
 
       def to_date_time(input)
+        return input unless input.respond_to?(:to_str)
         DateTime.parse(input)
       rescue ArgumentError
         input
       end
 
       def to_time(input)
+        return input unless input.respond_to?(:to_str)
         Time.parse(input)
       rescue ArgumentError
         input

data/lib/dry/types/coercions/form.rb

@@ -5,18 +5,18 @@ module Dry
   module Types
     module Coercions
       module Form
-        TRUE_VALUES = %w[1 on On ON t true True TRUE  y yes Yes YES].freeze
-        FALSE_VALUES = %w[0 off Off OFF f false False FALSE n no No NO].freeze
+        TRUE_VALUES = %w[1 on On ON t true True TRUE T y yes Yes YES].freeze
+        FALSE_VALUES = %w[0 off Off OFF f false False FALSE F n no No NO].freeze
         BOOLEAN_MAP = ::Hash[TRUE_VALUES.product([true]) + FALSE_VALUES.product([false])].freeze
 
         extend Coercions
 
         def self.to_true(input)
-          BOOLEAN_MAP.fetch(input, input)
+          BOOLEAN_MAP.fetch(input.to_s, input)
         end
 
         def self.to_false(input)
-          BOOLEAN_MAP.fetch(input, input)
+          BOOLEAN_MAP.fetch(input.to_s, input)
         end
 
         def self.to_int(input)

data/lib/dry/types/constrained.rb

@@ -18,29 +18,34 @@ module Dry
 
       def call(input)
         try(input) do |result|
-          raise ConstraintError, result
+          raise ConstraintError.new(result, input)
         end.input
       end
       alias_method :[], :call
 
       def try(input, &block)
-        validation = rule.(input)
+        result = rule.(input)
 
-        if validation.success?
+        if result.success?
           type.try(input, &block)
         else
-          block ? yield(validation) : validation
+          failure = failure(input, result)
+          block ? yield(failure) : failure
         end
       end
 
       def valid?(value)
-        rule.(value).success?
+        rule.(value).success? && type.valid?(value)
       end
 
       def constrained(options)
         with(rule: rule & Types.Rule(options))
       end
 
+      def constrained?
+        true
+      end
+
       private
 
       def decorate?(response)

data/lib/dry/types/constraints.rb

@@ -1,11 +1,12 @@
 require 'dry/logic/rule_compiler'
 require 'dry/logic/predicates'
+require 'dry/logic/rule/predicate'
 
 module Dry
   module Types
     def self.Rule(options)
       rule_compiler.(
-        options.map { |key, val| [:val, Logic::Predicates[:"#{key}?"].curry(val).to_ast] }
+        options.map { |key, val| Logic::Rule::Predicate.new(Logic::Predicates[:"#{key}?"]).curry(val).to_ast }
       ).reduce(:and)
     end
 

data/lib/dry/types/core.rb

@@ -22,6 +22,8 @@ module Dry
 
     ALL_PRIMITIVES = COERCIBLE.merge(NON_COERCIBLE).freeze
 
+    NON_NIL = ALL_PRIMITIVES.reject { |name, _| name == :nil }.freeze
+
     # Register built-in types that are non-coercible through kernel methods
     ALL_PRIMITIVES.each do |name, primitive|
       register(name.to_s, Definition[primitive].new(primitive))
@@ -37,20 +39,8 @@ module Dry
       register("coercible.#{name}", self[name.to_s].constructor(Kernel.method(primitive.name)))
     end
 
-    # Register non-coercible maybe types
-    ALL_PRIMITIVES.each_key do |name|
-      next if name == :nil
-      register("maybe.strict.#{name}", self["strict.#{name}"].maybe)
-    end
-
-    # Register coercible maybe types
-    COERCIBLE.each_key do |name|
-      register("maybe.coercible.#{name}", self["coercible.#{name}"].maybe)
-    end
-
     # Register non-coercible optional types
-    ALL_PRIMITIVES.each_key do |name|
-      next if name == :nil
+    NON_NIL.each_key do |name|
       register("optional.strict.#{name}", self["strict.#{name}"].optional)
     end
 

data/lib/dry/types/decorator.rb

@@ -28,8 +28,8 @@ module Dry
         type.default?
       end
 
-      def maybe?
-        type.maybe?
+      def constrained?
+        type.constrained?
       end
 
       def respond_to_missing?(meth, include_private = false)