lalka 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803656007eaa3ce1fa9bf0590906f978c296d51f
-  data.tar.gz: 1e3808e62ec73431dac71b77a020ab6dcda74b43
+  metadata.gz: f052e0cce98cefd5a400f81e00280c0670c244dc
+  data.tar.gz: e29c8e0b3d7ae4720d91ea5fd061719ce0c43997
 SHA512:
-  metadata.gz: ce6d3be7b9c1ad1fd49b43801896bb7f44aeb0e6b472c7386ce4463cdbc6327795ac85478071760268cf97ddaf4b5208f939dc4002f4cdb6799cfdd93c70e041
-  data.tar.gz: 8bb5196fc4a04021a499104d2bd2bc1083da6aebe0d09bb1301aee0ca3251927bffae52d067d7f2ff7070277070944d39e8523c46a16ff3c689326530bc24eb2
+  metadata.gz: e2c4d41777640d33f50a82fdac121d0ca1460e243946ea687ffb66b53d0750b723b16bf475afa4cb647e3e8942dd21ca8c90dc38d124f6855d5aa155c64cf54a
+  data.tar.gz: 52c6004164ae271f1c7e5f6bfaa22e80d9538ad6c9988b3c943a4dc4a004296462d5077b91caef47b6cb0dc828d338c2fad680284ebce220329a00ff10ab2973

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.3.3
 before_install: gem install bundler -v 1.13.6

data/README.md

@@ -1,4 +1,5 @@
 # Lalka
+[![Build Status](https://travis-ci.org/v-shmyhlo/lalka.svg?branch=master)](https://travis-ci.org/v-shmyhlo/lalka)
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/lalka`. To experiment with that code, run `bin/console` for an interactive prompt.
 

data/lalka.gemspec

@@ -1,42 +1,41 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'lalka/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "lalka"
+  spec.name          = 'lalka'
   spec.version       = Lalka::VERSION
-  spec.authors       = ["Vlad Shmyhlo"]
-  spec.email         = ["aion.stu@gmail.com"]
+  spec.authors       = ['Vlad Shmyhlo']
+  spec.email         = ['aion.stu@gmail.com']
 
-  spec.summary       = "Task monad"
-  spec.description   = "Task monad"
-  spec.homepage      = "https://github.com/v-shmyhlo/lalka"
-  spec.license       = "MIT"
+  spec.summary       = 'Task monad'
+  spec.description   = 'Task monad'
+  spec.homepage      = 'https://github.com/v-shmyhlo/lalka'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     # spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "concurrent-ruby"
-  spec.add_dependency "concurrent-ruby-ext"
   spec.add_dependency 'dry-monads'
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'pry'
 end

data/lib/lalka.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-require 'lalka/version'
 require 'dry-monads'
-require 'concurrent'
+
+require 'lalka/version'
 
 module Lalka
   M = Dry::Monads
@@ -27,11 +27,6 @@ module Lalka
         end
       end
 
-      def id(internal)
-        internal.on_success { |v| v }
-        internal.on_error { |e| e }
-      end
-
       alias of resolve
     end
 
@@ -46,7 +41,8 @@ module Lalka
       if block_given?
         yield internal
       else
-        Task.id(internal)
+        internal.on_success { |v| v }
+        internal.on_error { |e| e }
       end
 
       internal.call(&@computation)
@@ -104,41 +100,56 @@ module Lalka
 
     def ap(other_task)
       Task.new do |t|
-        atom = Concurrent::Atom.new(M.Right(fn: M.None(), arg: M.None()))
+        mutex = Mutex.new
+        completed = false
+        either = M.Right([M.None(), M.None()])
 
-        atom.add_observer do |_, _, either|
-          if either.right?
-            value = either.value
+        complete_task = lambda do |&block|
+          mutex.synchronize do
+            return if completed
 
-            value[:fn].bind { |fn| value[:arg].fmap(fn) }.fmap do |result|
-              t.resolve(result)
-              atom.delete_observers
-            end
-          else
-            error = either.value
+            either = block.call(either)
 
-            t.reject(error)
-            atom.delete_observers
+            if either.right?
+              (e_fn, e_arg) = either.value
+
+              e_fn.bind { |fn| e_arg.fmap(fn) }.fmap do |value|
+                t.resolve(value)
+                completed = true
+              end
+            else
+              error = either.value
+              t.reject(error)
+              completed = true
+            end
           end
         end
 
         fork do |this|
           this.on_success do |fn|
-            atom.swap(fn) { |either, fn| either.bind { |struct| M.Right(struct.merge(fn: M.Some(fn))) } }
+            complete_task.call do |either|
+              either.bind { |_, e_arg| M.Right([M.Some(fn), e_arg]) }
+            end
           end
 
           this.on_error do |error|
-            atom.swap(error) { |either, error| either.bind { M.Left(error) } }
+            complete_task.call do |either|
+              either.bind { M.Left(error) }
+            end
           end
         end
 
         other_task.fork do |other|
           other.on_success do |arg|
-            atom.swap(arg) { |either, arg| either.bind { |struct| M.Right(struct.merge(arg: M.Some(arg))) } }
+            complete_task.call do |either|
+              either.bind { |e_fn, _| M.Right([e_fn, M.Some(arg)]) }
+            end
           end
 
           other.on_error do |error|
-            atom.swap(error) { |either, error| either.bind { M.Left(error) } }
+            complete_task.call do |either|
+              either.bind { M.Left(error) }
+            end
           end
         end
       end
@@ -219,7 +230,7 @@ module Lalka
       result =
         if @on_error.nil?
           ArgumentError.new('missing on_error block')
-         else
+        else
           @on_error.call(error)
         end
 

data/lib/lalka/version.rb

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

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lalka
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Vlad Shmyhlo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2016-12-23 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