unicode_plot 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33753adec2204f206dff50057dbf735be77c5d1596d8386b103058e76355ba2
-  data.tar.gz: 3209b35c716a2e8293735a6f774185f12c6627996707fb28c59fec3ac02debd7
+  metadata.gz: d3752009f07860fb96eba974ed4322ab975bd5547832e7747c95544918ad96c6
+  data.tar.gz: 1e86d05df7dd39473144ed8b26ec00b32980f6d61a684f978e7a6c914d42b71f
 SHA512:
-  metadata.gz: dc5c517d8bdbce3d622767d03e4775365d51ac8a1e882e96d4aaba16c05345c66f0431be9f1eb79ad5cbcbfdfb92e395f06dba5f8f18c8a98b9f93491c25235d
-  data.tar.gz: b5aa69592cf09b140c1dff55edeafbc8204929fe99125dd67d31218286157f4beaa93051da151e5efddcefd24054ec08d458b1aeeee0ac0acabe26813b348b48
+  metadata.gz: 68c546819e475ddb1a5e24114b8a8fae8bb0809e723870abfe8cb3583ce838fedb7601b051085f38898ac039e58addee618651f446ed9a22f9d627f64775e2cc
+  data.tar.gz: 86da79ec98b4d5c461bb0c3c27632fb3fda90e457066dcc5efa987d402f1e93c7a55e1330551eef270c1bb71f68a9ba3c9c24b578c7f6f8ad617ac7167d65433

data/README.md

@@ -10,7 +10,7 @@ $ gem install unicode_plot
 
 ## Usage
 
-```
+```ruby
 require 'unicode_plot'
 
 x = 0.step(3*Math::PI, by: 3*Math::PI / 30)
@@ -28,12 +28,59 @@ You can get the results below by running the above script:
 
 ## Supported charts
 
-- barplot
-- boxplot
-- densityplot
-- histogram
-- lineplot
-- scatterplot
+### barplot
+
+```ruby
+plot = UnicodePlot.barplot(data: {'foo': 20, 'bar': 50}, title: "Bar")
+plot.render($stdout)
+```
+
+<img src="img/barplot.png" width="50%" />
+
+### boxplot
+
+```ruby
+plot = UnicodePlot.boxplot(data: {foo: [1, 3, 5], bar: [3, 5, 7]}, title: "Box")
+plot.render($stdout)
+```
+
+<img src="img/boxplot.png" width="50%" />
+
+### densityplot
+
+```ruby
+x = Array.new(500) { 20*rand - 10 } + Array.new(500) { 6*rand - 3 }
+y = Array.new(1000) { 30*rand - 10 }
+plot = UnicodePlot.densityplot(x, y, title: "Density")
+plot.render($stdout)
+```
+
+<img src="img/densityplot.png" width="50%" />
+
+### histogram
+
+```ruby
+x = Array.new(100) { rand(10) } + Array.new(100) { rand(30) + 10 }
+plot = UnicodePlot.histogram(x, title: "Histogram")
+plot.render($stdout)
+```
+
+<img src="img/histogram.png" width="50%" />
+
+### lineplot
+
+See [Usage](#usage) section above.
+
+### scatterplot
+
+```ruby
+x = Array.new(50) { rand(20) - 10 }
+y = x.map {|xx| xx*rand(30) - 10 }
+plot = UnicodePlot.scatterplot(x, y, title: "Scatter")
+plot.render($stdout)
+```
+
+<img src="img/scatterplot.png" width="50%" />
 
 ## Acknowledgement
 

data/lib/unicode_plot.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 require 'unicode_plot/version'
 
 require 'unicode_plot/utils'

data/lib/unicode_plot/barplot.rb

@@ -3,7 +3,6 @@ module UnicodePlot
     include ValueTransformer
 
     MIN_WIDTH = 10
-    DEFAULT_WIDTH = 40
     DEFAULT_COLOR = :green
     DEFAULT_SYMBOL = "■"
 
@@ -68,16 +67,10 @@ module UnicodePlot
       end
       [max, i]
     end
-
-    private def check_row_index(row_index)
-      unless 0 <= row_index && row_index < n_rows
-        raise ArgumentError, "row_index is out of range"
-      end
-    end
   end
 
   module_function def barplot(*args,
-                              width: Barplot::DEFAULT_WIDTH,
+                              width: Plot::DEFAULT_WIDTH,
                               color: Barplot::DEFAULT_COLOR,
                               symbol: Barplot::DEFAULT_SYMBOL,
                               border: :barplot,

data/lib/unicode_plot/boxplot.rb

@@ -4,7 +4,6 @@ module UnicodePlot
   class Boxplot < Plot
     MIN_WIDTH = 10
     DEFAULT_COLOR = :green
-    DEFAULT_WIDTH = 40
 
     def initialize(data, width, color, min_x, max_x, **kw)
       if min_x == max_x
@@ -20,7 +19,8 @@ module UnicodePlot
       super(**kw)
     end
 
-    attr_reader :min_x, :max_x
+    attr_reader :min_x
+    attr_reader :max_x
 
     def n_data
       @data.length
@@ -89,19 +89,13 @@ module UnicodePlot
         val.round(half: :even).clamp(1, @width).to_i
       end
     end
-
-    private def check_row_index(row_index)
-      unless 0 <= row_index && row_index < n_rows
-        raise ArgumentError, "row_index out of bounds"
-      end
-    end
   end
 
   module_function def boxplot(*args,
                               data: nil,
                               border: :corners,
                               color: Boxplot::DEFAULT_COLOR,
-                              width: Boxplot::DEFAULT_WIDTH,
+                              width: Plot::DEFAULT_WIDTH,
                               xlim: [0, 0],
                               **kw)
     case args.length

data/lib/unicode_plot/grid_plot.rb

@@ -1,7 +1,6 @@
 module UnicodePlot
   class GridPlot < Plot
     MIN_WIDTH = 5
-    DEFAULT_WIDTH = 40
     MIN_HEIGHT = 2
     DEFAULT_HEIGHT = 15
 

data/lib/unicode_plot/layout.rb

@@ -0,0 +1,51 @@
+module UnicodePlot
+  class GridLayout
+    DEFAULT_WIDTH = 80
+
+    def initialize(n_rows, n_columns, width: Layout::DEFAULT_WIDTH)
+      @n_rows = n_rows
+      @n_columns = n_columns
+      @width = width
+    end
+
+    def [](i, j)
+      @plots[i * n_cols + j]
+    end
+
+    def []=(i, j, plot)
+      @plots[i * n_cols + j] = plot
+    end
+
+    def <<(plot)
+      @plots << plot
+    end
+
+    def render(out)
+      buffers = []
+      (0 ... n_rows).each do |i|
+        (0 ... n_columns).each do |j|
+          StringIO.open do |sio|
+            def sio.tty?; true; end
+            render_cell(sio, i, j)
+            sio.close
+            buffers << sio.string
+          end
+        end
+      end
+    end
+
+    def render_cell(out, i, j)
+      plot = self[i, j]
+      return unless plot
+      plot.width = cell_width
+    end
+  end
+
+  module_function def grid_layout(n_rows, n_cols, *plots, **kw)
+    grid = GridLayout.new(n_rows, n_cols, **kw)
+    plots.each do |plot|
+      grid << plot
+    end
+    grid
+  end
+end

data/lib/unicode_plot/plot.rb

@@ -2,6 +2,7 @@ module UnicodePlot
   class Plot
     include StyledPrinter
 
+    DEFAULT_WIDTH = 40
     DEFAULT_BORDER = :solid
     DEFAULT_MARGIN = 3
     DEFAULT_PADDING = 1
@@ -29,18 +30,18 @@ module UnicodePlot
       @auto_color = 0
     end
 
-    attr_reader :title,
-                :xlabel,
-                :ylabel,
-                :border,
-                :margin,
-                :padding,
-                :labels_left,
-                :colors_left,
-                :labels_right,
-                :colors_right,
-                :decorations,
-                :colors_deco
+    attr_reader :title
+    attr_reader :xlabel
+    attr_reader :ylabel
+    attr_reader :border
+    attr_reader :margin
+    attr_reader :padding
+    attr_reader :labels_left
+    attr_reader :colors_left
+    attr_reader :labels_right
+    attr_reader :colors_right
+    attr_reader :decorations
+    attr_reader :colors_deco
 
     def title_given?
       title && title != ""
@@ -102,8 +103,8 @@ module UnicodePlot
       end
     end
 
-    def render(out)
-      Renderer.render(out, self)
+    def render(out=$stdout, newline: true)
+      Renderer.render(out, self, newline)
     end
 
     COLOR_CYCLE = [
@@ -123,7 +124,7 @@ module UnicodePlot
 
     def to_s
       StringIO.open do |sio|
-        render(sio)
+        render(sio, newline: false)
         sio.close
         sio.string
       end
@@ -135,5 +136,11 @@ module UnicodePlot
       end
       margin
     end
+
+    private def check_row_index(row_index)
+      unless 0 <= row_index && row_index < n_rows
+        raise ArgumentError, "row_index out of bounds"
+      end
+    end
   end
 end

data/lib/unicode_plot/renderer.rb

@@ -59,8 +59,8 @@ module UnicodePlot
   class Renderer
     include BorderPrinter
 
-    def self.render(out, plot)
-      new(plot).render(out)
+    def self.render(out, plot, newline)
+      new(plot).render(out, newline)
     end
 
     def initialize(plot)
@@ -71,13 +71,14 @@ module UnicodePlot
     attr_reader :plot
     attr_reader :out
 
-    def render(out)
+    def render(out, newline)
       @out = out
       init_render
 
       render_top
       render_rows
       render_bottom
+      out.puts if newline
     end
 
     private

data/lib/unicode_plot/version.rb

@@ -1,5 +1,5 @@
 module UnicodePlot
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 
   module Version
     numbers, TAG = VERSION.split("-", 2)

data/test/test-barplot.rb

@@ -15,12 +15,12 @@ class BarplotTest < Test::Unit::TestCase
     test("colored") do
       data = { bar: 23, foo: 37 }
       plot = UnicodePlot.barplot(data: data)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/default.txt").read,
                    output)
 
       plot = UnicodePlot.barplot([:bar, :foo], [23, 37])
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/default.txt").read,
                    output)
     end
@@ -40,7 +40,7 @@ class BarplotTest < Test::Unit::TestCase
     test("mixed") do
       data = { bar: 23.0, 2.1 => 10, foo: 37.0 }
       plot = UnicodePlot.barplot(data: data)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/default_mixed.txt").read,
                    output)
     end
@@ -53,7 +53,7 @@ class BarplotTest < Test::Unit::TestCase
           title: "Logscale Plot",
           xscale: :log10
         )
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("barplot/log10.txt").read,
                      output)
       end
@@ -66,7 +66,7 @@ class BarplotTest < Test::Unit::TestCase
           xlabel: "custom label",
           xscale: :log10
         )
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("barplot/log10_label.txt").read,
                      output)
       end
@@ -83,7 +83,7 @@ class BarplotTest < Test::Unit::TestCase
           margin: 7,
           padding: 3
         )
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("barplot/parameters1.txt").read,
                      output)
       end
@@ -99,7 +99,7 @@ class BarplotTest < Test::Unit::TestCase
           padding: 3,
           labels: false
         )
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("barplot/parameters1_nolabels.txt").read,
                      output)
       end
@@ -115,7 +115,7 @@ class BarplotTest < Test::Unit::TestCase
           symbol: "=",
           width: 60
         )
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("barplot/parameters2.txt").read,
                      output)
       end
@@ -123,21 +123,21 @@ class BarplotTest < Test::Unit::TestCase
 
     test("ranges") do
       plot = UnicodePlot.barplot(2..6, 11..15)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/ranges.txt").read,
                    output)
     end
 
     test("all zeros") do
       plot = UnicodePlot.barplot([5, 4, 3, 2, 1], [0, 0, 0, 0, 0])
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/edgecase_zeros.txt").read,
                    output)
     end
 
     test("one large") do
       plot = UnicodePlot.barplot([:a, :b, :c, :d], [1, 1, 1, 1000000])
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/edgecase_onelarge.txt").read,
                    output)
     end
@@ -159,21 +159,21 @@ class BarplotTest < Test::Unit::TestCase
       plot = UnicodePlot.barplot([:bar, :foo], [23, 37])
       assert_same(plot,
                   UnicodePlot.barplot!(plot, ["zoom"], [90]))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/default2.txt").read,
                    output)
 
       plot = UnicodePlot.barplot([:bar, :foo], [23, 37])
       assert_same(plot,
                   UnicodePlot.barplot!(plot, "zoom", 90))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/default2.txt").read,
                    output)
 
       plot = UnicodePlot.barplot([:bar, :foo], [23, 37])
       assert_same(plot,
                   UnicodePlot.barplot!(plot, data: { zoom: 90 }))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/default2.txt").read,
                    output)
     end
@@ -182,7 +182,7 @@ class BarplotTest < Test::Unit::TestCase
       plot = UnicodePlot.barplot(2..6, 11..15)
       assert_same(plot,
                   UnicodePlot.barplot!(plot, 9..10, 20..21))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("barplot/ranges2.txt").read,
                    output)
     end

data/test/test-boxplot.rb

@@ -6,14 +6,14 @@ class BoxplotTest < Test::Unit::TestCase
     sub_test_case("print to tty") do
       test("without name") do
         plot = UnicodePlot.boxplot([1, 2, 3, 4, 5])
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("boxplot/default.txt").read,
                      output)
       end
 
       test("with name") do
         plot = UnicodePlot.boxplot("series1", [1, 2, 3, 4, 5])
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("boxplot/default_name.txt").read,
                      output)
       end
@@ -28,14 +28,14 @@ class BoxplotTest < Test::Unit::TestCase
       end
 
       test("print to tty") do
-        _, output = with_term { @plot.render($stdout) }
+        _, output = with_term { @plot.render($stdout, newline: false) }
         assert_equal(fixture_path("boxplot/default_parameters.txt").read,
                      output)
       end
 
       test("print to non-tty IO") do
         output = StringIO.open do |sio|
-          @plot.render(sio)
+          @plot.render(sio, newline: false)
           sio.close
           sio.string
         end
@@ -49,7 +49,7 @@ class BoxplotTest < Test::Unit::TestCase
     test("with scaling") do
       i, max_x = data
       plot = UnicodePlot.boxplot([1, 2, 3, 4, 5], xlim: [0, max_x])
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("boxplot/scale#{i}.txt").read,
                    output)
     end
@@ -63,19 +63,19 @@ class BoxplotTest < Test::Unit::TestCase
                                  title: "Multi-series",
                                  xlabel: "foo",
                                  color: :yellow)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("boxplot/multi1.txt").read,
                    output)
 
       assert_same(plot,
                   UnicodePlot.boxplot!(plot, "one more", [-1, 2, 3, 4, 11]))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("boxplot/multi2.txt").read,
                    output)
 
       assert_same(plot,
                   UnicodePlot.boxplot!(plot, [4, 2, 2.5, 4, 14], name: "last one"))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("boxplot/multi3.txt").read,
                    output)
     end

data/test/test-densityplot.rb

@@ -16,7 +16,7 @@ class DensityplotTest < Test::Unit::TestCase
     dy2 = @dy.map {|y| y + 2 }
     assert_same(plot,
                 UnicodePlot.densityplot!(plot, dx2, dy2))
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     expected = fixture_path("scatterplot/densityplot.txt").read
     assert_equal(output, expected)
   end
@@ -31,7 +31,7 @@ class DensityplotTest < Test::Unit::TestCase
     dy2 = @dy.map {|y| y + 2 }
     assert_same(plot,
                 UnicodePlot.densityplot!(plot, dx2, dy2, name: "bar"))
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     expected = fixture_path("scatterplot/densityplot_parameters.txt").read
     assert_equal(output, expected)
   end

data/test/test-histogram.rb

@@ -10,8 +10,9 @@ class HistogramTest < Test::Unit::TestCase
     test("default") do
       plot = UnicodePlot.histogram(@x)
       _, output = with_term { plot.render($stdout) }
+      assert_equal("\n", output[-1])
       assert_equal(fixture_path("histogram/default.txt").read,
-                   output)
+                   output.chomp)
     end
 
     test("nocolor") do
@@ -21,13 +22,14 @@ class HistogramTest < Test::Unit::TestCase
         sio.close
         sio.string
       end
+      assert_equal("\n", output[-1])
       assert_equal(fixture_path("histogram/default_nocolor.txt").read,
-                   output)
+                   output.chomp)
     end
 
     test("losed: :left") do
       plot = UnicodePlot.histogram(@x, closed: :left)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("histogram/default.txt").read,
                    output)
     end
@@ -35,7 +37,7 @@ class HistogramTest < Test::Unit::TestCase
     test("x 100") do
       x100 = @x.map {|a| a * 100 }
       plot = UnicodePlot.histogram(x100)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("histogram/default_1e2.txt").read,
                    output)
     end
@@ -43,28 +45,28 @@ class HistogramTest < Test::Unit::TestCase
     test("x0.01") do
       x100 = @x.map {|a| a * 0.01 }
       plot = UnicodePlot.histogram(x100)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("histogram/default_1e-2.txt").read,
                    output)
     end
 
     test("xscale: :log10") do
       plot = UnicodePlot.histogram(@x, xscale: :log10)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("histogram/log10.txt").read,
                    output)
     end
 
     test("xscale: :log10 with custom label") do
       plot = UnicodePlot.histogram(@x, xscale: :log10, xlabel: "custom label")
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("histogram/log10_label.txt").read,
                    output)
     end
 
     test("nbins: 5, closed: :right") do
       plot = UnicodePlot.histogram(@x, nbins: 5, closed: :right)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("histogram/hist_params.txt").read,
                    output)
     end
@@ -76,7 +78,7 @@ class HistogramTest < Test::Unit::TestCase
                                    color: :blue,
                                    margin: 7,
                                    padding: 3)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("histogram/parameters1.txt").read,
                    output)
     end
@@ -89,7 +91,7 @@ class HistogramTest < Test::Unit::TestCase
                                    margin: 7,
                                    padding: 3,
                                    labels: false)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("histogram/parameters1_nolabels.txt").read,
                    output)
     end
@@ -102,9 +104,15 @@ class HistogramTest < Test::Unit::TestCase
                                    border: :solid,
                                    symbol: "=",
                                    width: 50)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("histogram/parameters2.txt").read,
                    output)
     end
+
+    test("issue #24") do
+      assert_nothing_raised do
+        UnicodePlot.histogram([1, 2])
+      end
+    end
   end
 end

data/test/test-lineplot.rb

@@ -26,36 +26,36 @@ class LineplotTest < Test::Unit::TestCase
     sub_test_case("with numeric array") do
       test("default") do
         plot = UnicodePlot.lineplot(@x, @y)
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("lineplot/default.txt").read,
                      output)
 
         plot = UnicodePlot.lineplot(@x.map(&:to_f), @y)
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("lineplot/default.txt").read,
                      output)
 
         plot = UnicodePlot.lineplot(@x, @y.map(&:to_f))
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("lineplot/default.txt").read,
                      output)
       end
 
       test("y only") do
         plot = UnicodePlot.lineplot(@y)
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("lineplot/y_only.txt").read,
                      output)
       end
 
       test("range") do
         plot = UnicodePlot.lineplot(6..10)
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("lineplot/range1.txt").read,
                      output)
 
         plot = UnicodePlot.lineplot(11..15, 6..10)
-        _, output = with_term { plot.render($stdout) }
+        _, output = with_term { plot.render($stdout, newline: false) }
         assert_equal(fixture_path("lineplot/range2.txt").read,
                      output)
       end
@@ -66,7 +66,7 @@ class LineplotTest < Test::Unit::TestCase
         @x.map {|x| x * 1e+3 + 15 },
         @y.map {|y| y * 1e-3 - 15 }
       )
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/scale1.txt").read,
                    output)
 
@@ -74,19 +74,19 @@ class LineplotTest < Test::Unit::TestCase
         @x.map {|x| x * 1e-3 + 15 },
         @y.map {|y| y * 1e+3 - 15 }
       )
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/scale2.txt").read,
                    output)
 
       tx = [-1.0, 2, 3, 700000]
       ty = [1.0, 2, 9, 4000000]
       plot = UnicodePlot.lineplot(tx, ty)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/scale3.txt").read,
                    output)
 
       plot = UnicodePlot.lineplot(tx, ty, width: 5, height: 5)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/scale3_small.txt").read,
                    output)
     end
@@ -97,7 +97,7 @@ class LineplotTest < Test::Unit::TestCase
 
       y1 = v.map(&Math.method(:sin))
       plot = UnicodePlot.lineplot(d, y1, name: "sin", height: 5, xlabel: "date")
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/dates1.txt").read,
                    output)
 
@@ -105,7 +105,7 @@ class LineplotTest < Test::Unit::TestCase
       assert_same(plot,
                   UnicodePlot.lineplot!(plot, d, y2, name: "cos"))
 
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/dates2.txt").read,
                    output)
     end
@@ -114,34 +114,34 @@ class LineplotTest < Test::Unit::TestCase
       plot = UnicodePlot.lineplot(@y)
       assert_same(plot,
                   UnicodePlot.lineplot!(plot, -3, 1))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/slope1.txt").read,
                    output)
 
       assert_same(plot,
                   UnicodePlot.lineplot!(plot, -4, 0.5, color: :cyan, name: "foo"))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/slope2.txt").read,
                    output)
     end
 
     test("limits") do
       plot = UnicodePlot.lineplot(@x, @y, xlim: [-1.5, 3.5], ylim: [-5.5, 2.5])
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/limits.txt").read,
                    output)
     end
 
     test("nogrid") do
       plot = UnicodePlot.lineplot(@x, @y, grid: false)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/nogrid.txt").read,
                    output)
     end
 
     test("color: :blue") do
       plot = UnicodePlot.lineplot(@x, @y, color: :blue, name: "points1")
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/blue.txt").read,
                    output)
     end
@@ -152,7 +152,7 @@ class LineplotTest < Test::Unit::TestCase
                                   title: "Scatter",
                                   xlabel: "x",
                                   ylabel: "y")
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/parameters1.txt").read,
                    output)
 
@@ -160,7 +160,7 @@ class LineplotTest < Test::Unit::TestCase
                   UnicodePlot.lineplot!(plot,
                                         [0.5, 1, 1.5],
                                         name: "points2"))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/parameters2.txt").read,
                    output)
 
@@ -169,11 +169,11 @@ class LineplotTest < Test::Unit::TestCase
                                         [-0.5, 0.5, 1.5],
                                         [0.5, 1, 1.5],
                                         name: "points3"))
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/parameters3.txt").read,
                    output)
       output = StringIO.open do |sio|
-        plot.render(sio)
+        plot.render(sio, newline: false)
         sio.close
         sio.string
       end
@@ -187,7 +187,7 @@ class LineplotTest < Test::Unit::TestCase
                                   canvas: :dot,
                                   width: 10,
                                   height: 5)
-      _, output = with_term { plot.render($stdout) }
+      _, output = with_term { plot.render($stdout, newline: false) }
       assert_equal(fixture_path("lineplot/canvassize.txt").read,
                    output)
     end

data/test/test-plot.rb

@@ -0,0 +1,20 @@
+require 'stringio'
+
+class TestPlot < Test::Unit::TestCase
+  sub_test_case("#render") do
+    test("render to $stdout when no arguments") do
+      sio = StringIO.new
+      UnicodePlot.barplot(data: {a: 23, b: 37}).render(sio)
+
+      begin
+        save_stdout, $stdout = $stdout, StringIO.new
+        UnicodePlot.barplot(data: {a: 23, b: 37}).render
+        assert do
+          sio.string == $stdout.string
+        end
+      ensure
+        $stdout = save_stdout
+      end
+    end
+  end
+end

data/test/test-scatterplot.rb

@@ -24,28 +24,28 @@ class ScatterplotTest < Test::Unit::TestCase
 
   test("default") do
     plot = UnicodePlot.scatterplot(@x, @y)
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/default.txt").read,
                  output)
   end
 
   test("y only") do
     plot = UnicodePlot.scatterplot(@y)
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/y_only.txt").read,
                  output)
   end
 
   test("one range") do
     plot = UnicodePlot.scatterplot(6..10)
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/range1.txt").read,
                  output)
   end
 
   test("two ranges") do
     plot = UnicodePlot.scatterplot(11..15, 6..10)
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/range2.txt").read,
                  output)
   end
@@ -54,7 +54,7 @@ class ScatterplotTest < Test::Unit::TestCase
     x = @x.map {|a| a * 1e3 + 15 }
     y = @y.map {|a| a * 1e-3 - 15 }
     plot = UnicodePlot.scatterplot(x, y)
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/scale1.txt").read,
                  output)
   end
@@ -63,7 +63,7 @@ class ScatterplotTest < Test::Unit::TestCase
     x = @x.map {|a| a * 1e-3 + 15 }
     y = @y.map {|a| a * 1e3 - 15 }
     plot = UnicodePlot.scatterplot(x, y)
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/scale2.txt").read,
                  output)
   end
@@ -72,28 +72,28 @@ class ScatterplotTest < Test::Unit::TestCase
     miny = -1.2796649117521434e218
     maxy = -miny
     plot = UnicodePlot.scatterplot([1], [miny], xlim: [1, 1], ylim: [miny, maxy])
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     expected = fixture_path("scatterplot/scale3.txt").read
     assert_equal(expected, output)
   end
 
   test("limits") do
     plot = UnicodePlot.scatterplot(@x, @y, xlim: [-1.5, 3.5], ylim: [-5.5, 2.5])
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/limits.txt").read,
                  output)
   end
 
   test("nogrid") do
     plot = UnicodePlot.scatterplot(@x, @y, grid: false)
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/nogrid.txt").read,
                  output)
   end
 
   test("blue") do
     plot = UnicodePlot.scatterplot(@x, @y, color: :blue, name: "points1")
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/blue.txt").read,
                  output)
   end
@@ -104,7 +104,7 @@ class ScatterplotTest < Test::Unit::TestCase
                                    title: "Scatter",
                                    xlabel: "x",
                                    ylabel: "y")
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     expected = fixture_path("scatterplot/parameters1.txt").read
     assert_equal(expected, output)
 
@@ -112,7 +112,7 @@ class ScatterplotTest < Test::Unit::TestCase
                 UnicodePlot.scatterplot!(plot,
                                          [0.5, 1, 1.5],
                                          name: "points2"))
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/parameters2.txt").read,
                  output)
 
@@ -121,11 +121,11 @@ class ScatterplotTest < Test::Unit::TestCase
                                          [-0.5, 0.5, 1.5],
                                          [0.5, 1, 1.5],
                                          name: "points3"))
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     assert_equal(fixture_path("scatterplot/parameters3.txt").read,
                  output)
     output = StringIO.open do |sio|
-      plot.render(sio)
+      plot.render(sio, newline: false)
       sio.close
       sio.string
     end
@@ -139,7 +139,7 @@ class ScatterplotTest < Test::Unit::TestCase
                                    canvas: :dot,
                                    width: 10,
                                    height: 5)
-    _, output = with_term { plot.render($stdout) }
+    _, output = with_term { plot.render($stdout, newline: false) }
     expected = fixture_path("scatterplot/canvassize.txt").read
     assert_equal(expected, output)
   end

data/unicode_plot.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "enumerable-statistics", ">= 2.0.0.pre"
+  spec.add_runtime_dependency "enumerable-statistics", ">= 2.0.1"
 
   spec.add_development_dependency "bundler", ">= 1.17"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicode_plot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - mrkn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2020-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enumerable-statistics
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ files:
 - lib/unicode_plot/dot_canvas.rb
 - lib/unicode_plot/grid_plot.rb
 - lib/unicode_plot/histogram.rb
+- lib/unicode_plot/layout.rb
 - lib/unicode_plot/lineplot.rb
 - lib/unicode_plot/lookup_canvas.rb
 - lib/unicode_plot/plot.rb
@@ -107,6 +108,8 @@ files:
 - test/test-densityplot.rb
 - test/test-histogram.rb
 - test/test-lineplot.rb
+- test/test-plot.rb
+- test/test-result.rb
 - test/test-scatterplot.rb
 - unicode_plot.gemspec
 homepage: https://github.com/red-data-tools/unicode_plot.rb
@@ -128,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Plot your data by Unicode characters
@@ -139,7 +142,9 @@ test_files:
 - test/helper.rb
 - test/test-lineplot.rb
 - test/test-densityplot.rb
+- test/test-plot.rb
 - test/test-canvas.rb
+- test/test-result.rb
 - test/test-histogram.rb
 - test/helper/with_term.rb
 - test/helper/fixture.rb