lalka 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2c8ed4e0c9d220a12dee163cd1bf8374345335d
-  data.tar.gz: 972691694aa8089be51371b55c1e19fcefacb395
+  metadata.gz: 2c89e1ae29d8f65245cab3ad0730a8b26087859c
+  data.tar.gz: 05925e8d18a6850d9a5e52ca16306856c252a024
 SHA512:
-  metadata.gz: 81fc544ab2f9ba714e75d381ef1251dbbd60ae0209a21e33069a7b3c9f010216af8f158c95be505ef5f15a639e898b6b53a479e2c58154e6b92ffffdaaee2555
-  data.tar.gz: c605549c2e9b112d86358db31f0fcd4741d6284fe7a1025d1f56e35dddbe1776da3b1bbd781ea918f965a1b001c2cbe9170e9a4bd9ed1d89aa9c401d21c09387
+  metadata.gz: 38462cfd7c7ad8218fe445cd3bf5ab8c50172cee6779bb5ff29533c12c095b27969faaaf5a8f853f20bac41d658dd2d19e09876b5f97a16806e35025c9508a03
+  data.tar.gz: 76806c3b825c7cda3b42cbcf46f0a0068e78337ebce51be1678a5c60981110b06fdcc66cc493f00315bb67ef12a6d279c4fcbd92ad8bf53706bed2d7e95772c3

data/lalka.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # spec.add_dependency "concurrent-ruby"
-  # spec.add_dependency "concurrent-ruby-ext"
+  spec.add_dependency "concurrent-ruby"
+  spec.add_dependency "concurrent-ruby-ext"
   spec.add_dependency 'dry-monads'
 
   spec.add_development_dependency "bundler", "~> 1.13"

data/lib/lalka.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 require 'lalka/version'
 require 'dry-monads'
+require 'concurrent'
 
 module Lalka
   # TODO: Invalidate resolve and reject at the same time
 
   class Task
+    M = Dry::Monads
+
     class << self
       def resolve(value)
         new do |t|
@@ -13,8 +16,6 @@ module Lalka
         end
       end
 
-      alias of resolve
-
       def reject(error)
         new do |t|
           t.reject(error)
@@ -31,6 +32,8 @@ module Lalka
         internal.on_success { |v| v }
         internal.on_error { |e| e }
       end
+
+      alias of resolve
     end
 
     def initialize(&block)
@@ -98,53 +101,49 @@ module Lalka
 
     def ap(other_task)
       Task.new do |t|
-        q = Queue.new
+        atom = Concurrent::Agent.new(M.Right(fn: M.None(), arg: M.None()))
 
-        other_task.fork do |other|
-          other.on_success do |value|
-            q.push [:arg, value]
-          end
+        atom.add_observer do |_, _, either|
+          if either.right?
+            value = either.value
 
-          other.on_error do |error|
-            q.push [:error, error]
+            value[:fn].bind { |fn| value[:arg].fmap(fn) }.fmap do |result|
+              t.resolve(result)
+              atom.delete_observers
+            end
+          else
+            error = either.value
+
+            t.reject(error)
+            atom.delete_observers
           end
         end
 
         fork do |this|
           this.on_success do |fn|
-            q.push [:fn, fn]
+            atom.send(fn) { |either, fn| either.bind { |struct| M.Right(struct.merge(fn: M.Some(fn))) } }
           end
 
           this.on_error do |error|
-            q.push [:error, error]
+            atom.send(error) { |either, error| either.bind { M.Left(error) } }
           end
         end
 
-        ap_aux(t, q, [false, nil], [false, nil])
-      end
-    end
-
-    private
+        other_task.fork do |other|
+          other.on_success do |arg|
+            atom.send(arg) { |either, arg| either.bind { |struct| M.Right(struct.merge(arg: M.Some(arg))) } }
+          end
 
-    def ap_aux(task, queue, fn, arg)
-      if fn[0] && arg[0]
-        result = fn[1].call(arg[1])
-        task.resolve(result)
-      else
-        type, value = queue.pop
-
-        case type
-        when :error
-          task.reject(value)
-        when :fn
-          ap_aux(task, queue, [true, value], arg)
-        when :arg
-          ap_aux(task, queue, fn, [true, value])
-        else
-          raise 'Unknown type'
+          other.on_error do |error|
+            atom.send(error) { |either, error| either.bind { M.Left(error) } }
+          end
         end
       end
     end
+
+    alias fmap map
+    alias chain bind
+    alias flat_map bind
   end
 
   class InternalBase
@@ -182,12 +181,12 @@ module Lalka
 
     def resolve(value)
       result = @on_success.call(value)
-      @queue.push Dry::Monads.Right(result)
+      @queue.push M.Right(result)
     end
 
     def reject(error)
       result = @on_error.call(error)
-      @queue.push Dry::Monads.Left(result)
+      @queue.push M.Left(result)
     end
   end
 end

data/lib/lalka/version.rb

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

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: lalka
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Vlad Shmyhlo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement