trither 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9279f7b994e89ec63bc8e681fb28effea01466dc
-  data.tar.gz: e100b0379b2dc1b9b4cbc29d0f651cd2d41e3df8
+  metadata.gz: 41180ec809ba98b117705827cace6e55a5a3ae39
+  data.tar.gz: 183b0d8e6939c387a882e34b8b6c16cd48ded687
 SHA512:
-  metadata.gz: a9aaa1d0f041bbc8a15d8201738750f468cf7adfc13feca82a2d4c54019228fe09efacbf7b8de5b9e4789616c1193dbe49c356bfe3c33e86fe07f4e02d29f367
-  data.tar.gz: c6675405ddeef783c8b93b73504d3c434695107f320b8d726eef5202468c42fef8242b387657e2fe2e2cda10d7ac6284a71c8c1412054f8eb4cf6c2b0f8d98e0
+  metadata.gz: 85b7714989e60cdc50eea1ad3db219f607f2cd4f71aa5771a632996a7a4b344ced5e864c021798fd86b2af6b7ba648e31ea41a3ec95e7d3f19d745dd9e642a81
+  data.tar.gz: 74854dc880e1087e77fa419ced4b4810b856b21f581547b7f81031dd713fc28d711e6ce7596603d05fc88bdf460617ff792954baeb152a5880d242774a3913ea

data/lib/trither.rb

@@ -1,16 +1,30 @@
 require 'trither/version'
+require 'contracts'
 
 module Trither
   class Box
+    include Contracts::Core
+    C = Contracts
+
+    Contract C::Any => C::Any
     def initialize(value)
       @value = value
     end
 
+    Contract C::Any => C::Bool
     def ==(other)
       (self.class == other.class) &&
         (@value == other.instance_variable_get('@value'))
     end
   end
+
+  module BasicTypes
+    include Contracts::Core
+    C = Contracts
+    Predicate = C::Func[C::Any => C::Bool]
+    Func0 = C::Func[C::None => C::Any]
+    Func1 = C::Func[C::Any => C::Any]
+  end
 end
 
 require 'trither/try'

data/lib/trither/either.rb

@@ -1,45 +1,92 @@
+require 'contracts'
+
 module Either
+  include ::Trither::BasicTypes
+
   class Left < Trither::Box
+  end
+
+  class Right < Trither::Box
+  end
+
+  EitherType = C::Or[Left, Right]
+  Func1toEither = C::Func[C::Any => EitherType]
+
+  class Left < Trither::Box
+    include ::Trither::BasicTypes
+
+    Contract C::None => true
     def left?
       true
     end
 
+    Contract C::None => false
     def right?
       false
     end
 
+    Contract C::None => C::Any
     def left
       @value
     end
 
+    Contract Func1 => Left
     def left_map
       Left.new(yield @value)
     end
 
+    Contract Func1 => Left
     def right_map
       self
     end
+
+    Contract Func1toEither => EitherType
+    def left_flat_map
+      yield @value
+    end
+
+    Contract Func1toEither => Left
+    def right_flat_map
+      self
+    end
   end
 
   class Right < Trither::Box
+    include ::Trither::BasicTypes
+
+    Contract C::None => false
     def left?
       false
     end
 
+    Contract C::None => true
     def right?
       true
     end
 
+    Contract C::None => C::Any
     def right
       @value
     end
 
+    Contract Func1 => Right
     def left_map
       self
     end
 
+    Contract Func1 => Right
     def right_map
       Right.new(yield @value)
     end
+
+    Contract Func1toEither => Right
+    def left_flat_map
+      self
+    end
+
+    Contract Func1toEither => EitherType
+    def right_flat_map
+      yield @value
+    end
   end
 end

data/lib/trither/option.rb

@@ -1,4 +1,20 @@
+require 'contracts'
+
 module Option
+  include Contracts::Core
+  C = Contracts
+
+  module None
+  end
+
+  class Some < Trither::Box
+  end
+
+  NoneType = ->(x) { x == None }
+  OptionType = C::Or[NoneType, Some]
+  Func1toOption = C::Func[C::Any => OptionType]
+
+  Contract C::Any => C::Or[->(x) { x == None }, Some]
   def self.make(value)
     if value.nil?
       None
@@ -7,53 +23,90 @@ module Option
     end
   end
 
+  Contract C::ArrayOf[OptionType] => OptionType
+  def self.all(array_of_options)
+    array_of_options.reduce(Some.new([])) do |memo, option|
+      memo.flat_map do |array|
+        option.map { |value| array + [value] }
+      end
+    end
+  end
+
+  Contract C::ArrayOf[OptionType] => C::ArrayOf[C::Any]
+  def self.flatten(array_of_options)
+    array_of_options.reduce([]) do |array, option|
+      if option.empty?
+        array
+      else
+        array + [option.get_or_else { raise StandardError }]
+      end
+    end
+  end
+
   module None
+    include Contracts::Core
+    include ::Trither::BasicTypes
+
+    Contract C::None => true
     def self.empty?
       true
     end
 
+    Contract Predicate => NoneType
     def self.filter
       self
     end
 
+    Contract C::Any => C::Any
     def self.fetch(default)
       default
     end
 
+    Contract Func1 => NoneType
     def self.map
       self
     end
 
+    Contract Func1toOption => OptionType
     def self.flat_map
       self
     end
 
+    Contract Func1toOption => OptionType
     def self.or_else
       yield
     end
 
+    Contract Func0 => C::Any
     def self.get_or_else
       yield
     end
   end
 
-  class Some < Trither::Box
+  class Some
+    include ::Trither::BasicTypes
+
+    Contract C::None => false
     def empty?
       false
     end
 
+    Contract Predicate => OptionType
     def filter
       yield(@value) ? self : None
     end
 
+    Contract C::Any => C::Any
     def fetch(_default)
       @value
     end
 
+    Contract Func1 => OptionType
     def map
       Option.make(yield @value)
     end
 
+    Contract Func1toOption => OptionType
     def flat_map
       result = yield @value
       if result.nil?
@@ -63,10 +116,12 @@ module Option
       end
     end
 
+    Contract Func1toOption => Some
     def or_else
       self
     end
 
+    Contract Func0 => C::Any
     def get_or_else
       @value
     end

data/lib/trither/try.rb

@@ -1,4 +1,20 @@
+require 'contracts'
+
 module Try
+  include Contracts::Core
+  include ::Trither::BasicTypes
+
+  class Failure < Trither::Box
+  end
+
+  class Success < Trither::Box
+  end
+
+  TryType = C::Or[Failure, Success]
+  Func0toTry = C::Func[C::None => TryType]
+  Func1toTry = C::Func[C::Any => TryType]
+
+  Contract Func1 => TryType
   def self.make
     Success.new(yield)
   rescue StandardError => error
@@ -6,60 +22,78 @@ module Try
   end
 
   class Failure < Trither::Box
+    include ::Trither::BasicTypes
+
+    Contract C::None => true
     def failure?
       true
     end
 
+    Contract Predicate => Failure
     def filter
       self
     end
 
+    Contract Func1toTry => Failure
     def flat_map
       self
     end
 
+    Contract Func1 => Failure
     def map
       self
     end
 
+    Contract Func1 => Failure
     def fail_map
       Failure.new yield(@value)
     end
 
+    Contract Func0toTry => TryType
     def or_else
       yield @value
     end
 
+    Contract Func0 => C::Any
     def get_or_else
       yield @value
     end
   end
 
   class Success < Trither::Box
+    include ::Trither::BasicTypes
+
+    Contract C::None => false
     def failure?
       false
     end
 
+    Contract Predicate => TryType
     def filter
       yield(@value) ? self : Failure.new(Option::None)
     end
 
+    Contract Func1toTry => TryType
     def flat_map
       yield @value
     end
 
+    Contract Func1 => TryType
     def map
       Success.new yield(@value)
     end
 
+    Contract Func1 => TryType
     def fail_map
       self
     end
 
+    Contract Func0toTry => TryType
     def or_else
       self
     end
 
+    Contract Func0 => C::Any
     def get_or_else
       @value
     end

data/lib/trither/version.rb

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

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: trither
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Lyall Jonathan Di Trapani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: contracts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple implementations of Try, Either, and Option