resonad 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25157450da225c6390b1913ecee5c69b13025b32
-  data.tar.gz: aa7cfe69d2b80c222da33ad2b6fab421f8bc79a0
+  metadata.gz: 350f8a5aeb12b9502c1a6c6e9bdc1b9741dde935
+  data.tar.gz: eb0c4b2ea23b9f589b46c4261ff85aae5ac2effd
 SHA512:
-  metadata.gz: b2fe2862418ef2527b10cd97015807115d0a19168332ad3d9793b84f1591c5695f84d3331d8163d0265110023977d093d105c7495aeffed18a2cd0ebf881f3a3
-  data.tar.gz: 1e8da46e15b5e841c46bea2a3a06590a74c85ea69493d65bc9f5b3178d9e0707a7fcaf97d7daab89a365c036979dbfcc5e0be45b188c1085410511f0478b7fd2
+  metadata.gz: 66aaebdf2b1ba74598c85e54d605f755d18672cf241f464a59fd640d2835feee7cd1f91ae7266d581391be0220b12a72ce6d19c5940af98823fab05b59fb3112
+  data.tar.gz: bfaf318864e49273aec6ca07f2200b42203cc78841f809511dc8afce51347ef19c23a6fda5cff13e43598c030be7c53ec5c437cf91a48398264f386bad620d61

data/lib/resonad.rb

@@ -1,28 +1,19 @@
-module Resonad
+class Resonad
   class NonExistentError < StandardError; end
   class NonExistentValue < StandardError; end
 
-  def self.Success(*args)
-    Success.new(*args)
-  end
-
-  def self.Failure(*args)
-    Failure.new(*args)
-  end
+  module Mixin
+    def Success(*args)
+      ::Resonad::Success.new(*args)
+    end
 
-  def self.rescuing_from(*exception_classes)
-    Success(yield)
-  rescue Exception => e
-    if exception_classes.empty?
-      Failure(e) # rescue from all exceptions
-    elsif exception_classes.any? { |klass| e.is_a?(klass) }
-      Failure(e) # rescue from specified exception type
-    else
-      raise # reraise unhandled exception
+    def Failure(*args)
+      ::Resonad::Failure.new(*args)
     end
   end
+  extend Mixin
 
-  class Success
+  class Success < Resonad
     attr_accessor :value
 
     def initialize(value)
@@ -34,10 +25,6 @@ module Resonad
       true
     end
 
-    def failure?
-      false
-    end
-
     def on_success
       yield value
       self
@@ -67,15 +54,13 @@ module Resonad
     def flat_map
       yield value
     end
-    alias_method :and_then, :flat_map
 
     def flat_map_error
       self
     end
-    alias_method :or_else, :flat_map_error
   end
 
-  class Failure
+  class Failure < Resonad
     attr_accessor :error
 
     def initialize(error)
@@ -87,10 +72,6 @@ module Resonad
       false
     end
 
-    def failure?
-      true
-    end
-
     def on_success
       self
     end
@@ -120,12 +101,44 @@ module Resonad
     def flat_map
       self
     end
-    alias_method :and_then, :flat_map
 
     def flat_map_error
       yield error
     end
-    alias_method :or_else, :flat_map_error
   end
 
+  def self.rescuing_from(*exception_classes)
+    Success(yield)
+  rescue Exception => e
+    if exception_classes.empty?
+      Failure(e) # rescue from all exceptions
+    elsif exception_classes.any? { |klass| e.is_a?(klass) }
+      Failure(e) # rescue from specified exception type
+    else
+      raise # reraise unhandled exception
+    end
+  end
+
+  def initialize(*args)
+    raise NotImplementedError, "This is an abstract class. Use Resonad::Success or Resonad::Failure instead."
+  end
+
+  def success?
+    raise NotImplementedError, "should be implemented in subclass"
+  end
+
+  def failure?
+    not success?
+  end
+
+  def flat_map
+    raise NotImplementedError, "should be implemented in subclass"
+  end
+  alias_method :and_then, :flat_map
+
+  def flat_map_error
+    raise NotImplementedError, "should be implemented in subclass"
+  end
+  alias_method :or_else, :flat_map_error
+
 end

data/lib/resonad/version.rb

@@ -1,3 +1,3 @@
-module Resonad
-  VERSION = '1.0.2'
+class Resonad
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resonad
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Tom Dalling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler