gruff 0.28.0-java → 0.30.0-java

data/lib/gruff/bezier.rb

@@ -23,6 +23,7 @@
 class Gruff::Bezier < Gruff::Base
 private
 
+  # @rbs return: void
   def draw_graph
     x_increment = (@graph_width / (column_count - 1)).to_f
 

data/lib/gruff/box.rb

@@ -26,6 +26,7 @@ class Gruff::Box < Gruff::Base
   # Default value is +0.8+.
   #
   # @rbs space_percent: Float | Integer
+  # @rbs return: void
   def spacing_factor=(space_percent)
     raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' if (space_percent < 0) || (space_percent > 1)
 
@@ -34,6 +35,7 @@ class Gruff::Box < Gruff::Base
 
 private
 
+  # @rbs return: void
   def initialize_attributes
     super
     @fill_opacity = 0.2
@@ -41,6 +43,7 @@ private
     @spacing_factor = 0.8
   end
 
+  # @rbs return: void
   def draw_graph
     # Setup the BarConversion Object
     conversion = Gruff::BarConversion.new(
@@ -93,6 +96,7 @@ private
     end
   end
 
+  # @rbs return: Array[Gruff::Box::BoxData]
   def normalized_boxes
     @normalized_boxes ||= store.norm_data.map { |data| Gruff::Box::BoxData.new(data.label, data.points, data.color) }
   end
@@ -113,6 +117,10 @@ private
     attr_accessor :points #: Array[Float | Integer]
     attr_accessor :color #: String
 
+    # @rbs label: String
+    # @rbs points: Array[Float | Integer]
+    # @rbs color: String
+    # @rbs return: void
     def initialize(label, points, color)
       @label = label
       @points = points.compact.sort

data/lib/gruff/bubble.rb

@@ -60,6 +60,7 @@ class Gruff::Bubble < Gruff::Scatter
   # @rbs y_data_points: Array[nil | Float | Integer] | nil
   # @rbs point_sizes: Array[nil | Float | Integer] | nil
   # @rbs color: String
+  # @rbs return: void
   def data(name, x_data_points = [], y_data_points = [], point_sizes = [], color = nil)
     # make sure it's an array
     x_data_points = Array(x_data_points)
@@ -78,10 +79,12 @@ class Gruff::Bubble < Gruff::Scatter
 
 private
 
+  # @rbs return: void
   def initialize_store
     @store = Gruff::Store.new(Gruff::Store::XYPointsizeData)
   end
 
+  # @rbs return: void
   def initialize_attributes
     super
 
@@ -89,6 +92,7 @@ private
     @stroke_width = 1.0
   end
 
+  # @rbs return: void
   def draw_graph
     store.norm_data.each do |data_row|
       data_row.coordinate_and_pointsizes.each do |x_value, y_value, point_size|

data/lib/gruff/bullet.rb

@@ -31,6 +31,7 @@ class Gruff::Bullet < Gruff::Base
     self.theme = Gruff::Themes::GREYSCALE
   end
 
+  # @rbs return: void
   def initialize_attributes
     super
 
@@ -42,6 +43,7 @@ class Gruff::Bullet < Gruff::Base
   # @rbs value: Float | Integer
   # @rbs maximum_value: Float | Integer
   # @rbs options: Hash[Symbol, Float | Integer]
+  # @rbs return: void
   def data(value, maximum_value, options = {})
     @value = value.to_f
     self.maximum_value = maximum_value.to_f
@@ -49,6 +51,7 @@ class Gruff::Bullet < Gruff::Base
     @options.map { |k, v| @options[k] = v.to_f if v.respond_to?(:to_f) }
   end
 
+  # @rbs return: void
   def draw
     # TODO: Left label
     # TODO Bottom labels and markers
@@ -95,6 +98,7 @@ class Gruff::Bullet < Gruff::Base
 
 private
 
+  # @rbs return: void
   def draw_title
     return if hide_title?
 

data/lib/gruff/candlestick.rb

@@ -36,6 +36,7 @@ class Gruff::Candlestick < Gruff::Base
   # Default value is +0.9+.
   #
   # @rbs space_percent: Float | Integer
+  # @rbs return: void
   def spacing_factor=(space_percent)
     raise ArgumentError, 'spacing_factor must be between 0.00 and 1.00' if (space_percent < 0) || (space_percent > 1)
 
@@ -43,11 +44,13 @@ class Gruff::Candlestick < Gruff::Base
   end
 
   # The sort feature is not supported in this graph.
+  # @rbs return: void
   def sort=(_value)
     raise 'Not support #sort= in Gruff::Candlestick'
   end
 
   # The sort feature is not supported in this graph.
+  # @rbs return: void
   def sorted_drawing=(_value)
     raise 'Not support #sorted_drawing= in Gruff::Candlestick'
   end
@@ -56,12 +59,14 @@ class Gruff::Candlestick < Gruff::Base
   # @rbs high: Float | Integer
   # @rbs open: Float | Integer
   # @rbs close: Float | Integer
+  # @rbs return: void
   def data(low:, high:, open:, close:)
     super('', [low, high, open, close])
   end
 
 private
 
+  # @rbs return: void
   def initialize_attributes
     super
     @show_vertical_markers = false
@@ -74,6 +79,7 @@ private
     @hide_legend = true
   end
 
+  # @rbs return: void
   def draw_graph
     # Setup the BarConversion Object
     conversion = Gruff::BarConversion.new(
@@ -81,7 +87,7 @@ private
       minimum_value: minimum_value, maximum_value: maximum_value, spread: @spread
     )
 
-    width = (@graph_width - calculate_spacing) / column_count
+    width = @graph_width / calculate_spacing
     bar_width = width * @spacing_factor
     padding = width - bar_width
 
@@ -106,6 +112,7 @@ private
     end
   end
 
+  # @rbs return: Array[Gruff::Candlestick::CandlestickData]
   def normalized_candlesticks
     @normalized_candlesticks ||= store.norm_data.map { |data| Gruff::Candlestick::CandlestickData.new(*data.points) } # steep:ignore
   end
@@ -115,9 +122,9 @@ private
     normalized_candlesticks.size
   end
 
-  # @rbs return: Integer
+  # @rbs return: Float
   def calculate_spacing
-    column_count - 1
+    column_count.to_f
   end
 
   # @rbs return: bool
@@ -127,11 +134,16 @@ private
 
   # @private
   class CandlestickData
-    attr_accessor :low
-    attr_accessor :high
-    attr_accessor :open
-    attr_accessor :close
-
+    attr_accessor :low #: Float | Integer
+    attr_accessor :high #: Float | Integer
+    attr_accessor :open #: Float | Integer
+    attr_accessor :close #: Float | Integer
+
+    # @rbs low: Float | Integer
+    # @rbs high: Float | Integer
+    # @rbs open: Float | Integer
+    # @rbs close: Float | Integer
+    # @rbs return: void
     def initialize(low, high, open, close)
       @low = low.to_f
       @high = high.to_f

data/lib/gruff/dot.rb

@@ -29,6 +29,7 @@ class Gruff::Dot < Gruff::Base
 
 private
 
+  # @rbs return: void
   def initialize_attributes
     super
     @hide_labels = false
@@ -49,6 +50,7 @@ private
     @hide_line_markers && @x_axis_label.nil? && @legend_at_bottom == false
   end
 
+  # @rbs return: void
   def draw_graph
     # Setup spacing.
     #
@@ -76,6 +78,7 @@ private
   end
 
   # Instead of base class version, draws vertical background lines and label
+  # @rbs return: void
   def draw_line_markers
     return if @hide_line_markers
 
@@ -98,6 +101,7 @@ private
 
   # @rbs y_offset: Float | Integer
   # @rbs index: Integer
+  # @rbs return: void
   def draw_label(y_offset, index)
     draw_unique_label(index) do
       draw_label_at(@graph_left - @label_margin, 1.0, 0.0, y_offset, @labels[index], gravity: Magick::EastGravity)

data/lib/gruff/font.rb

@@ -26,6 +26,7 @@ class Gruff::Font
   # @rbs size: Float | Integer
   # @rbs bold: bool
   # @rbs color: String
+  # @rbs return: void
   def initialize(path: nil, size: 20.0, bold: false, color: 'white')
     @path = path
     @bold = bold
@@ -36,6 +37,7 @@ class Gruff::Font
   # Get font weight.
   # @return [Magick::WeightType] font weight
   # TODO: type annotation of return value
+  # @rbs return: untyped
   def weight
     @bold ? Magick::BoldWeight : Magick::NormalWeight
   end

data/lib/gruff/helper/bar_value_label.rb

@@ -45,6 +45,7 @@ module Gruff::BarValueLabel
     # @rbs format: nil | String | Proc
     # @rbs proc_text_metrics: Proc
     # @rbs yields: (Float | Integer, Float | Integer, String, Float, Float) -> void
+    # @rbs return: void
     def prepare_rendering(format, proc_text_metrics)
       left_x, left_y, _right_x, _right_y = @coordinate
       val, metrics = Gruff::BarValueLabel.metrics(@value, format, proc_text_metrics)
@@ -59,6 +60,7 @@ module Gruff::BarValueLabel
     # @rbs format: nil | String | Proc
     # @rbs proc_text_metrics: Proc
     # @rbs yields: (Float | Integer, Float | Integer, String, Float, Float) -> void
+    # @rbs return: void
     def prepare_rendering(format, proc_text_metrics)
       left_x, left_y, right_x, _right_y = @coordinate
       val, metrics = Gruff::BarValueLabel.metrics(@value, format, proc_text_metrics)

data/lib/gruff/helper/stacked_mixin.rb

@@ -7,6 +7,7 @@ module Gruff::Base::StackedMixin
   # Used by StackedBar and child classes.
   #
   # tsal: moved from Base 03 FEB 2007
+  # @rbs return: void
   def calculate_maximum_by_stack
     # steep:ignore:start
     # Get sum of each stack

data/lib/gruff/histogram.rb

@@ -35,12 +35,14 @@ class Gruff::Histogram < Gruff::Bar
   # @rbs name: String | Symbol
   # @rbs data_points: Array[Float | Integer] | nil
   # @rbs color: String
+  # @rbs return: void
   def data(name, data_points = [], color = nil)
     @data << [name, Array(data_points), color]
   end
 
 private
 
+  # @rbs return: void
   def initialize_attributes
     super
     @bin_width = 10
@@ -48,6 +50,7 @@ private
     @maximum_bin = nil
   end
 
+  # @rbs return: void
   def setup_data
     @data.each do |(name, data_points, color)|
       if data_points.empty?

data/lib/gruff/line.rb

@@ -51,6 +51,7 @@ class Gruff::Line < Gruff::Base
   #
   # The preferred way is to call {#hide_dots=} or {#hide_lines=} instead.
   #
+  # @rbs *args: untyped
   # @rbs return: void
   def initialize(*args)
     raise ArgumentError, 'Wrong number of arguments' if args.length > 2
@@ -74,6 +75,7 @@ class Gruff::Line < Gruff::Base
   # Set a value for a baseline reference line..
   #
   # @rbs new_value: Float | Integer
+  # @rbs return: Float | Integer
   def baseline_value=(new_value)
     @reference_lines[:baseline] ||= {}
     @reference_lines[:baseline][:value] = new_value
@@ -87,6 +89,7 @@ class Gruff::Line < Gruff::Base
   end
 
   # @rbs new_value: Float | Integer
+  # @rbs return: Float | Integer
   def baseline_color=(new_value)
     @reference_lines[:baseline] ||= {}
     @reference_lines[:baseline][:color] = new_value
@@ -115,6 +118,7 @@ class Gruff::Line < Gruff::Base
   #
   # @example
   #   data("Bart S.", [95, 45, 78, 89, 88, 76], '#ffcc00')
+  # @rbs return: void
   def data(name, data_points = [], color = nil)
     store.add(name, nil, data_points, color)
   end
@@ -158,6 +162,7 @@ class Gruff::Line < Gruff::Base
   # @rbs x_data_points: Array[nil | Float | Integer] | Array[[nil | Float | Integer, nil | Float | Integer]] | nil
   # @rbs y_data_points: Array[nil | Float | Integer] | nil | String
   # @rbs color: String
+  # @rbs return: void
   def dataxy(name, x_data_points = [], y_data_points = [], color = nil)
     # make sure it's an array
     x_data_points = Array(x_data_points)
@@ -179,10 +184,12 @@ class Gruff::Line < Gruff::Base
 
 private
 
+  # @rbs return: void
   def initialize_store
     @store = Gruff::Store.new(Gruff::Store::XYData)
   end
 
+  # @rbs return: void
   def initialize_attributes
     super
     @reference_lines = {}
@@ -201,22 +208,33 @@ private
     @show_vertical_markers = false
   end
 
+  # @rbs reference_line: Hash[Symbol, untyped]
+  # @rbs left: Float | Integer
+  # @rbs right: Float | Integer
+  # @rbs top: Float | Integer
+  # @rbs bottom: Float | Integer
+  # @rbs return: void
   def draw_reference_line(reference_line, left, right, top, bottom)
     color = reference_line[:color] || @reference_line_default_color
     width = reference_line[:width] || @reference_line_default_width
     Gruff::Renderer::DashLine.new(renderer, color: color, width: width).render(left, top, right, bottom)
   end
 
+  # @rbs reference_line: Hash[Symbol, untyped]
+  # @rbs return: void
   def draw_horizontal_reference_line(reference_line)
     level = @graph_top + (@graph_height - (reference_line[:norm_value] * @graph_height))
     draw_reference_line(reference_line, @graph_left, @graph_left + @graph_width, level, level)
   end
 
+  # @rbs reference_line: Hash[Symbol, untyped]
+  # @rbs return: void
   def draw_vertical_reference_line(reference_line)
     index = @graph_left + (@x_increment * reference_line[:index])
     draw_reference_line(reference_line, index, index, @graph_top, @graph_top + @graph_height)
   end
 
+  # @rbs return: void
   def draw_graph
     # Check to see if more than one datapoint was given. NaN can result otherwise.
     @x_increment = column_count > 1 ? @graph_width / (column_count - 1) : @graph_width
@@ -229,9 +247,9 @@ private
 
     stroke_width  = @line_width || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 4.0), 5.0)
     circle_radius = @dot_radius || clip_value_if_greater_than(@columns / (store.norm_data.first.y_points.size * 2.5), 5.0)
-    prev_x = prev_y = nil
 
     store.norm_data.each do |data_row|
+      prev_x = prev_y = nil
       data_row.coordinates.each_with_index do |(x_data, y_data), index|
         new_x = begin
           if x_data.nil?
@@ -268,6 +286,7 @@ private
     end
   end
 
+  # @rbs return: void
   def setup_data
     # Update the global min/max values for the x data
     @maximum_x_value = (@maximum_x_value || store.max_x).to_f
@@ -290,11 +309,13 @@ private
     super
   end
 
+  # @rbs return: void
   def setup_drawing
     @marker_x_count ||= column_count - 1
     super
   end
 
+  # @rbs return: void
   def normalize
     return unless data_given?
 
@@ -309,6 +330,7 @@ private
     end
   end
 
+  # @rbs return: void
   def draw_line_markers
     # do all of the stuff for the horizontal lines on the y-axis
     super
@@ -320,6 +342,10 @@ private
     end
   end
 
+  # @rbs x_data: Float | Integer | nil
+  # @rbs new_x: Float | Integer
+  # @rbs index: Integer
+  # @rbs return: void
   def draw_label_for_x_data(x_data, new_x, index)
     if x_data.nil?
       draw_label(new_x, index)
@@ -330,6 +356,8 @@ private
     end
   end
 
+  # @rbs data_row: Gruff::Store::XYData
+  # @rbs return: bool
   def contains_one_point_only?(data_row)
     data_row.y_points.compact.count == 1
   end

data/lib/gruff/mini/bar.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 #
 # Makes a small bar graph suitable for display at 200px or even smaller.
@@ -17,6 +18,7 @@ private
 
   include Gruff::Mini::Legend
 
+  # @rbs return: void
   def initialize_attributes
     super
 
@@ -30,11 +32,13 @@ private
     @minimum_value = 0.0
   end
 
+  # @rbs return: void
   def setup_data
     expand_canvas_for_vertical_legend # steep:ignore
     super
   end
 
+  # @rbs return: void
   def draw_graph
     super
     draw_vertical_legend # steep:ignore

data/lib/gruff/mini/legend.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 # A module to handle the small legend.
 # @private
 module Gruff::Mini::Legend
-  attr_accessor :hide_mini_legend, :legend_position
+  attr_accessor :hide_mini_legend #: bool
+  attr_accessor :legend_position  #: Symbol
 
+  # @rbs return: void
   def initialize(*)
     @hide_mini_legend = false
     @legend_position = nil
@@ -12,6 +15,7 @@ module Gruff::Mini::Legend
   end
 
   # The canvas needs to be bigger so we can put the legend beneath it.
+  # @rbs return: Gruff::Renderer
   def expand_canvas_for_vertical_legend
     # steep:ignore:start
 
@@ -38,10 +42,12 @@ module Gruff::Mini::Legend
     # steep:ignore:end
   end
 
+  # @rbs return: Float
   def calculate_line_height
     calculate_caps_height(@legend_font) * 1.7 # steep:ignore
   end
 
+  # @rbs return: Float
   def calculate_legend_width
     # steep:ignore:start
     width = @legend_labels.map { |label| calculate_width(@legend_font, label) }.max
@@ -50,6 +56,7 @@ module Gruff::Mini::Legend
   end
 
   # Draw the legend beneath the existing graph.
+  # @rbs return: void
   def draw_vertical_legend
     # steep:ignore:start
     return if @hide_mini_legend
@@ -87,6 +94,9 @@ module Gruff::Mini::Legend
   end
 
   # Shorten long labels so they will fit on the canvas.
+  # @rbs label: String | Symbol
+  # @rbs x_offset: Float | Integer
+  # @rbs return: String
   def truncate_legend_label(label, x_offset)
     # steep:ignore:start
     truncated_label = label.to_s
@@ -95,13 +105,15 @@ module Gruff::Mini::Legend
     font.size = scale(font.size)
     max_width = @columns - scale(x_offset) - @right_margin
     while calculate_width(font, "#{truncated_label}...") > max_width && truncated_label.length > 1
-      truncated_label = truncated_label[0..truncated_label.length - 2]
+      truncated_label = truncated_label[0..(truncated_label.length - 2)]
     end
     truncated_label + (truncated_label.length < label.to_s.length ? '...' : '')
     # steep:ignore:end
   end
 
+  # @rbs value: Float | Integer
+  # @rbs return: Float
   def scale(value)
-    value * @scale
+    (value.to_f * @scale).to_f
   end
 end

data/lib/gruff/mini/pie.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 #
 # Makes a small pie graph suitable for display at 200px or even smaller.
@@ -16,6 +17,7 @@ private
 
   include Gruff::Mini::Legend
 
+  # @rbs return: void
   def initialize_attributes
     super
 
@@ -27,11 +29,13 @@ private
     @legend_font.size = 50.0
   end
 
+  # @rbs return: void
   def setup_data
     expand_canvas_for_vertical_legend # steep:ignore
     super
   end
 
+  # @rbs return: void
   def draw_graph
     super
     draw_vertical_legend # steep:ignore

data/lib/gruff/mini/side_bar.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 #
 # Makes a small side bar graph suitable for display at 200px or even smaller.
@@ -24,6 +25,7 @@ private
 
   include Gruff::Mini::Legend
 
+  # @rbs return: void
   def initialize_attributes
     super
     @hide_legend = true
@@ -34,11 +36,13 @@ private
     @legend_font.size = 50.0
   end
 
+  # @rbs return: void
   def setup_data
     expand_canvas_for_vertical_legend # steep:ignore
     super
   end
 
+  # @rbs return: void
   def draw_graph
     super
     draw_vertical_legend # steep:ignore

data/lib/gruff/net.rb

@@ -34,6 +34,7 @@ class Gruff::Net < Gruff::Base
 
 private
 
+  # @rbs return: void
   def initialize_attributes
     super
 
@@ -45,11 +46,13 @@ private
     @marker_font.bold = true
   end
 
+  # @rbs return: void
   def setup_drawing
     @center_labels_over_point = false
     super
   end
 
+  # @rbs return: void
   def setup_graph_measurements
     super
 
@@ -60,6 +63,7 @@ private
     @center_y = @graph_top + (@graph_height / 2.0) + 10
   end
 
+  # @rbs return: void
   def draw_graph
     store.norm_data.each do |data_row|
       poly_points = []
@@ -94,11 +98,12 @@ private
   end
 
   # the lines connecting in the center, with the first line vertical
+  # @rbs return: void
   def draw_line_markers
     return if @hide_line_markers
 
     # Draw horizontal line markers and annotate with numbers
-    (0..column_count - 1).each do |index|
+    (0..(column_count - 1)).each do |index|
       rad_pos = index * Math::PI * 2 / column_count
 
       Gruff::Renderer::Line.new(renderer, color: @marker_color)
@@ -114,6 +119,7 @@ private
   # @rbs angle: Float | Integer
   # @rbs radius: Float
   # @rbs amount: String | Integer
+  # @rbs return: void
   def draw_label(center_x, center_y, angle, radius, amount)
     x_offset = center_x # + 15 # The label points need to be tweaked slightly
     y_offset = center_y # + 0  # This one doesn't though

data/lib/gruff/patch/rmagick.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 # @private
 module Magick
@@ -6,6 +7,14 @@ module Magick
   module GruffAnnotate
     refine Draw do
       # Additional method to scale annotation text since Draw.scale doesn't.
+      # @rbs img: untyped
+      # @rbs width: Integer
+      # @rbs height: Integer
+      # @rbs x: Integer
+      # @rbs y: Integer
+      # @rbs text: String
+      # @rbs scale: Float
+      # @rbs return: void
       def annotate_scaled(img, width, height, x, y, text, scale)
         scaled_width = [(width * scale), 1].max
         scaled_height = [(height * scale), 1].max
@@ -22,6 +31,8 @@ module Magick
         # FIXME(uwe):  We should NOT need to implement this method.
         #              Remove this method as soon as RMagick4J Issue #16 is fixed.
         #              https://github.com/Serabe/RMagick4J/issues/16
+        # @rbs fill: String | Symbol
+        # @rbs return: void
         def fill=(fill)
           fill = { white: '#FFFFFF' }[fill.to_sym] || fill
           @draw.fill = Magick4J.ColorDatabase.query_default(fill)

data/lib/gruff/patch/string.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rbs_inline: enabled
 
 # @private
 module String::GruffCommify
@@ -7,6 +8,8 @@ module String::GruffCommify
 
   refine String do
     # Taken from http://codesnippets.joyent.com/posts/show/330
+    # @rbs delimiter: String
+    # @rbs return: String
     def commify(delimiter = THOUSAND_SEPARATOR)
       gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}") # steep:ignore
     end