trither 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2ec9d8bb76073063a74ecad037545bf191d6432
-  data.tar.gz: c81beeaea402eeb77acecc33b7484fe2fdc2eb5d
+  metadata.gz: 9279f7b994e89ec63bc8e681fb28effea01466dc
+  data.tar.gz: e100b0379b2dc1b9b4cbc29d0f651cd2d41e3df8
 SHA512:
-  metadata.gz: afeb84a64f378477e98ab3deeff6d88124a4da170a50c050c0adff317cb161f0780640518c5d87b85248cbef3adc3e1582061c759bcd93f1bfc84fa0374c755b
-  data.tar.gz: 45f9d9d7b3311e63ebca3b7911260232181a67799cd83f8807e15d8c3b3fa028fbb422da3a69cd0997e7c9ce9c0a5434699d2899b0a5e0e4a735980a3ee2bea3
+  metadata.gz: a9aaa1d0f041bbc8a15d8201738750f468cf7adfc13feca82a2d4c54019228fe09efacbf7b8de5b9e4789616c1193dbe49c356bfe3c33e86fe07f4e02d29f367
+  data.tar.gz: c6675405ddeef783c8b93b73504d3c434695107f320b8d726eef5202468c42fef8242b387657e2fe2e2cda10d7ac6284a71c8c1412054f8eb4cf6c2b0f8d98e0

data/lib/trither.rb

@@ -1,4 +1,18 @@
 require 'trither/version'
+
+module Trither
+  class Box
+    def initialize(value)
+      @value = value
+    end
+
+    def ==(other)
+      (self.class == other.class) &&
+        (@value == other.instance_variable_get('@value'))
+    end
+  end
+end
+
 require 'trither/try'
 require 'trither/either'
 require 'trither/option'

data/lib/trither/either.rb

@@ -1,11 +1,5 @@
 module Either
-  class Base
-    def initialize(value)
-      @value = value
-    end
-  end
-
-  class Left < Base
+  class Left < Trither::Box
     def left?
       true
     end
@@ -27,7 +21,7 @@ module Either
     end
   end
 
-  class Right < Base
+  class Right < Trither::Box
     def left?
       false
     end

data/lib/trither/option.rb

@@ -12,6 +12,10 @@ module Option
       true
     end
 
+    def self.filter
+      self
+    end
+
     def self.fetch(default)
       default
     end
@@ -24,20 +28,24 @@ module Option
       self
     end
 
-    def self.get_or_else
+    def self.or_else
       yield
     end
-  end
 
-  class Some
-    def initialize(value)
-      @value = value
+    def self.get_or_else
+      yield
     end
+  end
 
+  class Some < Trither::Box
     def empty?
       false
     end
 
+    def filter
+      yield(@value) ? self : None
+    end
+
     def fetch(_default)
       @value
     end
@@ -55,6 +63,10 @@ module Option
       end
     end
 
+    def or_else
+      self
+    end
+
     def get_or_else
       @value
     end

data/lib/trither/try.rb

@@ -5,17 +5,15 @@ module Try
     Failure.new(error)
   end
 
-  class Base
-    def initialize(value)
-      @value = value
-    end
-  end
-
-  class Failure < Base
+  class Failure < Trither::Box
     def failure?
       true
     end
 
+    def filter
+      self
+    end
+
     def flat_map
       self
     end
@@ -25,7 +23,11 @@ module Try
     end
 
     def fail_map
-      Failure.new(yield @value)
+      Failure.new yield(@value)
+    end
+
+    def or_else
+      yield @value
     end
 
     def get_or_else
@@ -33,23 +35,31 @@ module Try
     end
   end
 
-  class Success < Base
+  class Success < Trither::Box
     def failure?
       false
     end
 
+    def filter
+      yield(@value) ? self : Failure.new(Option::None)
+    end
+
     def flat_map
       yield @value
     end
 
     def map
-      Success.new(yield @value)
+      Success.new yield(@value)
     end
 
     def fail_map
       self
     end
 
+    def or_else
+      self
+    end
+
     def get_or_else
       @value
     end

data/lib/trither/version.rb

@@ -1,3 +1,3 @@
 module Trither
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trither
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Lyall Jonathan Di Trapani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler