fear 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 478065fc6d889020eb722d84eed56c46187431bb500a359985ee6e2fcb3277a2
-  data.tar.gz: 9a92582747a64d9525967dec128f8d4cf7e36a32cfc184b6a06ffe1dbc71cf8f
+  metadata.gz: 1fa7f6ac3aad235456d308554fccd82ea9c8d7ed5cbb1774047976bed3bd8278
+  data.tar.gz: c2dbd3ad5dd6b1780034598d6ca9ea91f55f5dfaa3bf0ba7852b7ebebb9f7944
 SHA512:
-  metadata.gz: 9c2ac3a10810f8916efd3dffaa5b71fc57d2c08689ece14dc0fd7e29e9563703221b02f8f482c890cd4c87db784c0459a83395fb2e97acf4cc24a0ca299e5bf4
-  data.tar.gz: 25f4758ea5c8cb2953e6942e2c64414d135c93f1ffa79f3850dcfe813a4d0b61efc68bb3b6292a3a16f1b76b07e81351393d608728297bdc877ef6b8368db371
+  metadata.gz: 164aeb41d3d210239adf73743fcdc3dd472fda922f7a23b6f08960700b3b1cc4dac838bce130cf979100e0f80de4616b5f9baeb2234d943d255228c7fd22ec80
+  data.tar.gz: 72b3372bc24b607adfb71b40f65fd2c71b59ba9a2487e7e297ab6bad3452c502ab0b8d39d7ae8b7ada59f2a3bb8d327cc91a75ac8c1c69a139dc4acbf10d78f5

data/.github/workflows/spec.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.7' , '3.0', '3.1', "3.2", "truffleruby+graalvm-head"]
+        ruby: ['3.1', "3.2", "3.3", "truffleruby+graalvm-head"]
     name: ${{ matrix.ruby }}
 
     steps:
@@ -19,10 +19,6 @@ jobs:
     - name: Install dependencies
       run: bundle install
     - name: Test
-      if: ${{ contains(matrix.ruby, 'truffleruby') }}
-      run: bundle exec rspec --exclude-pattern "**/*_pattern_matching_spec.rb"
-    - name: Test
-      if: ${{ !contains(matrix.ruby, 'truffleruby') }}
       run: bundle exec rspec
     - name: Coveralls
       uses: coverallsapp/github-action@v1.1.2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.0.0
+
+See full changelog here: https://github.com/bolshakov/fear/releases/tag/v3.0.0
+
+## 2.0.1
+
+* Fix Fear.option yard signature ([@bolshakov])
+
 ## 2.0.0
 
 * Added `Fear::Option#present?` and `Fear::Option#empty?` methods ([@Lokideos][])

data/Gemfile

@@ -5,5 +5,17 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in functional.gemspec
 gemspec
 
-gem "irb"
-gem "qo", github: "baweaver/qo"
+gem "benchmark-ips"
+gem "concurrent-ruby"
+gem "dry-matcher"
+gem "dry-monads"
+gem "dry-types"
+gem "fear-rspec"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.1"
+gem "rubocop", "1.32.0"
+gem "rubocop-rspec", "1.34.0"
+gem "ruby_coding_standard"
+gem "simplecov"
+gem "simplecov-lcov"
+gem "yard"

data/Gemfile.lock

@@ -1,76 +1,65 @@
-GIT
-  remote: https://github.com/baweaver/qo.git
-  revision: 8951ce899559118eb60321014b43cf4211730bd0
-  specs:
-    qo (0.99.0)
-      any (= 0.1.0)
-
 PATH
   remote: .
   specs:
-    fear (2.0.1)
+    fear (3.0.0)
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/
   specs:
-    any (0.1.0)
     ast (2.4.2)
-    benchmark-ips (2.12.0)
-    concurrent-ruby (1.2.2)
-    diff-lcs (1.5.0)
+    benchmark-ips (2.13.0)
+    bigdecimal (3.1.7)
+    concurrent-ruby (1.2.3)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    dry-configurable (0.12.1)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-logic (1.1.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-matcher (0.8.0)
-      dry-core (>= 0.4.7)
-    dry-monads (1.3.5)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-matcher (1.0.0)
+      dry-core (~> 1.0, < 2)
+    dry-monads (1.6.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer
-    dry-types (1.5.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
     fear-rspec (0.3.0)
       fear (>= 1.0.0)
       rspec (~> 3.0)
-    irb (1.1.0)
-      reline (>= 0.0.1)
-    json (2.6.2)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    json (2.7.1)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
+    racc (1.7.3)
     rainbow (3.1.1)
     rake (13.1.0)
-    regexp_parser (2.5.0)
-    reline (0.0.7)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.32.0)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -81,11 +70,11 @@ GEM
       rubocop-ast (>= 1.19.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
-      parser (>= 3.1.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-rspec (1.34.0)
       rubocop (>= 0.60.0)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby_coding_standard (0.4.0)
       rubocop (~> 1.32.0)
     simplecov (0.22.0)
@@ -95,23 +84,21 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (2.2.0)
-    yard (0.9.34)
+    unicode-display_width (2.5.0)
+    yard (0.9.36)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   benchmark-ips
-  bundler
   concurrent-ruby
   dry-matcher
   dry-monads
   dry-types
   fear!
   fear-rspec
-  irb
-  qo!
   rake (~> 13.0)
   rspec (~> 3.1)
   rubocop (= 1.32.0)
@@ -122,4 +109,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.5.7

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2019 Tema Bolshakov
+Copyright (c) 2015-2024 Tëma Bolshakov
 
 MIT License
 

data/README.md

@@ -632,6 +632,20 @@ Fear.left('left').swap   #=> Fear.right('left')
 Fear.right('right').swap #=> Fear.left('left')
 ```
 
+#### Either#left
+
+Projects this `Fear::Either` as a `Fear::Left`.
+This allows performing right-biased operation of the left
+side of the `Fear::Either`.
+
+```ruby
+Fear.left(42).left.map(&:succ)  #=> Fear.left(43)
+Fear.right(42).left.map(&:succ) #=> Fear.left(42)
+
+Fear.left(42).left.select(&:even?)  #=> Fear.left(42)
+Fear.right(42).left.select(&:odd?) #=> Fear.right(42)
+```
+
 #### Either#reduce
 
 Applies `reduce_left` if this is a `Left` or `reduce_right` if this is a `Right`.
@@ -1179,76 +1193,7 @@ end
 
 ### Dry-Types integration
 
-#### Option
-
-    NOTE: Requires the dry-tyes gem to be loaded.
-
-Load the `:fear_option` extension in your application.
-
-```ruby
-require 'dry-types'
-require 'dry/types/fear'
-
-Dry::Types.load_extensions(:fear_option)
-
-module Types
-  include Dry.Types()
-end
-```
-
-Append .option to a Type to return a `Fear::Option` object:
-
-```ruby
-Types::Option::Strict::Integer[nil] 
-#=> Fear.none
-Types::Option::Coercible::String[nil] 
-#=> Fear.none
-Types::Option::Strict::Integer[123] 
-#=> Fear.some(123)
-Types::Option::Strict::String[123]
-#=> Fear.some(123)
-Types::Option::Coercible::Float['12.3'] 
-#=> Fear.some(12.3)
-```
-
-'Option' types can also accessed by calling '.option' on a regular type:
-
-```ruby
-Types::Strict::Integer.option # equivalent to Types::Option::Strict::Integer
-```
-
-
-You can define your own optional types:
-
-```ruby
-option_string = Types::Strict::String.option
-option_string[nil]
-# => Fear.none
-option_string[nil].map(&:upcase)
-# => Fear.none
-option_string['something']
-# => Fear.some('something')
-option_string['something'].map(&:upcase)
-# => Fear.some('SOMETHING')
-option_string['something'].map(&:upcase).get_or_else { 'NOTHING' }
-# => "SOMETHING"
-```
-
-You can use it with dry-struct as well:
-
-```ruby
-class User < Dry::Struct
-  attribute :name, Types::Coercible::String
-  attribute :age,  Types::Coercible::Integer.option
-end
-
-user = User.new(name: 'Bob', age: nil)
-user.name #=> "Bob"
-user.age #=> Fear.none 
-
-user = User.new(name: 'Bob', age: 42)
-user.age #=> Fear.some(42) 
-```
+To use `Fear::Option` as optional type for `Dry::Types` use the [dry-types-fear] gem. 
 
 ## Testing
 
@@ -1272,3 +1217,6 @@ provides a bunch of rspec matchers.
 * [maybe](https://github.com/bhb/maybe)
 * [ruby-possibly](https://github.com/rap1ds/ruby-possibly)
 * [rumonade](https://github.com/ms-ati/rumonade)
+
+
+[dry-types-fear]: https://github.com/bolshakov/dry-types-fear

data/Rakefile

@@ -2,15 +2,16 @@
 
 require "bundler/gem_tasks"
 require "benchmark/ips"
+require "dry/monads"
 require_relative "lib/fear"
 
+include Dry::Monads[:maybe]
+
 namespace :perf do
   # Contains benchmarking against Dry-rb
   namespace :dry do
     task :some_fmap_vs_fear_some_map do
-      require "dry/monads/maybe"
-
-      dry = Dry::Monads::Some.new(42)
+      dry = Some(42)
       fear = Fear.some(42)
 
       Benchmark.ips do |x|
@@ -23,11 +24,9 @@ namespace :perf do
     end
 
     task :do_vs_fear_for do
-      require "dry/monads/maybe"
       require "dry/monads/do"
 
       class Operation
-        include Dry::Monads::Maybe::Mixin
         include Dry::Monads::Do.for(:call)
 
         def call
@@ -59,40 +58,21 @@ namespace :perf do
 
   # Contains internal benchmarking to if optimization works
   namespace :fear do
-    task :fear_pattern_extracting_with_vs_without_cache do
-      some = Fear.some([:err, "not found"])
-
-      class WOCache < Fear::Extractor::Pattern
-        def initialize(pattern)
-          @matcher = compile_pattern_without_cache(pattern)
-        end
-      end
-      pattern = "Fear::Some([:err, code])"
-
-      Benchmark.ips do |x|
-        x.report("With cache") do |_n|
-          Fear::Extractor::Pattern.new(pattern).extracted_arguments(some)
-        end
-
-        x.report("Without cache") do |_n|
-          WOCache.new(pattern).extracted_arguments(some)
-        end
-
-        x.compare!
-      end
-    end
-
     namespace :guard do
       task :and1_vs_new do
-        condition = Integer
+        iterations = 1_000
 
         Benchmark.ips do |x|
           x.report("Guard.new") do |n|
-            Fear::PartialFunction::Guard.new(condition) === n
+            iterations.times do
+              Fear::PartialFunction::Guard.new(Integer) === n
+            end
           end
 
           x.report("Guard.and1") do |n|
-            Fear::PartialFunction::Guard.and1(condition) === n
+            iterations.times do
+              Fear::PartialFunction::Guard.and1(Integer) === n
+            end
           end
 
           x.compare!
@@ -100,6 +80,7 @@ namespace :perf do
       end
 
       task :and2_vs_and do
+        iterations = 1_000
         first = Integer
         second = ->(x) { x > 2 }
 
@@ -108,11 +89,11 @@ namespace :perf do
 
         Benchmark.ips do |x|
           x.report("and2") do |n|
-            and2 === n
+            iterations.times { and2 === n }
           end
 
           x.report("Guard#and") do |n|
-            and_and === n
+            iterations.times { and_and === n }
           end
 
           x.compare!
@@ -120,6 +101,7 @@ namespace :perf do
       end
 
       task :and3_vs_and_and do
+        iterations = 1_000
         first = Integer
         second = ->(x) { x > 2 }
         third = ->(x) { x < 10 }
@@ -132,11 +114,11 @@ namespace :perf do
 
         Benchmark.ips do |x|
           x.report("Guard.and3") do |n|
-            and3 === n
+            iterations.times { and3 === n }
           end
 
           x.report("Guard#and") do |n|
-            and_and_and === n
+            iterations.times { and_and_and === n }
           end
 
           x.compare!
@@ -165,16 +147,17 @@ namespace :perf do
         x.compare!
       end
     end
-  end
-
-  namespace :pattern_matching do
-    require "qo"
-    require "dry/matcher"
 
     task :option_match_vs_native_pattern_match do
       some = Fear.some(42)
 
       Benchmark.ips do |x|
+        matcher = Fear::Option.matcher do |m|
+          m.some(41, &:itself)
+          m.some(42, &:itself)
+          m.some(45, &:itself)
+        end
+
         x.report("case ... in ...") do
           case some
           in Fear::Some(41 => x)
@@ -186,7 +169,7 @@ namespace :perf do
           end
         end
 
-        x.report("Option.match") do
+        x.report("Option#match") do
           some.match do |m|
             m.some(41, &:itself)
             m.some(42, &:itself)
@@ -194,27 +177,19 @@ namespace :perf do
           end
         end
 
+        x.report("Option#matcher") do
+          matcher.(some)
+        end
+
         x.compare!
       end
     end
+  end
 
-    task :dry_vs_qo_vs_fear_try do
-      module ExhaustivePatternMatch
-        def initialize(*)
-          super
-          @default ||= self.else { raise Fear::MatchError }
-        end
-      end
-
-      SuccessBranch = Qo.create_branch(name: "success", precondition: Fear::Success, extractor: :get)
-      FailureBranch = Qo.create_branch(name: "failure", precondition: Fear::Failure, extractor: :exception)
-
-      PatternMatch = Qo.create_pattern_match(
-        branches: [SuccessBranch, FailureBranch],
-      ).prepend(ExhaustivePatternMatch)
-
-      Fear::Success.include(PatternMatch.mixin(as: :qo_match))
+  namespace :pattern_matching do
+    require "dry/matcher"
 
+    task :dry_vs_fear_try do
       success_case = Dry::Matcher::Case.new(
         match: ->(try, *pattern) {
           try.is_a?(Fear::Success) && pattern.all? { |p| p === try.get }
@@ -235,14 +210,6 @@ namespace :perf do
       success = Fear::Success.new(4)
 
       Benchmark.ips do |x|
-        x.report("Qo") do
-          success.qo_match do |m|
-            m.failure(&:itself)
-            m.success(Integer, ->(y) { y % 5 == 0 }, &:itself)
-            m.success { "else" }
-          end
-        end
-
         x.report("Fear") do
           success.match do |m|
             m.failure(&:itself)
@@ -263,50 +230,6 @@ namespace :perf do
       end
     end
 
-    task :qo_vs_fear_try_execution do
-      module ExhaustivePatternMatch
-        def initialize(*)
-          super
-          @default ||= self.else { raise Fear::MatchError }
-        end
-      end
-
-      SuccessBranch = Qo.create_branch(name: "success", precondition: Fear::Success, extractor: :get)
-      FailureBranch = Qo.create_branch(name: "failure", precondition: Fear::Failure, extractor: :exception)
-
-      QoPatternMatch = Qo.create_pattern_match(
-        branches: [SuccessBranch, FailureBranch],
-      ).prepend(ExhaustivePatternMatch)
-
-      Fear::Success.include(QoPatternMatch.mixin(as: :qo_match))
-
-      success = Fear::Success.new(4)
-
-      qo_matcher = QoPatternMatch.new do |m|
-        m.success(1, &:itself)
-        m.success(4, &:itself)
-        m.failure { "failure" }
-      end
-
-      fear_matcher = Fear::TryPatternMatch.new do |m|
-        m.success(1, &:itself)
-        m.success(4, &:itself)
-        m.failure { "failure" }
-      end
-
-      Benchmark.ips do |x|
-        x.report("Qo") do
-          qo_matcher.(success)
-        end
-
-        x.report("Fear") do
-          fear_matcher.(success)
-        end
-
-        x.compare!
-      end
-    end
-
     task :factorial do
       factorial_proc = proc do |n|
         if n <= 1
@@ -322,12 +245,6 @@ namespace :perf do
         m.else { |n| n * factorial_pm.(n - 1) }
       end
 
-      factorial_qo = Qo.match do |m|
-        m.when(1, &:itself)
-        m.when(0, &:itself)
-        m.else { |n| n * factorial_qo.(n - 1) }
-      end
-
       Benchmark.ips do |x|
         x.report("Proc") do
           factorial_proc.(100)
@@ -337,10 +254,6 @@ namespace :perf do
           factorial_pm.(100)
         end
 
-        x.report("Qo") do
-          factorial_qo.(100)
-        end
-
         x.compare!
       end
     end

data/benchmarks/dry_do_vs_fear_for.txt

@@ -1,11 +1,12 @@
 > bundle exec rake perf:dry:do_vs_fear_for
+ruby 3.3.0 (2023-12-25 revision 5124f9ac75) [arm64-darwin23]
 Warming up --------------------------------------
-                 Dry    31.375k i/100ms
-                Fear    24.131k i/100ms
+                 Dry    50.838k i/100ms
+                Fear    53.687T i/100ms
 Calculating -------------------------------------
-                 Dry    360.990k (± 2.7%) i/s -      1.820M in   5.045364s
-                Fear      7.212B (±27.2%) i/s -     27.210B in   4.656760s
+                 Dry    505.586k (± 1.3%) i/s -      2.542M in   5.028546s
+                Fear 38414118363278401536.000 (±35.1%) i/s - 129350402624716800000.000 in   4.237227s
 
 Comparison:
-                Fear: 7212177713.5 i/s
-                 Dry:   360989.8 i/s - 19978.90x  slower
+                Fear: 38414118363278401536.0 i/s
+                 Dry:   505586.3 i/s - 75979343079241.66x  slower

data/benchmarks/dry_some_fmap_vs_fear_some_map.txt

@@ -1,11 +1,12 @@
 > bundle exec rake perf:dry:some_fmap_vs_fear_some_map
+ruby 3.3.0 (2023-12-25 revision 5124f9ac75) [arm64-darwin23]
 Warming up --------------------------------------
-                 Dry    68.154k i/100ms
-                Fear   151.093k i/100ms
+                 Dry   156.108k i/100ms
+                Fear   398.884k i/100ms
 Calculating -------------------------------------
-                 Dry    884.315k (± 4.1%) i/s -      4.430M in   5.018931s
-                Fear      2.481M (± 4.1%) i/s -     12.390M in   5.003728s
+                 Dry      1.561M (± 0.2%) i/s -      7.962M in   5.099636s
+                Fear      3.976M (± 0.5%) i/s -     19.944M in   5.016186s
 
 Comparison:
-                Fear:  2480589.0 i/s
-                 Dry:   884315.1 i/s - 2.81x  slower
+                Fear:  3976079.7 i/s
+                 Dry:  1561199.0 i/s - 2.55x  slower

data/benchmarks/factorial.txt

@@ -1,16 +1,14 @@
 # Depends on `n`, for 100!:
 
 > bundle exec rake perf:pattern_matching:factorial
+ruby 3.3.0 (2023-12-25 revision 5124f9ac75) [arm64-darwin23]
 Warming up --------------------------------------
-                Proc     2.395k i/100ms
-                Fear   312.000  i/100ms
-                  Qo   122.000  i/100ms
+                Proc     5.678k i/100ms
+                Fear   859.000 i/100ms
 Calculating -------------------------------------
-                Proc     26.620k (± 2.9%) i/s -    134.120k in   5.042738s
-                Fear      3.219k (± 4.1%) i/s -     16.224k in   5.049215s
-                  Qo      1.250k (± 4.8%) i/s -      6.344k in   5.090745s
+                Proc     56.634k (± 0.2%) i/s -    283.900k in   5.012921s
+                Fear      8.573k (± 0.5%) i/s -     42.950k in   5.009859s
 
 Comparison:
-                Proc:    26620.3 i/s
-                Fear:     3219.4 i/s - 8.27x  slower
-                  Qo:     1249.6 i/s - 21.30x  slower
+                Proc:    56633.8 i/s
+                Fear:     8573.3 i/s - 6.61x  slower