aqueductron 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58506c06a6a555805358ad1545cf71769fc2f3cb
-  data.tar.gz: 0c7d1b25af500789ebb0f91c95bd407349f30eac
+  metadata.gz: 2e80806b87220aafb51408e7801435ebe84c64f6
+  data.tar.gz: 29903ea55cce4b8da0523630f8b551168b274eed
 SHA512:
-  metadata.gz: f8da3f12f7657164c0099b5eab8f731086b220b76a2d0b87b9abde68aa1e01a0ff965f7049ff0ae128632160f299e8447a016591f49b047ba426081a41c06883
-  data.tar.gz: 71486cc4c617bfc55ebc6c7f3622abee44ed380a381696007ba3f1143e410ed97519bf78016f5d1793d329c61dd4b66258f1134a748535cd77ffdda1d085c9c5
+  metadata.gz: 81107728aec0816bdcbcff836ecdf70018c0f1efda65784ff8744695a877b32b8ca2ecccba0daf9a31114161705b119b6ca4259d02c7836203485edb7b3830c6
+  data.tar.gz: 39e64b9ad5d886ce4ba598131427f15cecbea75d3b4306c6be9c9b817ffd01204d5143c607cb4c75692aaff261817d6fb04dc751953fd419af1671062e31279d

data/lib/aqueductron/array_end_piece.rb

@@ -0,0 +1,23 @@
+require_relative 'piece_common'
+require_relative 'drawing'
+
+module Aqueductron
+  class ArrayEndPiece
+    include PieceCommon
+    def initialize(so_far = [])
+      @so_far = so_far
+    end
+    def eof
+      SimpleResult.new(@so_far)
+    end
+    def receive msg
+      ArrayEndPiece.new(@so_far + [msg])
+    end
+
+    def draw
+      desc = @so_far.empty? ? "[]" : "[] (#{@so_far})"
+      Drawing.draw_end_piece(desc)
+    end
+
+  end
+end

data/lib/aqueductron/buildering.rb

@@ -5,6 +5,7 @@ require_relative 'inlet'
 require_relative 'joint_piece'
 require_relative 'piece'
 require_relative 'partition'
+require_relative 'array_end_piece'
 
 module Aqueductron
   module Buildering
@@ -16,6 +17,10 @@ module Aqueductron
       answer_int(CountingEndPiece.new)
     end
 
+    def array
+      answer_int(ArrayEndPiece.new)
+    end
+
     def take(how_many)
       attach(take_function(how_many))
     end
@@ -54,7 +59,8 @@ module Aqueductron
         if (how_many == 0) then # this is a little inefficient. One extra piece of info will be read
           piece.send_eof
         else
-          piece.pass_on(msg, take_function(how_many -1))
+          how_many_more = how_many - 1
+          piece.pass_on(msg, take_function(how_many_more), "taking #{how_many_more}")
         end
       end
     end

data/lib/aqueductron/compound_result.rb

@@ -15,5 +15,14 @@ module Aqueductron
       puts "Nothing found at #{head}" unless @contents[head]
       @contents[head].value(*tail)
     end
+
+    def to_hash
+      @contents.map_values {|a| a.to_hash}
+    end
+
+    def draw
+      paths = Drawing.draw_multiple_paths(@contents)
+      Drawing.horizontal_concat(Drawing.joint_prefix, paths)
+    end
   end
 end

data/lib/aqueductron/counting_end_piece.rb

@@ -1,4 +1,5 @@
 require_relative 'piece_common'
+require_relative 'drawing'
 
 module Aqueductron
   class CountingEndPiece
@@ -12,5 +13,11 @@ module Aqueductron
     def receive msg
       CountingEndPiece.new(@so_far + 1)
     end
+
+    def draw
+      desc = (@so_far > 0) ? "# (#{@so_far})" : "#"
+      Drawing.draw_end_piece(desc)
+    end
+
   end
 end

data/lib/aqueductron/drawing.rb

@@ -0,0 +1,52 @@
+module Aqueductron
+  module Drawing
+    def self.draw_mid_piece(description)
+      dashes = "-" * description.length
+      [dashes, description, dashes]
+    end
+    def self.draw_end_piece(symbol)
+      ["\\", " #{symbol}", "/"]
+    end
+    def self.joint_prefix
+       [" / ","<  ", ' \\ ']
+    end
+
+    def self.draw_multiple_paths(paths)
+      ducts = paths.keys.map{ |k| Drawing.horizontal_concat(Drawing.draw_mid_piece(" #{k.to_s} "), paths[k].draw) }.flatten(1)
+    end
+
+    def self.horizontal_concat(first, second)
+      # I <3 Ruby. this kind of recursive ref doesn't work in Scala
+      identity = ->(piece,msg) { piece.pass_on(msg, identity)}
+      concat_one_of_these= ->(array) {
+        ->(piece,msg) {
+           (head, *tail) = array
+           if (tail.empty?)
+             piece.pass_on(msg + head, identity)
+           else
+             piece.pass_on(msg + head, concat_one_of_these.call(tail))
+           end
+        }
+      }
+      centeredSecond = centered_on(first.length, second)
+      centered_first = centered_on(second.length, first, padding(first), padding(first))
+      duct = Duct.new.custom(concat_one_of_these.call(centeredSecond)).array()
+      duct.flow(centered_first).value
+    end
+
+    private
+    def self.centered_on(length, array, paddingBefore = "", paddingAfter = "")
+      if (length <= array.length)
+        array
+      else
+        top_spacing = (length - array.length) / 2
+        bottom_spacing = ((length - array.length) / 2.0).ceil
+        ([paddingBefore] * top_spacing) + array + ([paddingAfter] * bottom_spacing)
+      end
+    end
+
+    def self.padding(array)
+      " " * array.first.length
+    end
+  end
+end

data/lib/aqueductron/end_piece.rb

@@ -1,5 +1,6 @@
 require_relative 'piece_common'
 require_relative 'simple_result'
+require_relative 'drawing'
 
 module Aqueductron
   class EndPiece
@@ -16,5 +17,9 @@ module Aqueductron
     def receive msg
       EndPiece.new(@monoid, @monoid.append(@so_far, msg))
     end
+
+    def draw
+      Drawing.draw_end_piece(@monoid.symbol)
+    end
   end
 end

data/lib/aqueductron/inlet.rb

@@ -9,16 +9,16 @@ module Aqueductron
       flow_internal(source.each)
     end
 
-    def flow_internal(source)
+    def flow_internal(source, send_eof = true)
       result = begin
                  response = @next_piece.receive(source.next)
                  if (response.result?) then
                    response
                  else #it's another piece
-                   Inlet.new(response, @done_or_not).flow_internal(source)
+                   Inlet.new(response, @done_or_not).flow_internal(source, send_eof)
                  end
                rescue StopIteration
-                 if (@done_or_not == :done) then
+                 if (@done_or_not == :done && send_eof) then
                    @next_piece.eof
                  else
                    @next_piece

data/lib/aqueductron/joint_piece.rb

@@ -1,5 +1,6 @@
 require_relative 'compound_result'
 require_relative 'piece_common'
+require_relative 'drawing'
 
 module Aqueductron
   class JointPiece
@@ -24,6 +25,12 @@ module Aqueductron
       construct_compound_result(new_map)
     end
 
+
+    def draw
+      prefix = Drawing.joint_prefix
+      ducts = Drawing.draw_multiple_paths(@paths)
+      Drawing.horizontal_concat(prefix, ducts)
+    end
     private
     def construct_compound_result(paths)
       CompoundResult.new(paths)

data/lib/aqueductron/last_end_piece.rb

@@ -1,4 +1,5 @@
 require_relative 'piece_common'
+require_relative 'drawing'
 
 module Aqueductron
   class LastEndPiece
@@ -12,5 +13,9 @@ module Aqueductron
     def receive msg
       LastEndPiece.new(msg)
     end
+    def draw
+      desc = (@most_recent == :no_data)? "last" : "last (#{@most_recent})"
+      Drawing.draw_end_piece(desc)
+    end
   end
 end

data/lib/aqueductron/monoid.rb

@@ -1,9 +1,10 @@
 module Aqueductron
   class Monoid
-    attr_reader :zero
-    def initialize(zero, add_lambda)
+    attr_reader :zero, :symbol
+    def initialize(zero, add_lambda, symbol = "+")
       @zero = zero
       @append = add_lambda
+      @symbol = symbol
     end
     def append(a,b)
       @append.call(a,b)

data/lib/aqueductron/partition.rb

@@ -35,6 +35,12 @@ module Aqueductron
       construct_compound_result(new_map)
     end
 
+    def draw
+      ducts = Drawing.draw_multiple_paths(@paths)
+      paths = (ducts + ["+?"]).flatten
+      Drawing.horizontal_concat(Drawing.joint_prefix, paths)
+    end
+
     private
     def construct_compound_result(paths)
       CompoundResult.new(paths)

data/lib/aqueductron/piece.rb

@@ -1,13 +1,20 @@
 require_relative 'piece_common'
+require_relative 'drawing'
 
 module Aqueductron
   class Piece
     attr_reader :destination
     include PieceCommon
 
-    def initialize(destination, what_to_do)
+    def draw
+      desc = " " + @description + " "
+      Drawing.horizontal_concat(Drawing.draw_mid_piece(desc),@destination.draw)
+    end
+
+    def initialize(destination, what_to_do, description = "~")
       @destination = destination
       @what_to_do = what_to_do
+      @description = description
     end
 
     def receive(msg)
@@ -18,12 +25,12 @@ module Aqueductron
       send_eof
     end
 
-    def pass_on(msg, what_to_do_next)
+    def pass_on(msg, what_to_do_next, description = "~")
       next_destination = @destination.receive(msg)
       if (next_destination.result?) then
-        next_destination
+        next_destination # not a destination at all; result
       else
-        Piece.new(next_destination, what_to_do_next)
+        Piece.new(next_destination, what_to_do_next, description)
       end
     end
     def send_eof

data/lib/aqueductron/piece_common.rb

@@ -3,8 +3,17 @@ module Aqueductron
     def flow(source)
       Inlet.new(self).flow_internal(source.each)
     end
+    def keep_flowing(source)
+      Inlet.new(self).flow_internal(source.each, false)
+    end
+    def drip(one_thing)
+      keep_flowing([one_thing])
+    end
     def result?
       false
     end
+    def inspect
+      "Duct:\n" + draw.join("\n")
+    end
   end
 end

data/lib/aqueductron/result.rb

@@ -3,5 +3,8 @@ module Aqueductron
     def result?
       true
     end
+    def inspect
+      "Result:\n" + draw.join("\n")
+    end
   end
 end

data/lib/aqueductron/simple_result.rb

@@ -14,5 +14,13 @@ module Aqueductron
     def value
       @value
     end
+
+    def to_hash
+      @value
+    end
+
+    def draw
+      [ "=> #{@value}"]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aqueductron
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jessica Kerr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies: []
 description: Aqueductron lets you create a path for data, then flow data through it,
   then find the results at the end. It encourages a functional style, avoiding mutable
@@ -18,9 +18,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/aqueductron/array_end_piece.rb
 - lib/aqueductron/buildering.rb
 - lib/aqueductron/compound_result.rb
 - lib/aqueductron/counting_end_piece.rb
+- lib/aqueductron/drawing.rb
 - lib/aqueductron/duct.rb
 - lib/aqueductron/end_piece.rb
 - lib/aqueductron/inlet.rb