zx-monads 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92ddc57d4126dfd37ebaeeb3695eeb9bd32dfedd4a1a973b1eefe6cc9f082f88
-  data.tar.gz: 1baafdd45d22c064368e9a8bd789fed4b23cc4cffb493d903441442e26e47502
+  metadata.gz: '0391e47fa921d99cc0295cd52c3dd364a6f2bbe69af850b8cce890f7d74510ab'
+  data.tar.gz: b662943acb8c80009cc12d2322495169aca0bcda8bd52d7d1aa8ae5808f93998
 SHA512:
-  metadata.gz: 9969b07e28b5a4ca988e416bddcde3360e51c6f572b0712c247aedb7f78717e23e9821c2c83a4fafa4bea660e7c20ada2a43c75d07ec6159c09984f27941d471
-  data.tar.gz: 3fffca4170917b53e657cb010727cbdc3fd94f4f752893f01f61022714b5e9fda604b9dac1de3ec11dd642d451ccc6a41427e410894e8105dab63cc05e4c6cb9
+  metadata.gz: 4eac7c508d2eeb24fb0cdcda5ef86fe55536773533acb22ff3e4865e0190379ddc723a00f6ed6ee2bae3183040e258cce8740e1f90931fd2064cf9a30ddb36d4
+  data.tar.gz: 47b496f06b771727f6b5d542dda7c303bb178b64253ef6dbbe9d978937671c28a78e433ca312ac488c67cbdf2385781bb5db5fb8016b48ce990d1a81bb9c64b7

data/lib/zx/maybe.rb

@@ -1,34 +1,199 @@
 # frozen_string_literal: true
 
 module Zx
-  module Maybe
-    module Maybeable
-      None = ->(*kwargs) { ::Maybe::None.new(*kwargs) }
-      Some = ->(*kwargs) { ::Maybe::Some.new(*kwargs) }
-      Maybe = ->(*kwargs) { ::Maybe.of(*kwargs) }
+  class Maybe
+    attr_reader :value
+
+    IsBlank = ->(value) { value.nil? || value.to_s.strip&.empty? || !value }
+
+    def self.of(...)
+      new.of(...)
+    end
+
+    def self.[](...)
+      of(...)
+    end
+
+    def of(value)
+      return None.new if IsBlank[value]
+
+      Some.new(value)
+    rescue StandardError
+      None.new
+    end
+
+    def type
+      to_s.downcase.to_sym
+    end
+
+    def some?
+      type == :some
+    end
+
+    def none?
+      type == :none
+    end
+
+    def unwrap
+      @value
+    end
+
+    def or(value)
+      IsBlank[@value] ? value : @value
+    end
+
+    def >>(other)
+      self > other
+    end
+    alias | >>
+
+    def fmap(_)
+      self
+    end
+
+    def >(_other)
+      self
+    end
+
+    def map(arg = nil, &block)
+      return Maybe[block.call(@value)] if block_given?
+      return Maybe[arg.arity > 1 ? arg.curry.call(@value) : arg.call(@value)] if arg.respond_to?(:call)
+
+      case arg
+      in None then self
+      in Symbol | String then dig(arg)
+      end
+    rescue StandardError => e
+      None.new(e.message)
+    end
+    alias apply map
+
+    def map!(&block)
+      @value = block.call(@value)
+
+      Maybe[@value]
+    end
+
+    def apply!(...)
+      apply(...).unwrap
+    end
+
+    def dig(...)
+      Maybe[@value&.dig(...)]
+    end
+
+    def dig!(...)
+      dig(...).unwrap
+    end
+
+    def match(some:, none:)
+      case self
+      in Some then some.call(@value)
+      else none.call
+      end
+    end
+
+    def on_success(&block)
+      return self if none?
+
+      block.call(Some[@value])
+
+      self
+    end
+
+    def on_failure(&block)
+      return self if some?
+
+      block.call(None[@value])
+
+      self
+    end
+
+    def on(ontype, &block)
+      case ontype.to_sym
+      when :success then on_success(&block)
+      when :failure then on_failure(&block)
+      end
+    end
+
+    class Some < Maybe
+      def self.[](...)
+        new(...)
+      end
+
+      def initialize(value = nil)
+        @value = value
+      end
+
+      def deconstruct
+        [@value]
+      end
+
+      def inspect
+        format("#<Zx::Maybe::#{self}:0x%x value=%s>", object_id, @value.inspect)
+      end
+
+      def to_s
+        'Some'
+      end
+
+      def >(other)
+        other.respond_to?(:call) ? other.call(@value) : other
+      end
+
+      def fmap(&block)
+        Maybe[block.call(@value)]
+      end
+    end
+
+    class None < Maybe
+      def self.[](...)
+        new(...)
+      end
+
+      def initialize(value = nil)
+        @value = value
+      end
+
+      def deconstruct
+        [nil]
+      end
+
+      def inspect
+        format("#<Zx::Maybe::#{self}:0x%x value=%s>", object_id, @value.inspect)
+      end
+
+      def to_s
+        'None'
+      end
+
+      def map
+        self
+      end
+    end
+
+    module ClassMethods
+      None = ->(*kwargs) { Zx::Maybe::None.new(*kwargs) }
+      Some = ->(*kwargs) { Zx::Maybe::Some.new(*kwargs) }
+      Maybe = ->(*kwargs) { Zx::Maybe.of(*kwargs) }
 
       def Maybe(*kwargs)
-        ::Maybe.of(*kwargs)
+        Zx::Maybe.of(*kwargs)
       end
 
       def Some(*kwargs)
-        ::Maybe::Some.new(*kwargs)
+        Zx::Maybe::Some.new(*kwargs)
       end
 
       def None(*kwargs)
-        ::Maybe::None.new(*kwargs)
+        Zx::Maybe::None.new(*kwargs)
       end
 
       def Try(default = nil, options = {})
-        Some yield
+        Some[yield]
       rescue StandardError => e
         None[default || options.fetch(:or, nil)]
       end
     end
-
-    def self.included(klass)
-      klass.include(Maybeable)
-      klass.extend(Maybeable)
-    end
   end
 end

data/lib/zx/maybeable.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Zx::Maybeable
+  include Zx::Maybe::ClassMethods
+  extend Zx::Maybe::ClassMethods
+end

data/lib/zx/steps.rb

@@ -2,7 +2,7 @@
 
 module Zx
   class Steps
-    include Maybe
+    include Zx::Maybeable
 
     class << self
       def step(step)
@@ -19,4 +19,4 @@ module Zx
       list.reduce(Some()) { |result, step| result >> send(step) }
     end
   end
-end
+end

data/lib/zx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zx
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/zx.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 module Zx
-  def self.included(klass)
-    klass.include(Maybe::Maybeable)
-    klass.extend(Maybe::Maybeable)
-  end
 end
 
 require 'zeitwerk'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zx-monads
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Thadeu Esteves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-28 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,9 +85,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/maybe.rb
 - lib/zx.rb
 - lib/zx/maybe.rb
+- lib/zx/maybeable.rb
 - lib/zx/steps.rb
 - lib/zx/version.rb
 - zx-monads.gemspec

data/lib/maybe.rb

@@ -1,173 +0,0 @@
-# frozen_string_literal: true
-
-class Maybe
-  attr_reader :value
-
-  IsBlank = ->(value) { value.nil? || value.to_s.strip&.empty? || !value }
-
-  def self.of(...)
-    new.of(...)
-  end
-
-  def self.[](...)
-    of(...)
-  end
-
-  def of(value)
-    return None.new if IsBlank[value]
-
-    Some.new(value)
-  rescue StandardError
-    None.new
-  end
-
-  def type
-    to_s.downcase.to_sym
-  end
-
-  def some?
-    type == :some
-  end
-
-  def none?
-    type == :none
-  end
-
-  def unwrap
-    @value
-  end
-
-  def or(value)
-    IsBlank[@value] ? value : @value
-  end
-
-  def >>(other)
-    self > other
-  end
-  alias | >>
-
-  def fmap(_)
-    self
-  end
-
-  def >(_other)
-    self
-  end
-
-  def map(arg = nil, &block)
-    return Maybe[block.call(@value)] if block_given?
-    return Maybe[arg.arity > 1 ? arg.curry.call(@value) : arg.call(@value)] if arg.respond_to?(:call)
-
-    case arg
-    in None then self
-    in Symbol | String then dig(arg)
-    end
-  rescue StandardError => e
-    None.new(e.message)
-  end
-  alias apply map
-
-  def map!(&block)
-    @value = block.call(@value)
-
-    Maybe[@value]
-  end
-
-  def apply!(...)
-    apply(...).unwrap
-  end
-
-  def dig(...)
-    Maybe[@value&.dig(...)]
-  end
-
-  def dig!(...)
-    dig(...).unwrap
-  end
-
-  def match(some:, none:)
-    case self
-    in Some then some.call(@value)
-    else none.call
-    end
-  end
-
-  def on_success(&block)
-    return self if none?
-
-    block.call(Some[@value])
-
-    self
-  end
-
-  def on_failure(&block)
-    return self if some?
-
-    block.call(None[@value])
-
-    self
-  end
-
-  def on(ontype, &block)
-    case ontype.to_sym
-    when :success then on_success(&block)
-    when :failure then on_failure(&block)
-    end
-  end
-
-  class Some < Maybe
-    def self.[](...)
-      new(...)
-    end
-
-    def initialize(value = nil)
-      @value = value
-    end
-
-    def deconstruct
-      [@value]
-    end
-
-    def inspect
-      format("#<Zx::Maybe::#{self}:0x%x value=%s>", object_id, @value.inspect)
-    end
-
-    def to_s
-      'Some'
-    end
-
-    def >(other)
-      other.respond_to?(:call) ? other.call(@value) : other
-    end
-
-    def fmap(&block)
-      Maybe[block.call(@value)]
-    end
-  end
-
-  class None < Maybe
-    def self.[](...)
-      new(...)
-    end
-
-    def initialize(value = nil)
-      @value = value
-    end
-
-    def deconstruct
-      [nil]
-    end
-
-    def inspect
-      format("#<Zx::Maybe::#{self}:0x%x value=%s>", object_id, @value.inspect)
-    end
-
-    def to_s
-      'None'
-    end
-
-    def map
-      self
-    end
-  end
-end