delayer-deferred 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63bcf7cda061faf5664805076d69ee8026ea25f0
-  data.tar.gz: da216a0035ae4fe7a33d64f8f9bdec16aa2427d1
+  metadata.gz: 15a781ea89e438e07c28ee95dc9eb05e46c87ecd
+  data.tar.gz: e7114c16bf3f0830767431df4c770ba70ac88f5c
 SHA512:
-  metadata.gz: d0c86e00bb6704c4a06e6c6a1898bb9dcbcfec5da357478029d0d2a82b0675b500c10ef12091a465035d3d564022d52cd645c50e57e4f1865ba3f40cd454ebd4
-  data.tar.gz: 1d494802f132cdb51133922298c9e1df02a2d8fa40fa3fbdb379e2c3116c865ee30fb3cee83e18ae8bc7b219ca179a5aa5f8c16bd3edf11ac531a328c816a367
+  metadata.gz: f0720eec371433ad820a9b1fa0a2ba0822517b0b9f5a2a4752641ad4477b89aa09b46a311a95ea62516a8dbd3e1d6f948eb69e9d2532030738c0c3975fe15b2c
+  data.tar.gz: 8a93022f6e221129eb1d24ce8d32dcba57ee8c8f4f512b7bd265ddab32a0b4bc0f87474223a4cb679a8fc0fd652195ca67e0bee71f140c467533739ed50b9c72

data/lib/delayer/deferred/deferred.rb

@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
+require "delayer/deferred/deferredable"
+require "delayer/deferred/tools"
+
 module Delayer::Deferred
   class Deferred
+    extend Delayer::Deferred::Tools
     include Deferredable
 
     def self.inherited(subclass)

data/lib/delayer/deferred/tools.rb

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+
+module Delayer::Deferred
+  module Tools
+    def next(&proc)
+      new.next(&proc) end
+
+    def trap(&proc)
+      new.trap(&proc) end
+
+    # 実行中のDeferredを失敗させる。raiseと違って、Exception以外のオブジェクトをtrap()に渡すことができる。
+    # Deferredのnextとtrapの中でだけ呼び出すことができる。
+    # ==== Args
+    # [value] trap()に渡す値
+    # ==== Throw
+    # :__deferredable_fail をthrowする
+    def fail(value)
+      throw(:__deferredable_fail, value) end
+
+    # 複数のdeferredを引数に取って、それら全ての実行が終了したら、
+    # その結果を引数の順番通りに格納したArrayを引数に呼ばれるDeferredを返す。
+    # 引数のDeferredが一つでも失敗するとこのメソッドの返すDeferredも失敗する。
+    # ==== Args
+    # [*args] 終了を待つDeferredオブジェクト
+    # ==== Return
+    # Deferred
+    def when(*args)
+      return self.next{[]} if args.empty?
+      defer, *follow = args
+      raise TypeError, "Argument of Deferred.when must be Delayer::Deferred::Deferredable" unless defer.is_a? Delayer::Deferred::Deferredable
+      if follow.empty?
+        defer.next{|res| [res] }
+      else
+        remain = self.when(*follow)
+        defer.next do |res|
+          remain.next do |follow_res|
+            follow_res.unshift(res) end end end end
+
+    # Kernel#systemを呼び出して、コマンドが成功たら成功するDeferredを返す。
+    # 失敗した場合、trap{}ブロックには $? の値(Process::Status)か、例外が発生した場合それが渡される
+    # ==== Args
+    # [*args] Kernel#system の引数
+    # ==== Return
+    # Deferred
+    def system(*args)
+      delayer.Deferred.Thread.new do
+        if Kernel.system(*args)
+          $?
+        else
+          delayer.Deferred.fail($?) end end end
+  end
+end

data/lib/delayer/deferred/version.rb

@@ -1,5 +1,5 @@
 module Delayer
   module Deferred
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/delayer/deferred.rb

@@ -1,58 +1,24 @@
 # coding: utf-8
 require "delayer"
-require "delayer/deferred/version"
-require "delayer/deferred/deferredable"
 require "delayer/deferred/deferred"
-require "delayer/deferred/thread"
-require "delayer/deferred/enumerator"
+require "delayer/deferred/deferredable"
 require "delayer/deferred/enumerable"
+require "delayer/deferred/enumerator"
+require "delayer/deferred/thread"
+require "delayer/deferred/tools"
+require "delayer/deferred/version"
 
 module Delayer
   module Deferred
-    extend self
-
-    #真ならデバッグ情報を集める
-    attr_accessor :debug
+    extend Delayer::Deferred::Tools
 
-    # 実行中のDeferredを失敗させる。raiseと違って、Exception以外のオブジェクトをtrap()に渡すことができる。
-    # Deferredのnextとtrapの中でだけ呼び出すことができる。
-    # ==== Args
-    # [value] trap()に渡す値
-    # ==== Throw
-    # :__deferredable_fail をthrowする
-    def fail(value)
-      throw(:__deferredable_fail, value) end
+    class << self
+      #真ならデバッグ情報を集める
+      attr_accessor :debug
 
-    # 複数のdeferredを引数に取って、それら全ての実行が終了したら、
-    # その結果を引数の順番通りに格納したArrayを引数に呼ばれるDeferredを返す。
-    # 引数のDeferredが一つでも失敗するとこのメソッドの返すDeferredも失敗する。
-    # ==== Args
-    # [defer] 終了を待つDeferredオブジェクト
-    # [*follow] 他のDeferredオブジェクト
-    # ==== Return
-    # Deferred
-    def when(defer, *follow)
-      raise TypeError, "Argument of Deferred.when must be Delayer::Deferred::Deferredable" unless defer.is_a? Delayer::Deferred::Deferredable
-      if follow.empty?
-        defer.next{|res| [res] }
-      else
-        remain = self.when(*follow)
-        defer.next do |res|
-          remain.next do |follow_res|
-            follow_res.unshift(res) end end end end
-
-    # Kernel#systemを呼び出して、コマンドが成功たら成功するDeferredを返す。
-    # 失敗した場合、trap{}ブロックには $? の値(Process::Status)か、例外が発生した場合それが渡される
-    # ==== Args
-    # [*args] Kernel#system の引数
-    # ==== Return
-    # Deferred
-    def system(*args)
-      delayer.Deferred.Thread.new do
-        if Kernel.system(*args)
-          $?
-        else
-          delayer.Deferred.fail($?) end end end
+      def new(*rest, &proc)
+        Delayer::Deferred::Deferred.new(*rest, &proc) end
+    end
   end
 
   module Extend

data/test/deferred_test.rb

@@ -115,6 +115,21 @@ describe(Delayer::Deferred) do
       assert_equal [1,2,3], result
     end
 
+    it "default deferred" do
+      result = failure = false
+      eval_all_events do
+        Delayer::Deferred::Deferred.when(
+          Delayer::Deferred::Deferred.new.next{ 1 },
+          Delayer::Deferred::Deferred.new.next{ 2 },
+          Delayer::Deferred::Deferred.new.next{ 3 }
+        ).next{ |values|
+          result = values
+        }.trap{ |exception|
+          failure = exception }  end
+      assert_equal false, failure
+      assert_equal [1,2,3], result
+    end
+
     it "give that is not Deferredable" do
       result = failure = false
       delayer = Delayer.generate_class
@@ -147,6 +162,41 @@ describe(Delayer::Deferred) do
       assert_kind_of RuntimeError, failure
       assert_equal false, result
     end
+
+    it "no deferred given" do
+      result = failure = false
+      delayer = Delayer.generate_class
+      eval_all_events(delayer) do
+        delayer.Deferred.when().next{ |values|
+          result = values
+        }.trap{ |exception|
+          failure = exception }  end
+      assert_equal false, failure
+      assert_empty result
+    end
+
+    it "no deferred given for default delayer" do
+      result = failure = false
+      eval_all_events do
+        Delayer::Deferred::Deferred.when().next{ |values|
+          result = values
+        }.trap{ |exception|
+          failure = exception }  end
+      assert_equal false, failure
+      assert_empty result
+    end
+
+    it "no deferred given for delayer module" do
+      result = failure = false
+      eval_all_events do
+        Delayer::Deferred.when().next{ |values|
+          result = values
+        }.trap{ |exception|
+          failure = exception }  end
+      assert_equal false, failure
+      assert_empty result
+    end
+
   end
 
   describe "cancel" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayer-deferred
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayer
@@ -91,6 +91,7 @@ files:
 - lib/delayer/deferred/enumerable.rb
 - lib/delayer/deferred/enumerator.rb
 - lib/delayer/deferred/thread.rb
+- lib/delayer/deferred/tools.rb
 - lib/delayer/deferred/version.rb
 - test/deferred_test.rb
 - test/enumerable_test.rb
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Deferred for Delayer