fear 1.1.0 → 1.2.0

data/Rakefile

@@ -171,6 +171,33 @@ namespace :perf do
     require "qo"
     require "dry/matcher"
 
+    task :option_match_vs_native_pattern_match do
+      some = Fear.some(42)
+
+      Benchmark.ips do |x|
+        x.report("case ... in ...") do
+          case some
+          in Fear::Some(41 => x)
+            x
+          in Fear::Some(42 => x)
+            x
+          in Fear::Some(43 => x)
+            x
+          end
+        end
+
+        x.report("Option.match") do
+          some.match do |m|
+            m.some(41, &:itself)
+            m.some(42, &:itself)
+            m.some(45, &:itself)
+          end
+        end
+
+        x.compare!
+      end
+    end
+
     task :qo_vs_fear_pattern_extraction do
       User = Struct.new(:id, :name)
       user = User.new(42, "Jane")

data/examples/pattern_extracting.rb

@@ -9,7 +9,7 @@ matcher = Fear.matcher do |m|
     puts "Hi #{name}, you are welcome"
   end
   m.xcase("User(_, _, false)") do
-    puts "Only admins allowed here"
+    puts "Only admins are allowed here"
   end
 end
 

data/examples/pattern_extracting_ruby2.7.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "fear"
+
+matcher = proc do |value|
+  case value
+  in User(admin: true, name:)
+    puts "Hi #{name}, you are welcome"
+  in User(admin: false)
+    puts "Only admins are allowed here"
+  end
+end
+
+matcher.(User.new(1, "Jane", true))
+matcher.(User.new(1, "John", false))

data/examples/pattern_matching_binary_tree_set.rb

@@ -12,8 +12,11 @@ require "fear"
 #
 class BinaryTreeSet
   Position = Module.new
+  private_constant(:Position)
   Right = Module.new.include(Position)
+  private_constant(:Right)
   Left = Module.new.include(Position)
+  private_constant(:Left)
 
   def initialize(elem = 0, removed: true)
     @elem = elem

data/examples/pattern_matching_number_in_words.rb

@@ -33,6 +33,7 @@ class ToWords
     80 => "eighty",
     90 => "ninety",
   }.freeze
+  private_constant :NUMBERS
 
   CONVERTER = Fear.matcher do |m|
     NUMBERS.each_pair do |number, in_words|
@@ -46,6 +47,7 @@ class ToWords
     m.case(->(n) { n < 1_000_000 }) { |n| "#{CONVERTER.(n / 1_000)} thousands #{CONVERTER.(n % 1_000)}" }
     m.else { |n| raise "#{n} too big " }
   end
+  private_constant :CONVERTER
 
   def self.call(number)
     Fear.case(Integer, &:itself).and_then(CONVERTER).(number)

data/fear.gemspec

@@ -20,12 +20,6 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^spec\/})
   spec.require_paths = ["lib"]
 
-  spec.post_install_message = <<-MSG
-    Fear v0.11.0 introduces backwards-incompatible changes.
-    Please see https://github.com/bolshakov/fear/blob/master/CHANGELOG.md#0110 for details.
-    Successfully installed fear-#{Fear::VERSION}
-  MSG
-
   spec.add_runtime_dependency "lru_redux"
   spec.add_runtime_dependency "treetop"
 
@@ -35,9 +29,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "dry-matcher"
   spec.add_development_dependency "dry-monads"
   spec.add_development_dependency "qo"
-  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.1"
-  spec.add_development_dependency "rubocop-rspec", "1.33.0"
+  spec.add_development_dependency "rubocop-rspec", "1.34.0"
+  spec.add_development_dependency "rubocop", "1.0.0"
   spec.add_development_dependency "ruby_coding_standard"
   spec.add_development_dependency "yard"
+  spec.add_development_dependency "dry-types"
+  spec.add_development_dependency "fear-rspec"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-lcov"
 end

data/lib/dry/types/fear.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "dry/types"
+require "fear"
+
+Dry::Types.register_extension(:fear_option) do
+  require "dry/types/fear/option"
+end

data/lib/dry/types/fear/option.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+module Dry
+  module Types
+    class Option
+      include Type
+      include ::Dry::Equalizer(:type, :options, inspect: false, immutable: true)
+      include Decorator
+      include Builder
+      include Printable
+
+      # @param [Fear::Option, Object] input
+      #
+      # @return [Fear::Option]
+      #
+      # @api private
+      def call_unsafe(input = Undefined)
+        case input
+        when ::Fear::Option
+          input
+        when Undefined
+          Fear.none
+        else
+          Fear.option(type.call_unsafe(input))
+        end
+      end
+
+      # @param [Fear::Option, Object] input
+      #
+      # @return [Fear::Option]
+      #
+      # @api private
+      def call_safe(input = Undefined)
+        case input
+        when ::Fear::Option
+          input
+        when Undefined
+          Fear.none
+        else
+          Fear.option(type.call_safe(input) { |output = input| return yield(output) })
+        end
+      end
+
+      # @param [Object] input
+      #
+      # @return [Result::Success]
+      #
+      # @api public
+      def try(input = Undefined)
+        result = type.try(input)
+
+        if result.success?
+          Result::Success.new(Fear.option(result.input))
+        else
+          result
+        end
+      end
+
+      # @return [true]
+      #
+      # @api public
+      def default?
+        true
+      end
+
+      # @param [Object] value
+      #
+      # @see Dry::Types::Builder#default
+      #
+      # @raise [ArgumentError] if nil provided as default value
+      #
+      # @api public
+      def default(value)
+        if value.nil?
+          raise ArgumentError, "nil cannot be used as a default of a maybe type"
+        else
+          super
+        end
+      end
+    end
+
+    module Builder
+      # Turn a type into a maybe type
+      #
+      # @return [Option]
+      #
+      # @api public
+      def option
+        Option.new(Types["nil"] | self)
+      end
+    end
+
+    # @api private
+    class Schema
+      class Key
+        # @api private
+        def option
+          __new__(type.option)
+        end
+      end
+    end
+
+    # @api private
+    class Printer
+      MAPPING[Option] = :visit_option
+
+      # @api private
+      def visit_option(maybe)
+        visit(maybe.type) do |type|
+          yield "Fear::Option<#{type}>"
+        end
+      end
+    end
+
+    # Register non-coercible maybe types
+    NON_NIL.each_key do |name|
+      register("option.strict.#{name}", self[name.to_s].option)
+    end
+
+    # Register coercible maybe types
+    COERCIBLE.each_key do |name|
+      register("option.coercible.#{name}", self["coercible.#{name}"].option)
+    end
+  end
+end

data/lib/fear.rb

@@ -11,10 +11,19 @@ require "fear/version"
 
 module Fear
   Error = Class.new(StandardError)
+  public_constant :Error
+
   IllegalStateException = Class.new(Error)
+  public_constant :IllegalStateException
+
   MatchError = Class.new(Error)
+  public_constant :MatchError
+
   NoSuchElementError = Class.new(Error)
+  public_constant :NoSuchElementError
+
   PatternSyntaxError = Class.new(Error)
+  public_constant :PatternSyntaxError
 
   extend EitherApi
   extend ExtractorApi

data/lib/fear/awaitable.rb

@@ -9,7 +9,7 @@ module Fear
   module Awaitable
     # Await +completed+ state of this +Awaitable+
     #
-    # @param at_most [Fixnum] maximum timeout in seconds
+    # @param _at_most [Fixnum] maximum timeout in seconds
     # @return [Fear::Awaitable]
     # @raise [Timeout::Error]
     def __ready__(_at_most)
@@ -18,7 +18,7 @@ module Fear
 
     # Await and return the result of this +Awaitable+
     #
-    # @param at_most [Fixnum] maximum timeout in seconds
+    # @param _at_most [Fixnum] maximum timeout in seconds
     # @return [any]
     # @raise [Timeout::Error]
     def __result__(_at_most)

data/lib/fear/either.rb

@@ -275,6 +275,11 @@ module Fear
     # @return [String]
     alias to_s inspect
 
+    # @return [<any>]
+    def deconstruct
+      [value]
+    end
+
     class << self
       # Build pattern matcher to be used later, despite off
       # +Either#match+ method, id doesn't apply matcher immanently,

data/lib/fear/either_pattern_match.rb

@@ -25,7 +25,10 @@ module Fear
   # @api private
   class EitherPatternMatch < Fear::PatternMatch
     LEFT_EXTRACTOR = :left_value.to_proc
+    public_constant :LEFT_EXTRACTOR
+
     RIGHT_EXTRACTOR = :right_value.to_proc
+    public_constant :RIGHT_EXTRACTOR
 
     # Match against +Fear::Right+
     #

data/lib/fear/extractor.rb

@@ -23,6 +23,7 @@ module Fear
     autoload :ValueMatcher, "fear/extractor/value_matcher"
 
     ExtractorNotFound = Class.new(Error)
+    public_constant :ExtractorNotFound
 
     @mutex = Mutex.new
     @registry = PartialFunction::EMPTY
@@ -30,6 +31,7 @@ module Fear
     EXTRACTOR_NOT_FOUND = proc do |klass|
       raise ExtractorNotFound, "could not find extractor for " + klass.inspect
     end
+    private_constant :EXTRACTOR_NOT_FOUND
 
     class << self
       # @param klass [Class, String]

data/lib/fear/extractor/any_matcher.rb

@@ -10,7 +10,7 @@ module Fear
       end
 
       def bindings(_)
-        EMPTY_HASH
+        Utils::EMPTY_HASH
       end
     end
   end

data/lib/fear/extractor/array_splat_matcher.rb

@@ -9,7 +9,7 @@ module Fear
       end
 
       def bindings(_)
-        EMPTY_HASH
+        Utils::EMPTY_HASH
       end
     end
   end

data/lib/fear/extractor/empty_list_matcher.rb

@@ -13,7 +13,7 @@ module Fear
       end
 
       def bindings(_)
-        EMPTY_HASH
+        Utils::EMPTY_HASH
       end
     end
   end

data/lib/fear/extractor/matcher.rb

@@ -8,9 +8,6 @@ module Fear
     class Matcher < OpenStruct
       autoload :And, "fear/extractor/matcher/and"
 
-      EMPTY_HASH = {}.freeze
-      EMPTY_ARRAY = [].freeze
-
       # @param node [Fear::Extractor::Grammar::Node]
       def initialize(node:, **attributes)
         @input = node.input

data/lib/fear/extractor/pattern.rb

@@ -7,6 +7,7 @@ module Fear
     # Parse pattern. Used within +Fear[]+
     class Pattern
       DEFAULT_PATTERN_CACHE_SIZE = 10_000
+      private_constant :DEFAULT_PATTERN_CACHE_SIZE
       @pattern_cache = LruRedux::Cache.new(ENV.fetch("FEAR_PATTERNS_CACHE_SIZE", DEFAULT_PATTERN_CACHE_SIZE))
 
       class << self

data/lib/fear/extractor/value_matcher.rb

@@ -12,7 +12,7 @@ module Fear
       end
 
       def bindings(_)
-        EMPTY_HASH
+        Utils::EMPTY_HASH
       end
     end
   end

data/lib/fear/failure.rb

@@ -5,6 +5,7 @@ module Fear
     include Try
     include RightBiased::Left
     include FailurePatternMatch.mixin
+
     EXTRACTOR = proc do |try|
       if Fear::Failure === try
         Fear.some([try.exception])
@@ -12,6 +13,7 @@ module Fear
         Fear.none
       end
     end
+    public_constant :EXTRACTOR
 
     # @param [StandardError]
     def initialize(exception)
@@ -103,5 +105,10 @@ module Fear
 
     # @return [String]
     alias to_s inspect
+
+    # @return [<StandardError>]
+    def deconstruct
+      [exception]
+    end
   end
 end

data/lib/fear/future.rb

@@ -298,11 +298,9 @@ module Fear
       on_complete_match do |m|
         m.case(Fear::Failure) { |failure| promise.complete!(failure) }
         m.success do |value|
-          begin
-            yield(value).on_complete { |callback_result| promise.complete!(callback_result) }
-          rescue StandardError => error
-            promise.failure!(error)
-          end
+          yield(value).on_complete { |callback_result| promise.complete!(callback_result) }
+        rescue StandardError => error
+          promise.failure!(error)
         end
       end
       promise.to_future
@@ -380,7 +378,15 @@ module Fear
       on_complete_match do |m|
         m.success do |value|
           other.on_complete do |other_try|
-            promise.complete!(other_try.map { |other_value| [value, other_value] })
+            promise.complete!(
+              other_try.map do |other_value|
+                if block_given?
+                  yield(value, other_value)
+                else
+                  [value, other_value]
+                end
+              end,
+            )
           end
         end
         m.failure do |error|