dry-types 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ca173b64639db4a874bc33694d2a8df9f9e0500
-  data.tar.gz: 4bcf324022827e5145dc0cbcc4376a0958e5595f
+  metadata.gz: 7c1311828855bfe56729ac94279d1522da021a55
+  data.tar.gz: 20154b9c7e7cdbd446d722e3f472382d7563008d
 SHA512:
-  metadata.gz: 4f44642bb9ddfb9911fba8439b5dbcbfaa55bafbd47755c23f6279bc37da155c06e6100c56bdaebc1c783fdccd8e892b14f5b36b6eee9c81d21a3b0a9ebe2971
-  data.tar.gz: 5db7721ac8611a08167a91106ad5097db5796fb8664c3f36502ef7ac92706902b3e262bf5c1e9e4c1b20b045df9bfe87073acdd555322bda8b303e9bdb2088a6
+  metadata.gz: 244f03d865c9c63d2a1bf7b84bdf1dd5e52d6c4066a86b2603b5b2462411dc5f0411ff014e7567ccc5eda9eb325e82c26c9eec81656976ad3a48e77d1822c944
+  data.tar.gz: ef5a74967de5c2a3824cac9717ec80982f3749858751af79d0ff32f1368220c17b6e6d7ddfa9c8337596cb119ad97555d12aaf0030ed403fe915c1f99acfd533

data/.travis.yml

@@ -12,7 +12,6 @@ rvm:
   - rbx-2
   - jruby-9000
   - ruby-head
-  - jruby-head
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'
@@ -20,6 +19,9 @@ 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,21 @@
+# v0.7.2 2016-05-11
+
+## Fixed
+
+- `Bool#default` gladly accepts `false` as its value (solnic)
+- Creating an empty schema with input processor no longer fails (lasseebert)
+
+## Changes
+- Allow multiple calls to meta (solnic)
+- Allow capitalised versions of true and false values for boolean coercions (nil0bject)
+- Replace kleisli with dry-monads (flash-gordon)
+- Use coercions from Kernel (flash-gordon)
+- Decimal coercions now work with Float (flash-gordon)
+- Coerce empty strings in form posts to blank arrays and hashes (timriley)
+- update to use dry-logic v0.2.3 (fran-worley)
+
+[Compare v0.7.0...v0.7.1](https://github.com/dryrb/dry-types/compare/v0.7.1...v0.7.2)
+
 # v0.7.1 2016-04-06
 
 ## Added

data/Gemfile

@@ -20,3 +20,5 @@ group :benchmarks do
   gem 'fast_attributes'
   gem 'attrio'
 end
+
+gem "dry-logic", git: 'https://github.com/dry-rb/dry-logic.git', branch: "master"

data/dry-types.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |spec|
   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.2', '>= 0.2.0'
+  spec.add_runtime_dependency 'dry-logic', '~> 0.2', '>= 0.2.3'
   spec.add_runtime_dependency 'inflecto', '~> 0.0.0', '>= 0.0.2'
-  spec.add_runtime_dependency 'kleisli', '~> 0.2'
+  spec.add_runtime_dependency 'dry-monads', '>= 0.0.1'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 11.0"

data/lib/dry/types.rb

@@ -21,6 +21,8 @@ module Dry
   module Types
     extend Dry::Configurable
 
+    Undefined = Object.new.freeze
+
     setting :namespace, self
 
     TYPE_SPEC_REGEX = %r[(.+)<(.+)>].freeze

data/lib/dry/types/builder.rb

@@ -22,8 +22,8 @@ module Dry
         constrained_type.new(self, rule: Types.Rule(options))
       end
 
-      def default(input = nil, &block)
-        value = input ? input : block
+      def default(input = Undefined, &block)
+        value = input == Undefined ? block : input
 
         if value.is_a?(Proc) || valid?(value)
           Default[value].new(self, value: value)
@@ -33,7 +33,7 @@ module Dry
       end
 
       def enum(*values)
-        Enum.new(constrained(inclusion: values), values: values)
+        Enum.new(constrained(included_in: values), values: values)
       end
 
       def safe

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

@@ -5,8 +5,8 @@ module Dry
   module Types
     module Coercions
       module Form
-        TRUE_VALUES = %w[1 on  t true  y yes].freeze
-        FALSE_VALUES = %w[0 off f false n no].freeze
+        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
         BOOLEAN_MAP = ::Hash[TRUE_VALUES.product([true]) + FALSE_VALUES.product([false])].freeze
 
         extend Coercions
@@ -20,38 +20,42 @@ module Dry
         end
 
         def self.to_int(input)
-          return if empty_str?(input)
-
-          result = input.to_i
-
-          if result === 0 && !input.eql?('0')
-            input
+          if empty_str?(input)
+            nil
           else
-            result
+            Integer(input)
           end
+        rescue ArgumentError, TypeError
+          input
         end
 
         def self.to_float(input)
-          return if empty_str?(input)
-
-          result = input.to_f
-
-          if result.eql?(0.0) && (!input.eql?('0') && !input.eql?('0.0'))
-            input
+          if empty_str?(input)
+            nil
           else
-            result
+            Float(input)
           end
+        rescue ArgumentError, TypeError
+          input
         end
 
         def self.to_decimal(input)
           result = to_float(input)
 
           if result.instance_of?(Float)
-            result.to_d
+            input.to_d
           else
             result
           end
         end
+
+        def self.to_ary(input)
+          empty_str?(input) ? [] : input
+        end
+
+        def self.to_hash(input)
+          empty_str?(input) ? {} : input
+        end
       end
     end
   end

data/lib/dry/types/compiler.rb

@@ -77,7 +77,7 @@ module Dry
 
       def merge_with(hash_id, constructor, schema)
         registry[hash_id].__send__(
-          constructor, schema.map { |key| visit(key) }.reduce(:merge)
+          constructor, schema.map { |key| visit(key) }.reduce({}, :merge)
         )
       end
     end

data/lib/dry/types/form.rb

@@ -43,11 +43,11 @@ module Dry
     end
 
     register('form.array') do
-      self['array'].safe
+      self['array'].safe.constructor(Coercions::Form.method(:to_ary))
     end
 
     register('form.hash') do
-      self['hash'].safe
+      self['hash'].safe.constructor(Coercions::Form.method(:to_hash))
     end
   end
 end

data/lib/dry/types/maybe.rb

@@ -1,4 +1,4 @@
-require 'kleisli/maybe'
+require 'dry/monads/maybe'
 require 'dry/types/decorator'
 
 module Dry
@@ -6,9 +6,10 @@ module Dry
     class Maybe
       include Decorator
       include Builder
+      include Dry::Monads::Maybe::Mixin
 
       def call(input)
-        input.is_a?(Kleisli::Maybe) ? input : Maybe(type[input])
+        input.is_a?(Dry::Monads::Maybe) ? input : Maybe(type[input])
       end
       alias_method :[], :call
 

data/lib/dry/types/options.rb

@@ -16,7 +16,7 @@ module Dry
       end
 
       def meta(data = nil)
-        data ? with(meta: data) : @meta
+        data ? with(meta: @meta.merge(data)) : @meta
       end
     end
   end

data/lib/dry/types/sum.rb

@@ -3,6 +3,7 @@ require 'dry/types/options'
 module Dry
   module Types
     class Sum
+      include Dry::Equalizer(:left, :right, :options)
       include Builder
       include Options
 

data/lib/dry/types/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Types
-    VERSION = '0.7.1'.freeze
+    VERSION = '0.7.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -75,7 +75,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: inflecto
   requirement: !ruby/object:Gem::Requirement
@@ -107,19 +107,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: kleisli
+  name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -236,10 +236,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Type system for Ruby supporting coercions, constraints and complex types
   like structs, value objects, enums etc.
 test_files: []
-has_rdoc: