lib/frappuccino/stream.rb in frappuccino-0.2.0 vs lib/frappuccino/stream.rb in frappuccino-0.3.0

- old
+ new

@@ -88,9 +88,13 @@ def on_value(&blk) callbacks << blk end + def merge(another_stream) + Stream.new(self, another_stream) + end + def self.merge(stream_one, stream_two) new(stream_one, stream_two) end protected