em-promise 1.1.0 → 1.1.1

data/MIT-LICENSE

@@ -1,20 +1,20 @@
-Copyright 2012 YOURNAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2012 YOURNAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/em-promise/q.rb

@@ -33,6 +33,7 @@ module EventMachine
 			# The callbacks are called with a single argument, the result or rejection reason.
 			#
 			# @param [Proc, Proc, &blk] callbacks success, error, success_block
+			# @return [Promise] Returns an unresolved promise for chaining
 			def then(callback = nil, errback = nil, &blk)
 				result = Q.defer
 				
@@ -168,7 +169,7 @@ module EventMachine
 		# Combines multiple promises into a single promise that is resolved when all of the input
 		# promises are resolved.
 		#
-		# @param [Promise] a number of promises that will be combined into a single promise
+		# @param [*Promise] Promises a number of promises that will be combined into a single promise
 		# @return [Promise] Returns a single promise that will be resolved with an array of values,
 		#   each value corresponding to the promise at the same index in the `promises` array. If any of
 		#   the promises is resolved with a rejection, this resulting promise will be resolved with the

data/lib/em-promise/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
-	class Defer
-		VERSION = "1.1.0"
+	class Q
+		VERSION = "1.1.1"
 	end
 end

data/spec/defer_spec.rb

@@ -21,7 +21,7 @@ describe EventMachine::Q do
 		
 		
 		it "should call the callback in the next turn" do
-			deferred2 = EM::Defer.new
+			deferred2 = EM::Q.defer
 			EventMachine.run {
 				@promise.then(proc {|result|
 					@log << result
@@ -285,7 +285,7 @@ describe EventMachine::Q do
 					}, @default_fail)
 					@promise.then(proc {|result|
 						@log << result
-						EM::Defer.reject('some reason')
+						EM::Q.reject('some reason')
 					}, @default_fail)
 					@promise.then(proc {|result|
 						@log << result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-promise
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors: