dry-matcher 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0215bfb6c841e25bcd167ebf29b6dd05c642926c04bb253cabe5a3d430ee27
-  data.tar.gz: 6a69936b8ce9b3edfd22653c0e358f8c6d1149064a74782661b8a251e306ba86
+  metadata.gz: 70aa7037f519f35f5c9c29206d0529fe452a5e0b08268f6d7d0884846e74bfa5
+  data.tar.gz: c5022a321698bfff91e04688bc2c4b09487dff1c47902ade7005d6384745df2f
 SHA512:
-  metadata.gz: a0641213eab8f65143040b0c6a61913415822e34fa985ff68a3efae84e4a21ffeb04675ad4ba5aaf7476cfd7d4bc89128f5faec7d705d36f8d262a0b131d2c76
-  data.tar.gz: 5b42966da62e0b5665ca89c20aaef62683a9e52e4fae91ae4eb852f9e2900f417800f5ce5ca82ccf3e5403d39ce54af7862942e7ee4fda12215eee297450c21f
+  metadata.gz: 7a53db4413d2e75db38e6740efc025d9b71a9a92af176e50dcdc514ab6ecd8b2b5f46175588c8c16c3316ade374d936c1899d7daccf4dcd8a2529283ac52be7c
+  data.tar.gz: 42c1f0b533368724e43f9f01f99251bca601de0a1896a0adad2cce2362eeb3e5b76a324f4bee705dd5887f1def7c8ea24ae064889483bb9509e5b94ef9d81db6

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.10.0 2022-11-16
+
+
+### Changed
+
+- This version is compatible with recently released dry-rb dependencies (@flash-gordon)
+
+[Compare v0.9.0...v0.10.0](https://github.com/dry-rb/dry-matcher/compare/v0.9.0...v0.10.0)
+
 ## 0.9.0 2021-03-05
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2022 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,3 +1,4 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-matcher
 [actions]: https://github.com/dry-rb/dry-matcher/actions
 [codacy]: https://www.codacy.com/gh/dry-rb/dry-matcher
@@ -10,19 +11,19 @@
 [![CI Status](https://github.com/dry-rb/dry-matcher/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f09a7d1745fd430d829a1f825357db88)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/f09a7d1745fd430d829a1f825357db88)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-matcher.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-matcher.svg?branch=main)][inchpages]
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-matcher)
+* [User documentation](https://dry-rb.org/gems/dry-matcher)
 * [API documentation](http://rubydoc.info/gems/dry-matcher)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.5`
-* jruby >= `9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-matcher.gemspec

@@ -1,34 +1,35 @@
 # frozen_string_literal: true
-# this file is managed by dry-rb/devtools project
 
-lib = File.expand_path('lib', __dir__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/matcher/version'
+require "dry/matcher/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-matcher'
+  spec.name          = "dry-matcher"
   spec.authors       = ["Tim Riley", "Nikita Shilnikov"]
   spec.email         = ["tim@icelab.com.au", "fg@flashgordon.ru"]
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
   spec.version       = Dry::Matcher::VERSION.dup
 
   spec.summary       = "Flexible, expressive pattern matching for Ruby"
   spec.description   = spec.summary
-  spec.homepage      = 'https://dry-rb.org/gems/dry-matcher'
+  spec.homepage      = "https://dry-rb.org/gems/dry-matcher"
   spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-matcher.gemspec", "lib/**/*"]
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = []
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  spec.metadata['changelog_uri']     = 'https://github.com/dry-rb/dry-matcher/blob/master/CHANGELOG.md'
-  spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-matcher'
-  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-matcher/issues'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-matcher/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-matcher"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-matcher/issues"
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "dry-core", "~> 0.4", ">= 0.4.8"
+  spec.add_runtime_dependency "dry-core", "~> 1.0"
 
   spec.add_development_dependency "rake"
 end

data/lib/dry/matcher/case.rb

@@ -10,15 +10,11 @@ module Dry
       # @param match [#call] callable used to test given pattern against value
       # @param resolve [#call] callable used to resolve value into a result
       def initialize(match: Undefined, resolve: DEFAULT_RESOLVE, &block)
-        if block
-          @match = block
-        else
-          @match = proc do |value, patterns|
-            if match.(value, *patterns)
-              resolve.(value)
-            else
-              Undefined
-            end
+        @match = block || proc do |value, patterns|
+          if match.(value, *patterns)
+            resolve.(value)
+          else
+            Undefined
           end
         end
       end

data/lib/dry/matcher/either_matcher.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'dry/core/deprecations'
-require 'dry/matcher/result_matcher'
+require "dry/core/deprecations"
+require "dry/matcher/result_matcher"
 
 module Dry
   class Matcher
-    extend Dry::Core::Deprecations[:'dry-matcher']
+    extend Dry::Core::Deprecations[:"dry-matcher"]
 
     EitherMatcher = ResultMatcher
 
-    deprecate_constant(:EitherMatcher, message: 'Dry::Matcher::ResultMatcher')
+    deprecate_constant(:EitherMatcher, message: "Dry::Matcher::ResultMatcher")
   end
 end

data/lib/dry/matcher/evaluator.rb

@@ -61,7 +61,8 @@ module Dry
 
       def ensure_exhaustive_match
         if @unhandled_cases.any?
-          ::Kernel.raise NonExhaustiveMatchError, "cases +#{@unhandled_cases.join(', ')}+ not handled"
+          ::Kernel.raise NonExhaustiveMatchError,
+                         "cases +#{@unhandled_cases.join(", ")}+ not handled"
         end
       end
     end

data/lib/dry/matcher/match.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "dry/matcher"
+
+# rubocop:disable Style/CaseEquality
+module Dry
+  class Matcher
+    PatternMatch = proc do |value, patterns|
+      if patterns.empty?
+        value
+        # rubocop:disable Lint/DuplicateBranch
+      elsif value.is_a?(::Array) && patterns.any? { |p| p === value[0] }
+        value
+      elsif patterns.any? { |p| p === value }
+        # rubocop:enable Lint/DuplicateBranch
+        value
+      else
+        Undefined
+      end
+    end
+  end
+end
+# rubocop:enable Style/CaseEquality

data/lib/dry/matcher/maybe_matcher.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "dry/matcher"
+require "dry/matcher/match"
+
+module Dry
+  class Matcher
+    # Built-in {Matcher} ready to use with `Maybe` monad from
+    # [dry-monads](/gems/dry-monads) or any other compatible gems.
+    #
+    # Provides {Case}s for two matchers:
+    # * `:some` matches `Dry::Monads::Maybe::Some`
+    # * `:none` matches `Dry::Monads::Maybe::None`
+    #
+    # @return [Dry::Matcher]
+    #
+    # @example Usage with `dry-monads`
+    #   require 'dry/monads'
+    #   require 'dry/matcher/maybe_matcher'
+    #
+    #   value = Dry::Monads::Maybe.new('there is a value!')
+    #
+    #   Dry::Matcher::MaybeMatcher.(value) do |m|
+    #     m.some do |v|
+    #       "Yay: #{v}"
+    #     end
+    #
+    #     m.none do
+    #       "Boo: none"
+    #     end
+    #   end #=> "Yay: there is a value!"
+    #
+    #
+    # @example Usage with specific types
+    #   value = Dry::Monads::Maybe.new([200, :ok])
+    #
+    #   Dry::Matcher::MaybeMatcher.(value) do |m|
+    #     m.some(200, :ok) do |code, value|
+    #       "Yay: #{value}"
+    #     end
+    #
+    #     m.none do
+    #       "Boo: none"
+    #     end
+    #   end #=> "Yay: :ok"
+    #
+    MaybeMatcher = Dry::Matcher.new(
+      some: Case.new { |maybe, patterns|
+        if maybe.none?
+          Undefined
+        else
+          Dry::Matcher::PatternMatch.(maybe.value!, patterns)
+        end
+      },
+      none: Case.new { |maybe|
+        if maybe.some?
+          Undefined
+        end
+      }
+    )
+  end
+end

data/lib/dry/matcher/result_matcher.rb

@@ -1,21 +1,10 @@
 # frozen_string_literal: true
 
-require 'dry/matcher'
+require "dry/matcher"
+require "dry/matcher/match"
 
 module Dry
   class Matcher
-    match = ::Proc.new do |value, patterns|
-      if patterns.empty?
-        value
-      elsif value.is_a?(::Array) && patterns.any? { |p| p === value[0] }
-        value
-      elsif patterns.any? { |p| p === value }
-        value
-      else
-        Undefined
-      end
-    end
-
     # Built-in {Matcher} ready to use with `Result` or `Try` monads from
     # [dry-monads](/gems/dry-monads) or any other compatible gems.
     #
@@ -30,7 +19,7 @@ module Dry
     # @return [Dry::Matcher]
     #
     # @example Usage with `dry-monads`
-    #   require 'dry/monads/result'
+    #   require 'dry/monads'
     #   require 'dry/matcher/result_matcher'
     #
     #   value = Dry::Monads::Result::Success.new('success!')
@@ -85,7 +74,7 @@ module Dry
         result = result.to_result
 
         if result.success?
-          match.(result.value!, patterns)
+          Dry::Matcher::PatternMatch.(result.value!, patterns)
         else
           Undefined
         end
@@ -94,7 +83,7 @@ module Dry
         result = result.to_result
 
         if result.failure?
-          match.(result.failure, patterns)
+          Dry::Matcher::PatternMatch.(result.failure, patterns)
         else
           Undefined
         end

data/lib/dry/matcher/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   class Matcher
-    VERSION = '0.9.0'
+    VERSION = "0.10.0"
   end
 end

data/lib/dry/matcher.rb

@@ -78,7 +78,7 @@ module Dry
     #   after matched pattern
     #
     # @example Usage with `dry-monads`
-    #   require 'dry/monads/result'
+    #   require 'dry/monads'
     #   require 'dry/matcher/result_matcher'
     #
     #   value = Dry::Monads::Result::Failure.new('failure!')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-matcher
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Tim Riley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core
@@ -17,20 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +56,8 @@ files:
 - lib/dry/matcher/case.rb
 - lib/dry/matcher/either_matcher.rb
 - lib/dry/matcher/evaluator.rb
+- lib/dry/matcher/match.rb
+- lib/dry/matcher/maybe_matcher.rb
 - lib/dry/matcher/result_matcher.rb
 - lib/dry/matcher/version.rb
 homepage: https://dry-rb.org/gems/dry-matcher
@@ -69,7 +65,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-matcher/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-matcher/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-matcher
   bug_tracker_uri: https://github.com/dry-rb/dry-matcher/issues
 post_install_message: 
@@ -80,14 +76,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Flexible, expressive pattern matching for Ruby