l43_core 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b964ad4c7819f22e58ec71b9768521105318d9bdcc42d9d860e399bd9864c491
-  data.tar.gz: e6399e1a021ca7b549a0c41589e8e200891269e3099fe36a6a6cfd755c4e8ac7
+  metadata.gz: 8f1dc19b0e66369e681dc2a7342ea49176148c78aab19832adbc814251f7b93a
+  data.tar.gz: d342f6c72085a6f5552930ec780fdd2111c7525fa18094f0e12e722ecc612825
 SHA512:
-  metadata.gz: 31d4957c4b081d12d22e3b8236f91bfeed7b93dc99941374d22ae421dd58aacdf2807ec7e7f70a1285be685714bcb53fab409f6dada9ca4125d5fd2a399de849
-  data.tar.gz: ea5c0da5bac00c239e95c74f213cac1f88e321e78227bce9e7ef6bed7d079b25ca764d5d09d723cea00bcb51039a4f2264dd0768cdf82ba6a3eb66f7be40a403
+  metadata.gz: 45fa2391331c65b8337b47be2b7c28e8165a4acf16357fb272bb5d99a6cec7375c79ed8bc6502574ed262e0f40993b35a9932fbd3846e5d9e01b7cc81ed22f8d
+  data.tar.gz: a316c3d5fbff4b2fd0bfd8e856b3d4dfbc43c23ad48ab95a8d29070f3c9e4a52667e0ffcd03744ce88f305021c702261fced7e901f72e58d131c2608bba52b81

data/lib/l43/core/as_result.rb

@@ -4,25 +4,15 @@ require_relative 'result'
 module L43
   module Core
     module AsResult
+      include Result::Helpers
+
       def self.extended(from)
         from.include self
       end
 
-      def as_result(&blk)
-        Result.ok(blk.())
-      rescue StandardError => se
-        Result.error(se.message)
-      end
-
-      def as_result_fn(&blk)
-        -> (*a, **k, &b) do
-          as_result { blk.(*a, **k, &b) }
-        end
-      end
-
       def defresult(name, &blk)
         define_method name do |*a, **k, &b|
-          as_result { blk.(*a, **k, &b) }
+          as_result("method #{name}") { blk.(*a, **k, &b) }
         end
       end
     end

data/lib/l43/core/result/helpers.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module L43
+  module Core
+    class Result
+      module Helpers
+
+        def as_result(message=nil, &blk)
+          Result.ok(blk.())
+        rescue StandardError => se
+          location = blk.source_location.join(':')
+          error = se.inspect
+          error = message + " (" + error + ")" if message
+          Result.error([error, "at", location].join(' '))
+        end
+
+        def as_result_fn(message=nil, &blk)
+          -> (*a, **k, &b) do
+            as_result(message) { blk.(*a, **k, &b) }
+          end
+        end
+
+      end
+    end
+  end
+end
+# SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/l43/core/result.rb

@@ -2,11 +2,13 @@
 
 require 'l43/errors'
 require_relative 'result/constructors'
+require_relative 'result/helpers'
 
 module L43
   module Core
     class Result
       extend Constructors
+      include Helpers
 
       def ==(other)
         return false unless self.class === other
@@ -22,28 +24,47 @@ module L43
         end
       end
 
-      def to_h(*)
-        if @ok
-          {ok: @value}
-        else
-          {error: @message}
+      def error? = !@ok
+
+      def map(&blk)
+        return self unless @ok
+        blk.(self)
+      end
+
+      def map_result(&blk)
+        return self unless @ok
+        as_result('map_result') do
+          blk.(self)
         end
       end
-      alias_method :deconstruct_keys, :to_h
 
-      def error? = !@ok
+      def map_result!(&blk)
+        return self unless @ok
+        self.class.ok(blk.(self))
+      end
 
       def message!
         return @message unless @ok
         raise IllegalState, "No error message in an ok result"
       end
+      alias_method :message, :message!
 
       def ok? = @ok
 
+      def to_h(*)
+        if @ok
+          {ok: @value}
+        else
+          {error: @message}
+        end
+      end
+      alias_method :deconstruct_keys, :to_h
+
       def value!
         return @value if @ok
         raise IllegalState, "No value in an error result"
       end
+      alias_method :value, :value!
     end
   end
 end

data/lib/l43/core/version.rb

@@ -2,7 +2,7 @@
 
 module L43
   module Core
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: l43_core
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Robert Dober
@@ -38,6 +38,7 @@ files:
 - lib/l43/core/none.rb
 - lib/l43/core/result.rb
 - lib/l43/core/result/constructors.rb
+- lib/l43/core/result/helpers.rb
 - lib/l43/core/version.rb
 - lib/l43/errors.rb
 - lib/l43/open_struct.rb