dry-schema 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd83b8cd1025c9f732f593b47d52583455bac56def9866901a374cd9f24dc11
-  data.tar.gz: def7d4f585ab856a055667474bc6cb59e7f012e13dcf0a4a9d17daa9b0ea53d1
+  metadata.gz: e079ef300d87844185052fe2a2c3e42230d29aefd409ec0acf6b9a45d3f296f5
+  data.tar.gz: cf34b9651357525e874109f4533e8c23c2f682ca33ffe90da0e789037491cfe2
 SHA512:
-  metadata.gz: 77a2481151c16aa91e1a29a32e640adadfcefcbceacbd5e1e8cdfcd63c29d186dbc17640d9da0974c37a2e152440da723fd516cac7362cd195b24630011905d0
-  data.tar.gz: c5cf256d2b61a3dc7b832f68d6ce64c735f00a7885f42a05f53f67a07ec6108322d996ea243387dc91b5acfbb57765129e8d25bfecbb2c151a5e18ac3c709c50
+  metadata.gz: 8bb4f328f94be77fcdeb4791c5227d694a93522880dbc7ed48684033e83f37ce62da9627820d2ba53606f231ac6e5add562a1d2cd502a851b8bab8415e748882
+  data.tar.gz: 1866a985a5bc45eb84c8670c8b67b209fd3397f656a82080debcc7cfa8a29284e7de6528a1b662eeafd61f0bbe2094328401ede95f381be7c765322de782690d

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+# 1.4.3 2020-01-08
+
+### Added
+
+* Pattern matching for `Dry::Schema::Result` objects (@flash-gordon)
+	```ruby
+	schema = Dry::Schema::Params { required(:name).filled }
+	case schema.('name' => 'John')
+	in name:
+		name # => 'John'
+	end
+	```
+	Try it with monads!
+* Shortcut for nested schemas in `value` and `maybe` macros (@waiting-for-dev)
+	```ruby
+	Dry::Schema.Params do
+		required(:address).value(:hash) do
+			required(:city).filled
+		end
+	end
+	```
+
+### Fixed
+
+* Some keyword warnings that slipped into the previous release (@flash-gordon)
+
+[Compare v1.4.2...v1.4.3](https://github.com/dry-rb/dry-schema/compare/v1.4.2...v1.4.3)
+
 # 1.4.2 2019-12-19
 
 ### Fixed

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2019 dry-rb team
+Copyright (c) 2015-2020 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,6 +1,6 @@
 [gem]: https://rubygems.org/gems/dry-schema
 [actions]: https://github.com/dry-rb/dry-schema/actions
-[codeclimate]: https://codeclimate.com/github/dry-rb/dry-schema
+[codacy]: https://www.codacy.com/gh/dry-rb/dry-schema
 [chat]: https://dry-rb.zulipchat.com
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-schema
 
@@ -8,8 +8,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/dry-schema.svg)][gem]
 [![CI Status](https://github.com/dry-rb/dry-schema/workflows/ci/badge.svg)][actions]
-[![Code Climate](https://codeclimate.com/github/dry-rb/dry-schema/badges/gpa.svg)][codeclimate]
-[![Test Coverage](https://codeclimate.com/github/dry-rb/dry-schema/badges/coverage.svg)][codeclimate]
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/961f5c776f1d49218b2cede3745e059c)][codacy]
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/961f5c776f1d49218b2cede3745e059c)][codacy]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-schema.svg?branch=master)][inchpages]
 
 ## Links
@@ -19,7 +19,7 @@
 
 ## Supported Ruby versions
 
-This library officially supports following Ruby versions:
+This library officially supports the following Ruby versions:
 
 * MRI >= `2.4`
 * jruby >= `9.2`

data/lib/dry/schema/config.rb

@@ -58,7 +58,7 @@ module Dry
 
       # @api private
       def inspect
-        "#<#{self.class} #{to_h.map { |k,v| ["#{k}=", v.inspect] }.map(&:join).join(' ')}>"
+        "#<#{self.class} #{to_h.map { |k, v| ["#{k}=", v.inspect] }.map(&:join).join(' ')}>"
       end
 
       private

data/lib/dry/schema/macros/maybe.rb

@@ -30,8 +30,7 @@ module Dry
            [
              [:not, [:predicate, [:nil?, [[:input, Undefined]]]]],
              trace.to_rule.to_ast
-           ]
-          ]
+           ]]
         end
       end
     end

data/lib/dry/schema/macros/value.rb

@@ -27,13 +27,18 @@ module Dry
           end
 
           trace.evaluate(*predicates, **opts)
-          trace.append(new(chain: false).instance_exec(&block)) if block
+
+          type_spec = opts[:type_spec]
+          if block && type_spec.equal?(:hash)
+            hash(&block)
+          elsif block
+            trace.append(new(chain: false).instance_exec(&block))
+          end
 
           if trace.captures.empty?
             raise ArgumentError, 'wrong number of arguments (given 0, expected at least 1)'
           end
 
-          type_spec = opts[:type_spec]
           each(type_spec.type.member) if type_spec.respond_to?(:member)
 
           self

data/lib/dry/schema/message_compiler.rb

@@ -131,7 +131,7 @@ module Dry
         ).to_h
 
         template, meta = messages[predicate, options] ||
-          raise(MissingMessageError.new(path, messages.looked_up_paths(predicate, options)))
+                         raise(MissingMessageError.new(path, messages.looked_up_paths(predicate, options)))
 
         text = message_text(template, tokens, options)
 

data/lib/dry/schema/message_set.rb

@@ -17,13 +17,13 @@ module Dry
       #
       # @return [Array<Message>]
       attr_reader :messages
-      
+
       # An internal hash that is filled in with dumped messages
       # when a message set is coerced to a hash
       #
       # @return [Hash<Symbol=>[Array,Hash]>]
       attr_reader :placeholders
-      
+
       # Options hash
       #
       # @return [Hash]

data/lib/dry/schema/messages/i18n.rb

@@ -33,7 +33,7 @@ module Dry
 
         opts = { locale: options.fetch(:locale, default_locale) }
 
-        translation = t.(key, opts)
+        translation = t.(key, **opts)
         text_key = "#{key}.text"
 
         if !translation.is_a?(Hash) || !key?(text_key, opts)
@@ -44,7 +44,7 @@ module Dry
         end
 
         {
-          text: t.(text_key, opts),
+          text: t.(text_key, **opts),
           meta: extract_meta(key, translation, opts)
         }
       end
@@ -121,7 +121,7 @@ module Dry
       def extract_meta(parent_key, translation, options)
         translation.keys.each_with_object({}) do |k, meta|
           meta_key = "#{parent_key}.#{k}"
-          meta[k] = t.(meta_key, options) if k != :text && key?(meta_key, options)
+          meta[k] = t.(meta_key, **options) if k != :text && key?(meta_key, options)
         end
       end
     end

data/lib/dry/schema/messages/yaml.rb

@@ -22,7 +22,7 @@ module Dry
       # @return [Hash]
       attr_reader :data
 
-      # Translation function     
+      # Translation function
       #
       # @return [Proc]
       attr_reader :t

data/lib/dry/schema/result.rb

@@ -136,6 +136,15 @@ module Dry
         "#<#{self.class}#{to_h.inspect} errors=#{errors.to_h.inspect}>"
       end
 
+      if RUBY_VERSION >= '2.7'
+        # Pattern matching support
+        #
+        # @api private
+        def deconstruct_keys(_)
+          output
+        end
+      end
+
       private
 
       # A list of failure ASTs produced by rule result objects

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = '1.4.2'
+    VERSION = '1.4.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Coercion and validation for data structures