stages 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/examples/sing.rb

@@ -14,14 +14,14 @@ def sing
 end
 
 def setup_pipeline
-  generator = EachElement.new sing.keys
+  generator = Each.new sing.keys
   loop = Restrict.new
-  get_lyric = HashLookup.new sing
-  each_character = EachInput.new{ |x| x.chars }
+  get_lyric = Map.new{ |x| sing[x]}
+  each_character = Each.new{ |x| x.chars }
   whitespace = Select.new{ |x| x != ' '}
   pool = ResumeCount.new
   subtotals = Map.new { |x| x.values.first }
-  iterator = EachInput.new
+  iterator = Each.new
   aggregator = SuperAggregator.new
   
   generator | loop | get_lyric | each_character | whitespace | pool | subtotals | iterator  |  aggregator

data/examples/sing_custom_stages.rb

@@ -0,0 +1,51 @@
+require "#{File.dirname(__FILE__)}/../lib/stages"
+
+include Stages
+
+#count the occurance of each letter in these song lyrics
+@lyrics = 
+  { :do => 'doe a deer a female deer',
+    :re => 'ray a drop of golden sun',
+    :mi => 'me a name I call myself',
+    :fa => 'far a long long way to run',
+    :so => 'a needle pulling thread',
+    :la => 'a note to follow so',
+    :ti => 'a drink with jam and bread'}
+
+class Lyrics < Stage
+  attr_accessor :lyrics
+  def handle_value(value)
+    output @lyrics[value]
+  end
+end
+
+class Generator < Stage
+  def initialize(things)
+    @things = things
+    super()
+  end
+  
+  def process
+    @things.each do |t|
+      output t
+    end
+  end
+end
+
+def setup_pipeline
+  get_lyric = Lyrics.new
+  get_lyric.lyrics = @lyrics
+  
+  each_character = Each.new{ |x| x.chars }
+  trim_whitespace = Select.new{ |x| x != ' '}
+  letters_in_each_line = SubStage.new(get_lyric | each_character | trim_whitespace)
+  each_note = Generator.new(@lyrics.keys)
+  count_everything = Count.new
+  
+  each_note | letters_in_each_line | count_everything
+end
+
+puts setup_pipeline.run.inspect
+
+
+

data/examples/sing_subpipes.rb

@@ -3,7 +3,7 @@ require "#{File.dirname(__FILE__)}/../lib/stages"
 include Stages
 
 #count the occurance of each letter in these song lyrics
-def sing
+@lyrics = 
   { :do => 'doe a deer a female deer',
     :re => 'ray a drop of golden sun',
     :mi => 'me a name I call myself',
@@ -11,18 +11,18 @@ def sing
     :so => 'a needle pulling thread',
     :la => 'a note to follow so',
     :ti => 'a drink with jam and bread'}
-end
 
 def setup_pipeline
-  get_lyric = HashLookup.new sing
-  each_character = EachInput.new{ |x| x.chars }
-  trim_whitespace = Select.new{ |x| x != ' '}
-  count_letters_in_line = SubStage.new(get_lyric | each_character | trim_whitespace)
+  get_lyric = Map.new{ |x| @lyrics[x]}
   
-  each_note = EachElement.new sing.keys
+  
+  each_character = Each.new{ |x| x.chars }
+  trim_whitespace = Select.new{ |x| x != ' '}
+  letters_in_each_line = SubStage.new(get_lyric | each_character | trim_whitespace)
+  each_note = Each.new @lyrics.keys
   count_everything = Count.new
   
-  each_note | count_letters_in_line | count_everything
+  each_note | letters_in_each_line | count_everything
 end
 
 puts setup_pipeline.run.inspect

data/lib/stages/each.rb

@@ -0,0 +1,34 @@
+module Stages
+  class Each < Stage
+    def initialize(things = nil, &block)
+      @things = things unless things.nil?
+      @block = block
+      super()
+    end
+        
+    def process 
+      if @things
+        process_things
+      else
+        process_inputs
+      end
+    end
+    
+    def process_inputs
+      while v = input
+        v = @block.call(v) if @block
+        v.each do |v|
+          output v
+        end
+      end
+    end
+    
+    def process_things
+      @things = @block.call(@things) if @block
+      output nil if @things.nil?
+      @things.each do |thing|
+        output thing
+      end
+    end
+  end
+end

data/lib/stages/sub_stage.rb

@@ -3,13 +3,20 @@ module Stages
     def initialize(pipeline)
       @pipeline = pipeline
       @cache = []
+      @with_hash = false
       super()
     end
     
+    def with_hash
+      @with_hash = true
+      self
+    end
+    
     def process
       while value = input
         subpipe = Emit.new(value) | @pipeline
         while v = subpipe.run
+          v = { value => v} if @with_hash
           output v
         end
         @pipeline.drop_leftmost!

data/stages.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "stages"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["The Justice Eight"]
@@ -23,17 +23,15 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "examples/sing.rb",
+    "examples/sing_custom_stages.rb",
     "examples/sing_subpipes.rb",
     "lib/stage_base.rb",
     "lib/stages.rb",
     "lib/stages/count.rb",
-    "lib/stages/each_element.rb",
-    "lib/stages/each_input.rb",
+    "lib/stages/each.rb",
     "lib/stages/emit.rb",
     "lib/stages/evens.rb",
-    "lib/stages/hash_lookup.rb",
     "lib/stages/map.rb",
-    "lib/stages/multiples_of.rb",
     "lib/stages/restrict.rb",
     "lib/stages/resume.rb",
     "lib/stages/resume_count.rb",

data/test/test_pipeline.rb

@@ -5,8 +5,8 @@ class TestPipeline < MiniTest::Unit::TestCase
   
   test 'simple basic pipeline' do
     evens = Evens.new
-    mx3 = MultiplesOf.new(3)
-    mx7 = MultiplesOf.new(7) 
+    mx3 = Select.new{ |x| x % 3 == 0}
+    mx7 = Select.new{ |x| x % 7 == 0}
     mx3.source = evens 
     mx7.source = mx3
     
@@ -15,7 +15,7 @@ class TestPipeline < MiniTest::Unit::TestCase
   end
   
   test 'pipeline pipe syntax works' do
-    pipeline = Evens.new | MultiplesOf.new(3) | MultiplesOf.new(7)
+    pipeline = Evens.new | Select.new{ |x| x % 3 == 0} | Select.new{ |x| x % 7 == 0}
     result = (0..2).map{ pipeline.run }
     assert_equal([0, 42, 84], result)
   end
@@ -36,7 +36,7 @@ class TestPipeline < MiniTest::Unit::TestCase
   end   
        
   test 'nil kills it' do
-    pipeline = EachElement.new([1, 2, nil, 3])
+    pipeline = Each.new([1, 2, nil, 3])
     result = []
     while v = pipeline.run
       result << v

data/test/test_stages.rb

@@ -22,19 +22,19 @@ class TestStages < MiniTest::Unit::TestCase
   end
   
   test 'multiples_of' do
-    pipeline = Evens.new | MultiplesOf.new(3)
+    pipeline = Evens.new | Select.new{ |x| x % 3 == 0}
     result = (0..3).map{ pipeline.run }
     assert_equal([0, 6, 12, 18], result)
   end
   
   test 'each_element' do
-    pipeline = EachElement.new([1, 2, 3])
+    pipeline = Each.new([1, 2, 3])
     result = (0..2).map{ pipeline.run }
     assert_equal([1, 2, 3], result)
   end
   
   test 'hash_lookup' do
-    pipeline = EachElement.new([:do, :re, :mi]) | HashLookup.new(sing)
+    pipeline = Each.new([:do, :re, :mi]) | Map.new{ |x| sing[x]}
     result = (0..2).map { pipeline.run }
     assert_equal(['doe a deer a female deer', 'ray a drop of golden sun', 'me a name I call myself'], result)
   end   
@@ -53,17 +53,8 @@ class TestStages < MiniTest::Unit::TestCase
     assert_equal([0, 4], result)
   end
   
-  test 'each_input' do
-    pipeline = EachElement.new([[1, 2], [3, 4]]) | EachInput.new 
-    result = []
-    while v = pipeline.run
-      result << v
-    end
-    assert_equal([1, 2, 3, 4], result)
-  end
-  
   test 'resume' do
-    pipeline = EachElement.new(%w(foo bar)) | Restrict.new | EachInput.new{ |x| x.chars} | Resume.new
+    pipeline = Each.new(%w(foo bar)) | Restrict.new | Each.new{ |x| x.chars} | Resume.new
     result = []
     while v = pipeline.run
       result << v
@@ -73,20 +64,29 @@ class TestStages < MiniTest::Unit::TestCase
   
   test 'resume with count' do
     resume = ResumeCount.new
-    pipeline = EachElement.new(%w(foo bar)) | Restrict.new | EachInput.new{ |x| x.chars} | Map.new{ |x| x.to_sym } | resume
+    pipeline = Each.new(%w(foo bar)) | Restrict.new | Each.new{ |x| x.chars} | Map.new{ |x| x.to_sym } | resume
     result = pipeline.run
     assert_equal({ 'foo' => { :f => 1, :o => 2}}, result)
   end
   
   test 'substage instead of resume' do
-    sub = EachInput.new{ |x| x.chars } | Map.new{ |x| x.to_sym} | Count.new
-    pipeline = EachElement.new(%w(foo bar)) | SubStage.new(sub)
+    sub = Each.new{ |x| x.chars } | Map.new{ |x| x.to_sym} | Count.new
+    pipeline = Each.new(%w(foo bar)) | SubStage.new(sub).with_hash | Map.new{ |x| x.values.first}
     result = pipeline.run
     assert_equal({ :f => 1, :o => 2}, result)
     result = pipeline.run
     assert_equal({ :b => 1, :a => 1, :r => 1}, result)
   end
   
+  test 'substage with key and result' do
+    sub = Each.new{ |x| x.chars } | Map.new{ |x| x.to_sym} | Count.new
+    pipeline = Each.new(%w(foo bar)) | SubStage.new(sub).with_hash
+    result = pipeline.run
+    assert_equal({'foo' => { :f => 1, :o => 2}}, result)
+    result = pipeline.run
+    assert_equal({ 'bar' => { :b => 1, :a => 1, :r => 1}}, result)
+  end
+  
   def sing
     { :do => 'doe a deer a female deer',
       :re => 'ray a drop of golden sun',

metadata

@@ -2,7 +2,7 @@
 name: stages
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - The Justice Eight
@@ -39,17 +39,15 @@ files:
 - Rakefile
 - VERSION
 - examples/sing.rb
+- examples/sing_custom_stages.rb
 - examples/sing_subpipes.rb
 - lib/stage_base.rb
 - lib/stages.rb
 - lib/stages/count.rb
-- lib/stages/each_element.rb
-- lib/stages/each_input.rb
+- lib/stages/each.rb
 - lib/stages/emit.rb
 - lib/stages/evens.rb
-- lib/stages/hash_lookup.rb
 - lib/stages/map.rb
-- lib/stages/multiples_of.rb
 - lib/stages/restrict.rb
 - lib/stages/resume.rb
 - lib/stages/resume_count.rb
@@ -72,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4250500444924917482
+      hash: 1777887051892301360
       segments: 
       - 0
       version: "0"

data/lib/stages/each_element.rb

@@ -1,14 +0,0 @@
-module Stages
-  class EachElement < Stage
-    def initialize(things)
-      @things = things
-      super()
-    end
-        
-    def process 
-      @things.each do |thing|
-        output thing 
-      end
-    end
-  end
-end

data/lib/stages/each_input.rb

@@ -1,10 +0,0 @@
-module Stages
-  class EachInput < Stage
-    def handle_value(value)
-      value = @block.call(value) if @block
-      value.each do |i|
-        output i
-      end
-    end
-  end
-end

data/lib/stages/hash_lookup.rb

@@ -1,12 +0,0 @@
-module Stages
-  class HashLookup < Stage
-    def initialize(things)
-      @things = things
-      super()
-    end
-    
-    def handle_value(value)
-      output @things[value]
-    end
-  end
-end

data/lib/stages/multiples_of.rb

@@ -1,12 +0,0 @@
-module Stages
-  class MultiplesOf < Stage
-    def initialize(factor)
-      @factor = factor
-      super()
-    end
-    
-    def handle_value(value)
-      output(value) if value % @factor == 0
-    end 
-  end 
-end