lalka 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d84e81df254853fab9f6098eb9977459e1ec950
-  data.tar.gz: cf66bc790e5914ae297f9b9adbc0ba60724e7bde
+  metadata.gz: 803656007eaa3ce1fa9bf0590906f978c296d51f
+  data.tar.gz: 1e3808e62ec73431dac71b77a020ab6dcda74b43
 SHA512:
-  metadata.gz: a43f7bdad55186d6eee469b6a46b520d9f4a394359f3fdeabdfeef21dede608593495ebb014b4c9a9d4d9a9951603a21e0396dd6c77c9c3f77cd5331f78e249e
-  data.tar.gz: 0999a61f36c30400c6504ddb80b9c4b1197ba6f0e72731be8af9d9a2c1552b9743453ebb4b2d93786e46095b359120bf52c42053a0ac667819e85bac605b908c
+  metadata.gz: ce6d3be7b9c1ad1fd49b43801896bb7f44aeb0e6b472c7386ce4463cdbc6327795ac85478071760268cf97ddaf4b5208f939dc4002f4cdb6799cfdd93c70e041
+  data.tar.gz: 8bb5196fc4a04021a499104d2bd2bc1083da6aebe0d09bb1301aee0ca3251927bffae52d067d7f2ff7070277070944d39e8523c46a16ff3c689326530bc24eb2

data/lib/lalka.rb

@@ -49,22 +49,24 @@ module Lalka
         Task.id(internal)
       end
 
-      @computation.call(internal)
+      internal.call(&@computation)
       queue.pop
     end
 
     def fork
       internal = InternalAsync.new
       yield internal
-      @computation.call(internal)
+      internal.call(&@computation)
       nil
     end
 
-    def map
+    def map(*args, &block)
+      block = function_from_arguments(*args, &block)
+
       Task.new do |t|
         fork do |this|
           this.on_success do |value|
-            t.resolve(yield value)
+            t.resolve(block.call(value))
           end
 
           this.on_error do |error|
@@ -74,11 +76,13 @@ module Lalka
       end
     end
 
-    def bind
+    def bind(*args, &block)
+      block = function_from_arguments(*args, &block)
+
       Task.new do |t|
         fork do |this|
           this.on_success do |first_value|
-            other_task = yield first_value
+            other_task = block.call(first_value)
 
             other_task.fork do |other|
               other.on_success do |second_value|
@@ -143,6 +147,18 @@ module Lalka
     alias fmap map
     alias chain bind
     alias flat_map bind
+
+    private
+
+    def function_from_arguments(*args, &block)
+      if block_given?
+        raise ArgumentError, 'both block and function provided' if args.length != 0
+        block
+      else
+        raise ArgumentError, 'no block or function provided' if args.length != 1
+        args[0]
+      end
+    end
   end
 
   class InternalBase
@@ -161,14 +177,26 @@ module Lalka
     rescue => e
       reject(e)
     end
+
+    def call
+      yield self
+    rescue => e
+      reject(e)
+    end
   end
 
   class InternalAsync < InternalBase
     def resolve(value)
-      @on_success.call(value)
+      if @on_success.nil?
+        reject(ArgumentError.new('missing on_success block'))
+      else
+        @on_success.call(value)
+      end
     end
 
     def reject(error)
+      raise ArgumentError, 'missing on_error block' if @on_error.nil?
+
       @on_error.call(error)
     end
   end
@@ -179,12 +207,22 @@ module Lalka
     end
 
     def resolve(value)
-      result = @on_success.call(value)
-      @queue.push M.Right(result)
+      if @on_success.nil?
+        reject(ArgumentError.new('missing on_success block'))
+      else
+        result = @on_success.call(value)
+        @queue.push M.Right(result)
+      end
     end
 
     def reject(error)
-      result = @on_error.call(error)
+      result =
+        if @on_error.nil?
+          ArgumentError.new('missing on_error block')
+         else
+          @on_error.call(error)
+        end
+
       @queue.push M.Left(result)
     end
   end

data/lib/lalka/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Lalka
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lalka
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Vlad Shmyhlo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby