t_algebra 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c013dcdeaf282791c7043884001899230c9d47bd4e33b27b25654982bd59e1
-  data.tar.gz: 3d063906d1a462276f0a8ab12bb09cfb5ded2b9e6b9630206b5b81966784d750
+  metadata.gz: 617977f1693f665231e2b42e517fc64a92de79bbe8824408501586b992308988
+  data.tar.gz: d953427b001daff3bbfab23e94ce46fcd61c8a386f891d14019312d0ae37ddca
 SHA512:
-  metadata.gz: b16ffc8e653ff03cc6128863943c41367be132d4218041a9e636ce74495e7657a6468146449c12661d1dc4f66be2e2ac6e3342e31bb6677a20b36a267d44cc4d
-  data.tar.gz: 7070554503dcec80113967176aa703481989aa716d8758f28bb07ae8b1e7e5a42acd94f84a399e7ad393d53c2526f61a0f1cb5f8ec2121864674d2f80fdd90a3
+  metadata.gz: 98fb648dfe43e767057bf50f1479ace8a777b01bf0803b46b9e29c8668aaea8f8464014a7282c74796d1d635b2c4afddec828fb5e85d07c0be44ff6fc85595f0
+  data.tar.gz: e9ac940c79d2906bf4f27c902474966e8175e1497b98579a0793400f374568c2022f7f804014ba3fd8bbc9f7ddfa84de46ff75dca0b42da9943a0a482d554f15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    t_algebra (0.1.0)
+    t_algebra (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -50,9 +50,10 @@ to reproduce the same functionality:
 # @return [TAlgebra::Monad::Maybe]
 def get_address(user)
     TAlgebra::Monad::Maybe.run do |y|
-        street = y.yield { to_maybe(user.street) }
-        city = y.yield { to_maybe(user.city) }
-        state = y.yield { to_maybe(user.state) }
+        m_user = just(user)
+        street = y.yield { m_user.fetch(:street) }
+        city = y.yield { m_user.fetch(:city) }
+        state = y.yield { m_user.fetch(:state) }
         "#{street}, #{city} #{state.upcase}"
     end
 end

data/lib/t_algebra/monad/either.rb

@@ -17,16 +17,18 @@ module TAlgebra
         end
       end
 
-      def fmap(&block)
-        return dup if left? || !block
+      def fmap
+        raise UseError.new("#fmap requires a block") unless block_given?
+        return dup if left?
 
         self.class.pure(yield(value))
       end
 
-      def bind(&block)
-        return dup if left? || !block
+      def bind
+        raise UseError.new("#bind requires a block") unless block_given?
+        return dup if left?
 
-        self.class.instance_exec(value, &block)
+        yield value
       end
 
       def left?
@@ -37,7 +39,12 @@ module TAlgebra
         is == RIGHT
       end
 
+      def from_either!
+        from_either { |e| raise UnsafeError.new("#from_either! exception. #{e}") }
+      end
+
       def from_either
+        raise UseError.new("#from_either called without block") unless block_given?
         return yield(value) if left?
         value
       end

data/lib/t_algebra/monad/errors.rb

@@ -0,0 +1,9 @@
+module TAlgebra
+  module Monad
+    class UseError < StandardError
+    end
+
+    class UnsafeError < StandardError
+    end
+  end
+end

data/lib/t_algebra/monad/maybe.rb

@@ -19,6 +19,12 @@ module TAlgebra
         def to_maybe(value_or_nil)
           value_or_nil.nil? ? nothing : pure(value_or_nil)
         end
+
+        # def run_bind(ma, &block)
+        #   # raise "Yield blocks must return instances of #{self}. Got #{ma.class}" unless [Parser, Parser::Optional].include?(ma.class)
+        #
+        #   ma.bind(&block)
+        # end
       end
 
       def fmap(&block)
@@ -39,11 +45,24 @@ module TAlgebra
         is == JUST
       end
 
+      def from_maybe!
+        from_maybe { |e| raise UnsafeError.new("#from_maybe! exception. #{e}") }
+      end
+
       def from_maybe
+        raise UseError.new("#from_maybe called without block") unless block_given?
         return yield if nothing?
         value
       end
 
+      def fetch(key)
+        bind do |o|
+          self.class.to_maybe(
+            o.respond_to?(:[]) ? o[key] : o.send(key)
+          )
+        end
+      end
+
       def ==(other)
         to_obj == other.to_obj
       end

data/lib/t_algebra/monad/parser.rb

@@ -10,32 +10,44 @@ module TAlgebra
 
       class << self
         def failure(msg, name = nil)
-          left(msg).with_name(name)
+          new(is: Either::LEFT, value: msg, name: name)
         end
 
         def parse(val, name = nil)
-          right(val).with_name(name)
+          new(is: Either::RIGHT, value: val, name: name)
         end
 
         def fetch(o, key)
-          parser = parse(o.respond_to?(:[]) ? o[key] : o.send(key))
-          parser.with_name(key).optional
+          parse(o).fetch(key)
         end
 
         def fetch!(o, key)
-          parser = parse(o.respond_to?(:[]) ? o[key] : o.send(key))
-          parser.with_name(key).required
+          parse(o).fetch!(key)
+        end
+
+        def run_bind(ma, &block)
+          raise "Yield blocks must return instances of #{self}. Got #{ma.class}" unless [Parser, Parser::Optional].include?(ma.class)
+
+          ma.as_parser.bind(&block)
         end
       end
 
+      alias_method :valid?, :right?
+      alias_method :failure?, :left?
+
       attr_reader :name
       def with_name(name)
         @name = name
         self
       end
 
-      alias_method :valid?, :right?
-      alias_method :failure?, :left?
+      def fetch(key)
+        with_name(key).fmap { |o| o.respond_to?(:[]) ? o[key] : o.send(key) }.optional
+      end
+
+      def fetch!(key)
+        with_name(key).fmap { |o| o.respond_to?(:[]) ? o[key] : o.send(key) }.required
+      end
 
       def fmap
         super.with_name(name)
@@ -57,7 +69,7 @@ module TAlgebra
 
       def validate(msg = "Invalid")
         n = name
-        bind { |val| yield(val) ? parse(val, n) : failure(msg, n) }
+        bind { |val| yield(val) ? Parser.parse(val, n) : Parser.failure(msg, n) }
       end
 
       def extract_parsed(&block)
@@ -65,6 +77,10 @@ module TAlgebra
         from_either(&block)
       end
 
+      def extract_parsed!
+        extract_parsed { |e| raise UnsafeError.new("#extract_parsed! exception. #{e}") }
+      end
+
       def required
         validate("Is required") { |v| !v.nil? }
       end
@@ -91,6 +107,10 @@ module TAlgebra
         end
       end
 
+      def as_parser
+        instance_of?(Parser::Optional) ? Parser.new(is: is, value: value, name: name) : self
+      end
+
       private
 
       def dup

data/lib/t_algebra/monad.rb

@@ -17,10 +17,23 @@ module TAlgebra
       end
 
       def run(&block)
-        e = Enumerator.new { |y| instance_exec(LazyYielder.new(y), &block) }
+        block_self = block.binding.receiver
+
+        self_class = self
+        block_self.define_singleton_method(:method_missing) do |m, *args, &block|
+          self_class.send(m, *args, &block)
+        end
+
+        e = Enumerator.new { |y| block_self.instance_exec(LazyYielder.new(y), &block) }
+
         run_recursive(e, [])
       end
 
+      def run_bind(ma, &block)
+        raise "Yield blocks must return instances of #{self}" unless ma.instance_of?(self)
+        ma.bind(&block)
+      end
+
       def lift_a2(ma, mb, &block)
         ma.bind do |a|
           mb.bind do |b|
@@ -40,9 +53,10 @@ module TAlgebra
         end
 
         if is_complete(enum)
-          pure(value(enum))
+          val = value(enum)
+          val.is_a?(self.class) ? val : pure(val)
         else
-          enum.next.call.bind do |a|
+          run_bind(enum.next.call) do |a|
             run_recursive(enum, historical_values + [a])
           end
         end

data/lib/t_algebra/version.rb

@@ -1,3 +1,3 @@
 module TAlgebra
-  VERSION = "0.1.1"
+  VERSION = "0.1.5"
 end

data/lib/t_algebra.rb

@@ -2,6 +2,7 @@ require_relative "t_algebra/version"
 require_relative "t_algebra/functor"
 require_relative "t_algebra/applicative"
 require_relative "t_algebra/monad"
+require_relative "t_algebra/monad/errors"
 require_relative "t_algebra/monad/maybe"
 require_relative "t_algebra/monad/either"
 require_relative "t_algebra/monad/list"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: t_algebra
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - aaron
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -33,6 +33,7 @@ files:
 - lib/t_algebra/functor.rb
 - lib/t_algebra/monad.rb
 - lib/t_algebra/monad/either.rb
+- lib/t_algebra/monad/errors.rb
 - lib/t_algebra/monad/list.rb
 - lib/t_algebra/monad/maybe.rb
 - lib/t_algebra/monad/parser.rb