mobj 3.2.2 → 3.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDY5YjIzNWY0NTZlMGY4NTA0ZmYxOWVjOGQ1ZWFmZjFiMGNlNTdmYw==
+    YjgzNDE0ZTk3M2IwYmY0ZjllYWNiZjU4NGJiZDE3MGQ2ZjFmYTgzMA==
   data.tar.gz: !binary |-
-    OGI5YWE0MDE4MjA4MDVhNWU2N2E3MzAyZmIyYjUyMTQyNGFmYTYwMQ==
+    NmNhMDVmYzkxZGUwODBmY2RlNmVlNmJlNWU2YTJlOWQyNTI3MTY3Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTg2N2QyZjk1NGY1N2Q2NGIzZmE3MmE1MzMxYmViYTlkMGFlN2NkZjUwMzJj
-    ZjgyYjI4MmM2OTk3MjQwYjMzMWQ0MjgyNTFjZDY5N2QzMzI2OWIzMTMzMzI0
-    MTllZTM1MmYyN2M3M2E5ZTVkOTE1MGM2OTViZjYwY2ExMGZkYmY=
+    NTM4NWQyYTE0YTgxOWMyMmQ4ZWJhZGUxYjc0NTFlN2YzNmM0MjBiYmExOGFh
+    YjhmMjRlODFhOGUxNGVmNTY5MDUzMzM0MjQwN2IxYzI2NDIxZTM4Y2JjZGRm
+    MTZiMWE5YWU1YjczN2EwYTg0MTMyYTFmM2M5ZDFkOWFjOTc0NDQ=
   data.tar.gz: !binary |-
-    ZDZhYTZmNDUyYTg4OGNhNDJiZDlhMGYxNWI2NTI3ZGRmZTc4ZGYwZDYwMDNh
-    Y2JlZDgzNDVhNDljOGYzMDE4MDlkMTFjNDZmMjA3ZDM5YmZiNWNiY2E0ZmMw
-    ZjM5N2FlNjlmODVjYzgyNDY3MGU2NGRkYmE5NjQ4YzdiZDRhYzU=
+    ZjY2NmZiMzc5ODc2YmIxOThhNGRjZjIyMWExMzJlOWRhM2ZjNDNmYTc5OTFk
+    MTMwMjIzZmE5ZjhiYmQ1MGYwYjc4Mzg0NDIyMGY1YjczOTg3ZjNjNmFjMGIz
+    NGJmMjg1OGYxMWRjNjZjZWFlN2E3YWEwYTdiY2NhYmNhMTQ4YzU=

data/lib/ext/object.rb

@@ -42,12 +42,12 @@ module Mobj
     def h?() a? Hash end
     def c?() a? Array, Hash end
 
-    def x?() a? NilClass, FalseClass end
+    def _?() a? NilClass, FalseClass end
 
     def z0?() respond_to?(:zero?) ? zero? : f!.zero? end
 
     def un?()
-      x? || (s? && s !~ /\S/) || (c? && mt?) || (n? && z0?)
+      _? || (s? && s !~ /\S/) || (c? && mt?) || (n? && z0?)
     end
 
     def o?() !un? end
@@ -133,25 +133,53 @@ module Mobj
 
     alias_method :ifnil, :try?
 
-    def when
+    def when(val=:noval)
       iam = self
+
+      return val == self ? self : Forwarder.new do |name, *args, &block|
+        iam.define_singleton_method(:else) { |*vars| self }
+        iam
+      end if val != :noval
+
       Forwarder.new do |name, *args, &block|
         if (iam.respond_to?(name) || iam.methods.include?(name)) && (got = iam.__send__(name, *args, &block))
-          thn = Forwarder.new do |name, *args, &block|
+          thn = Forwarder.new do |name, *inargs, &block|
             if name.sym == :then
-              thn
+              if block
+                ret = iam.instance_exec(*inargs, &block)
+                ret.define_singleton_method(:else) { |*vars| self }
+                ret
+              elsif inargs.mt?
+                thn
+              else
+                ret = inargs.sequester!
+                ret.define_singleton_method(:else) { |*vars| self }
+                ret
+              end
             else
-              ret = __send__(name, *args, &block)
-              ret.define_singleton_method(:else) { Forwarder.new { ret } }
+              ret = __send__(name, *inargs, &block)
+              ret.define_singleton_method(:else) { |*vars, &blk|
+                if vars.mt? && block._?
+                  Forwarder.new { ret }
+                else
+                  ret
+                end
+              }
               ret
             end
           end
         else
           ret = Forwarder.new do |name, *args, &block|
             if name.sym == :then
-              els = Forwarder.new do |name|
+              els = Forwarder.new do |name, *targs, &block|
                 if name.sym == :else
-                  Forwarder.new { |name, *args, &block| __send__(name, *args, &block) }
+                  if block
+                    iam.instance_exec(*targs, &block)
+                  elsif targs.mt?
+                    Forwarder.new { |name, *eargs, &block| __send__(name, *eargs, &block) }
+                  else
+                    targs.sequester!
+                  end
                 else
                   els
                 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobj
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Mason Glaves