Merge branch 'refactoring'

Author: mrkn

lib/unicode_plot/barplot.rb

@@ -3,7 +3,6 @@ class Barplot < Plot
     include ValueTransformer
 
     MIN_WIDTH = 10
-    DEFAULT_WIDTH = 40
     DEFAULT_COLOR = :green
     DEFAULT_SYMBOL = "■"
 
@@ -68,16 +67,10 @@ def print_row(out, row_index)
       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,

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 @@ def initialize(data, width, color, min_x, max_x, **kw)
       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 @@ def print_row(out, row_index)
         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

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
 

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 @@ def initialize(title: nil,
       @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 != ""
@@ -135,5 +136,11 @@ def to_s
       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