deferrable_gratification 0.3.0 → 0.3.1

data/lib/deferrable_gratification/combinators.rb

@@ -139,7 +139,7 @@ module DeferrableGratification
     # @example Retrieve a web page and call back with its title.
     #   HTTP.request(url).transform {|page| Hpricot(page).at(:title).inner_html }
     def transform(&block)
-      bind!(&block)
+      Bind.setup!(self, :without_chaining => true, &block)
     end
 
     # Transform the value passed to the errback of this Deferrable by invoking

data/lib/deferrable_gratification/combinators/bind.rb

@@ -43,9 +43,13 @@ module DeferrableGratification
       # @param &block  block to run on success; should return a Deferrable.
       #
       # @raise [ArgumentError] if called without a block.
-      def initialize(first, &block)
+      def initialize(first, options = {}, &block)
         @first = first
 
+        @with_chaining = !options.delete(:without_chaining)
+        bad_keys = options.keys.join(', ')
+        raise "Unknown options: #{bad_keys}" unless bad_keys.empty?
+
         raise ArgumentError, 'must pass a block' unless block
         @proc = block
       end
@@ -64,8 +68,8 @@ module DeferrableGratification
       # @return [Bind] Deferrable representing the compound operation.
       #
       # @raise (see #initialize)
-      def self.setup!(first, &block)
-        new(first, &block).tap(&:setup!)
+      def self.setup!(first, options = {}, &block)
+        new(first, options, &block).tap(&:setup!)
       end
 
       private
@@ -79,7 +83,7 @@ module DeferrableGratification
           # callbacks.  However, as referred to in the class comment above, we
           # can't assume that it will, and need to behave sensibly if it
           # doesn't.
-          if second.respond_to?(:callback) && second.respond_to?(:errback)
+          if @with_chaining && second.respond_to?(:callback) && second.respond_to?(:errback)
             second.callback {|*args2| self.succeed(*args2) }
             second.errback {|*error| self.fail(*error) }
           else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deferrable_gratification
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 17
+  prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sam Stokes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -07:00
+date: 2011-07-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Makes evented programming easier with composition and abstraction.