monadt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c19e86f991142006e0e23f98ec59c2a9780db485
-  data.tar.gz: 52cc959d8eeb05fa7d617d51278ec9b2aed00467
+  metadata.gz: d8691f7fc7008c12954eb7391133089ae6241b0e
+  data.tar.gz: 6410e6eb457068ab362a423bf11bd1f725d79337
 SHA512:
-  metadata.gz: a06ffff7277f97c3a16652bbb45ed0d0c13a9ad382772a58d372dbdf9b93e2ae45ce9eafdca7612ed29dffc9a5c1513a4be98d2cae09fb128450e2f5142f91d4
-  data.tar.gz: a61dab72be3127c89f11d33ad49af0094838073554719fd2f10de78a6408120302c9818c5843ec71b94c379f43d0348e962dbd5a80591cd545b3e6d6bea23b93
+  metadata.gz: 0b1a02941b1b59cdb845a44ae0c5e92473999a5722662d8328dc5098bf2219ae30cf445d16a6377e1657fe2346f5156761227a494d039d6b26fbbdba79d6e470
+  data.tar.gz: 8fe3f176625326ceb70f6855541bfb41555d62d5723b767266e88c6e523a3cf7082ab3662c910810b4497404c7c0a7b5cab5eae03f057fc37b716559a5d89af9

data/lib/monadt/adt.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 AdtPattern = Struct.new :klass, :lambda
 
 def data(*fields)
@@ -9,6 +11,32 @@ def data(*fields)
   Class.new(base)
 end
 
+def decorate_adt(klass)
+  klass.constants.each do |v|
+    name = v.to_s.downcase
+    const = klass.const_get v
+    klass.constants.each do |is_v|
+      is_name = is_v.to_s.downcase
+      ret = is_v == v
+      const.class_eval do
+        define_method "is_#{is_name}?" do ret end
+      end
+    end
+    const.class_eval do
+      define_method "to_s" do
+        if respond_to? :values
+          "#{v.to_s}(#{values.join(", ")})"
+        else
+          v.to_s
+        end
+      end
+    end
+    klass.class_eval do
+      define_singleton_method name do |*values| const.new(*values) end
+    end
+  end
+end
+
 Default = data
 
 module Adt

data/lib/monadt/either.rb

@@ -1,35 +1,26 @@
 require 'monadt/adt'
 
 module Monadt
-  module Either
+  class Either
     Left = data :left
     Right = data :right
-  end
-  class Either::Left
-    def is_left?() true end
-    def is_right?() false end
-    def to_s() "Left(#{left})" end
-  end
-  class Either::Right
-    def is_left?() false end
-    def is_right?() true end
-    def to_s() "Right(#{right})" end
-  end
 
-  class EitherM
     class << self
       include Adt
 
       def bind(m, &blk)
         match(m,
-          with(Either::Left) { |v| m },
-          with(Either::Right) { |v| blk.call(v) })
+          with(Left) { |v| m },
+          with(Right) { |v| blk.call(v) })
       end
 
       def return(a)
-        Either::Right.new a
+        right a
       end
     end
 
   end
+
+  decorate_adt Either
 end
+

data/lib/monadt/maybe.rb

@@ -1,38 +1,28 @@
 require 'monadt/adt'
 
 module Monadt
-  module Maybe
+  class Maybe
     Just = data :value
     Nothing = data
-  end
-
-  class Maybe::Just
-    def is_nothing?() false end
-    def to_s() "Just #{value}" end
-  end
-  class Maybe::Nothing
-    def is_nothing?() true end
-    def to_s() "Nothing" end
-  end
 
-  class MaybeM
     class << self
       include Adt
 
       def bind(m, &blk)
         match(m,
-          with(Maybe::Just) { |v| blk.call(v) },
-          with(Maybe::Nothing) { m })
+          with(Just) { |v| blk.call(v) },
+          with(Nothing) { m })
       end
 
       def return(a)
-        Maybe::Just.new a
+        Maybe.just a
       end
     end
   end
+  decorate_adt Maybe
 
   # like Maybe but nil / not-nill
-  class PresentM
+  class Present
     class << self
       def bind(m, &blk)
         if m.nil?

data/lib/monadt/reader.rb

@@ -1,5 +1,5 @@
 module Monadt
-  class ReaderM
+  class Reader
     class << self
       def bind(m, &blk)
         ->(e) {

data/lib/monadt/reader_state_either.rb

@@ -1,7 +1,7 @@
 require 'monadt/adt'
 
 module Monadt
-  class ReaderStateEitherM
+  class ReaderStateEither
     class << self
       include Adt
 
@@ -17,7 +17,7 @@ module Monadt
       end
 
       def return(val)
-        ->(e, s) { [EitherM.return(val), s] }
+        ->(e, s) { [Either.return(val), s] }
       end
     end
   end

data/lib/monadt/state.rb

@@ -1,5 +1,5 @@
 module Monadt
-  class StateM
+  class State
     class << self
       def bind(m, &blk)
         ->(st) {

data/lib/monadt.rb

@@ -8,19 +8,19 @@ module Monadt
   class Monad
     class << self
       def maybe(&blk)
-        do_m(MaybeM, &blk)
+        do_m(Maybe, &blk)
       end
 
       def present(&blk)
-        do_m(PresentM, &blk)
+        do_m(Present, &blk)
       end
 
       def either(&blk)
-        do_m(EitherM, &blk)
+        do_m(Either, &blk)
       end
 
       def state(&blk)
-        do_m(StateM, &blk)
+        do_m(State, &blk)
       end
 
       def run_state(initial_state, &blk)
@@ -29,7 +29,7 @@ module Monadt
       end
 
       def reader(&blk)
-        do_m(ReaderM, &blk)
+        do_m(Reader, &blk)
       end
 
       def run_reader(env, &blk)
@@ -37,7 +37,7 @@ module Monadt
       end
 
       def reader_state_choice(&blk)
-        do_m(ReaderStateEitherM, &blk)
+        do_m(ReaderStateEither, &blk)
       end
 
       def run_reader_state_choice(env, initial_state, &blk)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monadt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Will Pleasant-Ryan