lab42_streams 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df3a1a7c797bd48984548ffd51d883a1cd91528
-  data.tar.gz: 1db8a911626c365787a3c0eea92679f2881ff1a5
+  metadata.gz: d09f7787dde8a103ab385e107f3edfb91cab85cb
+  data.tar.gz: 2fcdf2c0ea44003310d0e05d7df2716a4d1d5ff5
 SHA512:
-  metadata.gz: 20ee52d46dfb842b5a54dbef370f144a90c6a21e068cfc459d163141bf2ec165392477288f4391e8804a3164c84ee7f68be34ab2133955e24dcd8441e0639b5a
-  data.tar.gz: 3eb81d594c491c5b17a2b40d48c6c6d01c52d7628b44325cd1f60cf47611c9ee1ff689c4abc56b362913a75aee43b257898687ee401f2d5b7122987b5a5cbabb
+  metadata.gz: 3d87e2f2e764b300379b879ce4a2f7716abfab0d6b56d5894e25e13d7d663d8a571c8e9623a092c22de34315624b6398becac64e3ac29cfa9445453f46d6f999
+  data.tar.gz: df8e4190c2c63dfb1e238e6c60483af3c5b90385248a0117411f40cd77aed7c6f0a274ec102f89b5943caa5ee641e9dea7ef151fb7c4ae8ed8c7af24830baf0b

data/README.md

@@ -4,6 +4,11 @@ Bringing Streams to Ruby
 
 An excellent introduction into `Streams` can be found [here](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-001-structure-and-interpretation-of-computer-programs-spring-2005/video-lectures/6a-streams-part-1/)
 
+[![Build Status](https://travis-ci.org/RobertDober/lab42_streams.svg?branch=master)](https://travis-ci.org/RobertDober/lab42_streams)
+[![Code Climate](https://codeclimate.com/github/RobertDober/lab42_streams/badges/gpa.svg)](https://codeclimate.com/github/RobertDober/lab42_streams)
+[![Test Coverage](https://codeclimate.com/github/RobertDober/lab42_streams/badges/coverage.svg)](https://codeclimate.com/github/RobertDober/lab42_streams)
+[![Gem Version](https://badge.fury.io/rb/lab42_streams.svg)](http://badge.fury.io/rb/lab42_streams)
+
 
 
 Please see the [QED](http://rubyworks.github.io/qed/) demos [here](https://github.com/RobertDober/lab42_streams/blob/master/demo)

data/lib/lab42/stream/enumerable.rb

@@ -107,11 +107,11 @@ module Lab42
       end
 
       def filter *args, &blk
-        __filter__ blk.make_behavior( *args )
+        __filter__ self, blk.make_behavior( *args )
       end
 
       def reject *args, &blk
-        __filter__ blk.make_behavior( *args ).not
+        __filter__ self, blk.make_behavior( *args ).not
       end
 
       def flatmap *args, &blk
@@ -244,11 +244,11 @@ module Lab42
         }
       end
 
-      def __filter__ a_proc
-        if a_proc.( head )
-          cons_stream( head ){ tail.__filter__ a_proc } 
-        else
-          tail.__filter__ a_proc
+      def __filter__ stream, a_proc
+        loop do
+          return stream if stream.empty?
+          return cons_stream( stream.head ){ __filter__ stream.tail, a_proc } if a_proc.( stream.head )
+          stream = stream.tail
         end
       end
 

data/lib/lab42/stream/kernel.rb

@@ -62,28 +62,34 @@ module Kernel
     if blk
       cons_stream(*args){ iterate( blk.(*args), &blk ) }
     else
-      rest = args.drop 1
-      if Method === rest.first 
-        cons_stream( args.first ){ iterate( rest.first.(*([args.first] + rest.drop(1))), *rest ) }
-      else
-        cons_stream( args.first ){ iterate( sendmsg(*rest).(args.first), *rest ) }
-      end
+      iterate_without_block args
     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 )
-    }
+  def iterate_without_block args
+    rest = args.drop 1
+    if Method === rest.first 
+      cons_stream( args.first ){ iterate( rest.first.(*([args.first] + rest.drop(1))), *rest ) }
+    else
+      cons_stream( args.first ){ iterate( sendmsg(*rest).(args.first), *rest ) }
+    end
   end
+
+private
+def __merge_streams_by__ beh, streams
+  still_there = streams.reject( &:empty? )
+  return empty_stream if still_there.empty?
+  __merge_streams_by_with_present__ beh, still_there, streams
+end 
+
+def __merge_streams_by_with_present__ beh, still_there, streams
+  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/version.rb

@@ -1,5 +1,5 @@
 module Lab42
   class Stream
-    Version = "0.1.2"
+    Version = "0.1.3"
   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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forwarder2
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Streams for Ruby 2.0