lab42_streams 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932f01cab1874c1a2f68148df75733d5ab33561b
-  data.tar.gz: 9ec01ace503ab4739c4070cfb9eaacf8ce399f4f
+  metadata.gz: 2df3a1a7c797bd48984548ffd51d883a1cd91528
+  data.tar.gz: 1db8a911626c365787a3c0eea92679f2881ff1a5
 SHA512:
-  metadata.gz: f8e99130eac0f83c13737636ce55024f13d41e11698ee62370c493f9393b7a6ec78b3d9b047419ffc0b57320c5dfaa36c678b1ce69dcc85a1e815ba9c9c550a5
-  data.tar.gz: fd06621f258ec2d9c1f95b7ec1d8cac37c25d18f2b22d21a9e441dee6831efae36624b26432d8841697185f56ebc7a5712fb205ea91c9e292c5ed1f29257d1e6
+  metadata.gz: 20ee52d46dfb842b5a54dbef370f144a90c6a21e068cfc459d163141bf2ec165392477288f4391e8804a3164c84ee7f68be34ab2133955e24dcd8441e0639b5a
+  data.tar.gz: 3eb81d594c491c5b17a2b40d48c6c6d01c52d7628b44325cd1f60cf47611c9ee1ff689c4abc56b362913a75aee43b257898687ee401f2d5b7122987b5a5cbabb

data/lib/lab42/stream/core/enumerable.rb

@@ -0,0 +1,17 @@
+module Enumerable
+  def ordered_by *beh, &blk
+    raise ArgumentError, 'need exactly one of block and behavior' if !blk == beh.empty?
+    
+    beh = blk || (Symbol === beh.first ? sendmsg( *beh ) : beh.first )
+
+    
+    sort do | a, b |
+      a == b ? 0 : (
+        beh.(a, b) ? -1 : 1
+    )
+    end
+  end
+
+  def to_stream; finite_stream self end
+end
+

data/lib/lab42/stream/enumerable.rb

@@ -1,6 +1,4 @@
-module Enumerable
-  def to_stream; finite_stream self end
-end
+require_relative 'core/enumerable'
 
 module Lab42
   class Stream

data/lib/lab42/stream/kernel.rb

@@ -14,6 +14,13 @@ module Kernel
     Lab42::Stream.new head, tail
   end
 
+  def cons_stream_n first_head, *more_heads, &tail
+    return cons_stream( first_head, &tail ) if more_heads.empty?
+    return cons_stream( first_head ){
+      cons_stream_n( *more_heads, &tail )
+    }
+  end
+
   def const_stream const
     c = cons_stream( const ){ c }
   end
@@ -46,6 +53,11 @@ module Kernel
     end
   end
 
+  def merge_streams_by *streams_and_beh, &blk
+    beh = blk || streams_and_beh.pop
+    __merge_streams_by__ beh, streams_and_beh
+  end
+
   def iterate *args, &blk
     if blk
       cons_stream(*args){ iterate( blk.(*args), &blk ) }
@@ -59,4 +71,19 @@ module Kernel
     end
   end
   alias_method :stream_by, :iterate
+
+  private
+  def __merge_streams_by__ beh, streams
+    # TODO: Get rid of Symbol#to_proc kludge
+    still_there = streams.reject( &:empty? )
+    return empty_stream if still_there.empty?
+    
+    ordered_heads = still_there
+      .map( &:head )
+      .ordered_by( beh )
+
+    cons_stream_n( *ordered_heads ){
+      __merge_streams_by__ beh, still_there.map( &:tail )
+    }
+  end
 end

data/lib/lab42/stream/utility.rb

@@ -18,7 +18,8 @@ module Lab42
         end
       end
 
-      def with_index start=0
+      def with_index  start={}
+        start = Hash === start ? start.fetch( :from, 0 ) : start
         zip_as_ary iterate( start, :succ )
       end
     end # module Utility

data/lib/lab42/stream/version.rb

@@ -1,5 +1,5 @@
 module Lab42
   class Stream
-    Version = "0.1.1"
+    Version = "0.1.2"
   end # class Stream
 end # module Lab42

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lab42_streams
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwarder2
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: lab42_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: qed
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - lib/lab42/stream/array.rb
 - lib/lab42/stream/auto_import.rb
 - lib/lab42/stream/class_methods.rb
+- lib/lab42/stream/core/enumerable.rb
 - lib/lab42/stream/delayed.rb
 - lib/lab42/stream/empty.rb
 - lib/lab42/stream/empty/enumerable.rb