dry-types 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 336c6e4da78c6b66a32a43671d7961b5a9e26e78
-  data.tar.gz: 282770ba63247f594e89071ad36677689fe7ddc7
+  metadata.gz: 7886fadf19e4beced5252aba4a5db6b6912804e6
+  data.tar.gz: e305a68af891e5e6c68be0859dcc1866f20d460e
 SHA512:
-  metadata.gz: af9f5770f1ae7e750589b016bba706eb874cacb8d282b013493ec81c2344af35abde95eb3609c6f80fb907ca17abc7c964f25a9c290ee0fe9992f3cd131885e6
-  data.tar.gz: 9a7711e6c22eb5889448ce10adbcbb48cb02e1d6a9ee91c43707556e68b6e57e048507382a13d28a00940befca06d88329ec99ce7132dcefd4857a3435b92b8c
+  metadata.gz: 9373b3e8c70db220e865639b9e1080f24c9c8e8c0b6033863ac098af08e5c37d900cd063933402fb42cec26f55a60bf6fcdf2ed846ecaf02572cddf031e25fc8
+  data.tar.gz: b3f2ba541fd524998b71b243e84500a5a290ba1d98ef7d2089e96d34bf0658abed961b2a2ce1a468774c36cdf34ffdb32798fe9cc3403a0e4452741f6d5e3d9a

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# v0.12.1 to-be-released
+
+## Fixed
+
+* `Constructor#try` rescues `ArgumentError` (raised in cases like `Integer('foo')`) (flash-gordon)
+* `#constructor` works correctly for default and enum types (solnic)
+* Optional sum types work correctly in `safe` mode (GustavoCaso)
+* The equalizer of constrained types respects meta (flash-gordon)
+
+[Compare v0.12.0...master](https://github.com/dry-rb/dry-types/compare/v0.12.0...master)
+
 # v0.12.0 2017-09-15
 
 ## Added

data/Gemfile

@@ -20,6 +20,7 @@ group :benchmarks do
   gem 'virtus'
   gem 'fast_attributes'
   gem 'attrio'
+  gem 'dry-struct'
 end
 
 gem 'dry-logic', git: 'https://github.com/dry-rb/dry-logic'

data/Rakefile

@@ -7,7 +7,6 @@ task :run_specs do
   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

data/lib/dry/types/compiler.rb

@@ -16,6 +16,11 @@ module Dry
         send(:"visit_#{ type }", body)
       end
 
+      def visit_constrained(node)
+        definition, rule, meta = node
+        Types::Constrained.new(visit(definition), rule: visit_rule(rule)).meta(meta)
+      end
+
       def visit_constructor(node)
         definition, fn_register_name, meta = node
         fn = Dry::Types::FnContainer[fn_register_name]
@@ -38,6 +43,11 @@ module Dry
         end
       end
 
+      def visit_rule(node)
+        operator, rule = node
+        Dry::Types.rule_compiler.(rule).reduce(operator)
+      end
+
       def visit_sum(node)
         *types, meta = node
         types.map { |type| visit(type) }.reduce(:|).meta(meta)

data/lib/dry/types/constrained.rb

@@ -6,7 +6,7 @@ module Dry
   module Types
     class Constrained
       include Type
-      include Dry::Equalizer(:type, :options, :rule)
+      include Dry::Equalizer(:type, :options, :rule, :meta)
       include Decorator
       include Builder
 

data/lib/dry/types/constructor.rb

@@ -54,7 +54,7 @@ module Dry
       # @return [Object] if block given and try fails
       def try(input, &block)
         type.try(fn[input], &block)
-      rescue TypeError => e
+      rescue TypeError, ArgumentError => e
         failure(input, e.message)
       end
 

data/lib/dry/types/decorator.rb

@@ -14,11 +14,6 @@ module Dry
         @type = type
       end
 
-      # @return [Constructor]
-      def constructor
-        type.constructor
-      end
-
       # @param [Object] input
       # @param [#call, nil] block
       # @return [Result,Logic::Result]

data/lib/{spec/dry → dry/types/spec}/types.rb

@@ -73,4 +73,12 @@ RSpec.shared_examples_for Dry::Types::Definition do
       expect(type.primitive).to be_instance_of(Class)
     end
   end
+
+  describe '#constructor' do
+    it 'returns a constructor' do
+      constructor = type.constructor(&:to_s)
+
+      expect(constructor).to be_instance_of(Dry::Types::Constructor)
+    end
+  end
 end

data/lib/dry/types/sum.rb

@@ -91,6 +91,24 @@ module Dry
         end
       end
 
+      def success(input)
+        if left.valid?(input)
+          left.success(input)
+        elsif right.valid?(input)
+          right.success(input)
+        else
+          raise ArgumentError, "Invalid success value '#{input}' for #{inspect}"
+        end
+      end
+
+      def failure(input)
+        if !left.valid?(input)
+          left.failure(input, left.try(input).error)
+        else
+          right.failure(input, right.try(input).error)
+        end
+      end
+
       # @param [Object] value
       # @return [Boolean]
       def primitive?(value)

data/lib/dry/types/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Types
-    VERSION = '0.12.0'.freeze
+    VERSION = '0.12.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -248,10 +248,10 @@ files:
 - lib/dry/types/options.rb
 - lib/dry/types/result.rb
 - lib/dry/types/safe.rb
+- lib/dry/types/spec/types.rb
 - lib/dry/types/sum.rb
 - lib/dry/types/type.rb
 - lib/dry/types/version.rb
-- lib/spec/dry/types.rb
 - log/.gitkeep
 homepage: https://github.com/dry-rb/dry-types
 licenses: