more_math 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2945331f84849efc01cafcdd9dec0e1402a6296c979d6b6d5ecb41ff49427a2
-  data.tar.gz: 2e25d9b28a5c326eb50d7ca12ef66d0562f8e5839a8f9c37a9db504fc13c286c
+  metadata.gz: 01200b0474b98510b8405a12492684e8d871d3a406a697c2d7775a26efe8c2ae
+  data.tar.gz: dfa50772aedbc2f2530e35e7c1825a128cdaa5a9a76781d12484c9b8a2a995f9
 SHA512:
-  metadata.gz: 11a42069a9e921c857849cceb0f912a3989a4bf046645be765c8acb54f9bea299ced8790be585fd04367531e6484847866cde89486c7aa6943fb396d80bfcf31
-  data.tar.gz: ee3e2b0ba782557eb94770833b0e98494254ce1a138caf493e72d208b54f56bb62645bd0779e71c84b32b949df2b8de3f4424c2c107b3c609a7bd5901a2cd471
+  metadata.gz: c1dc76b84fed3a181158201798ce5fe6bff1ac22b2bff104b2f22ff5186104217c65ad1425cd676959f2358fc1b107722c3bc9bfcbd2ca6060fc033d927b47e6
+  data.tar.gz: 90ad74b6b12f7735b088dc6bd06ccfbbe02af132718240a81eb8080c550a04c856698394c821441ddac4f7188524d02a006bf3579645a5b25a483a8e0dac568e

data/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2024-09-30 v1.2.2
+
+### Improvements
+* Refactor Histogram display logic for better UTF-8 support:
+	+ Extracted `output_row_with_count` and `output_row_without_count` methods
+	+ Updated test cases for histogram display with counts and UTF-8 support
+* Update Rakefile to ignore `.utilsrc` file:
+	- Add `.utilsrc` to `package_ignore` list in Rakefile
+
 ## 2024-09-30 v1.2.1
 
 * Refactor histogram display logic for utf8 and ascii bars

data/Rakefile

@@ -14,7 +14,7 @@ GemHadar do
     '.AppleDouble', 'tags', '.byebug_history', '.DS_Store'
   readme      'README.md'
   title       "#{name.camelize} -- More Math in Ruby"
-  package_ignore '.all_images.yml', '.gitignore', 'VERSION',
+  package_ignore '.all_images.yml', '.gitignore', 'VERSION', '.utilsrc',
     *Dir.glob('.github/**/*', File::FNM_DOTMATCH)
 
   required_ruby_version '>= 2.0'

data/lib/more_math/histogram.rb

@@ -62,7 +62,7 @@ module MoreMath
     end
 
     def ascii_bar(bar_width)
-      bar = ?* * bar_width
+      ?* * bar_width
     end
 
     def utf8?
@@ -72,29 +72,33 @@ module MoreMath
     def output_row(row, width)
       left, right, count = row
       if @with_counts
-        c = utf8? ? 2 : 1
-        left_width = width - (counts.map { |x| x.to_s.size }.max + c)
+        output_row_with_count(left, right, count, width)
       else
-        left_width = width
+        output_row_without_count(left, right, count, width)
       end
+    end
+
+    def output_row_with_count(left, right, count, width)
+      c = utf8? ? 2 : 1
+      left_width = width - (counts.map { |x| x.to_s.size }.max + c)
       if left_width < 0
         left_width = width
       end
       factor    = left_width.to_f / max_count
       bar_width = (count * factor)
       bar = utf8? ? utf8_bar(bar_width) : ascii_bar(bar_width)
-      if @with_counts
-        if utf8?
-          if bar[-1] == ' '
-            bar += count.to_s.rjust(width - bar_width - 1)
-          else
-            bar += count.to_s.rjust(width - bar_width)
-          end
-        else
-          bar += count.to_s.rjust(width - bar_width)
-        end
-      end
-      "%11.5f -|%s\n" % [ (left + right) / 2.0, bar ]
+			max_count_length = max_count.to_s.size
+      "%11.5f -|%#{-width + max_count_length}s%#{max_count_length}s\n" %
+				[ (left + right) / 2.0, bar, count ]
+    end
+
+    def output_row_without_count(left, right, count, width)
+      left_width = width
+      left_width < 0 and left_width = width
+      factor    = left_width.to_f / max_count
+      bar_width = (count * factor)
+      bar = utf8? ? utf8_bar(bar_width) : ascii_bar(bar_width)
+      "%11.5f -|%#{-width}s\n" % [ (left + right) / 2.0, bar ]
     end
 
     def rows

data/lib/more_math/version.rb

@@ -1,6 +1,6 @@
 module MoreMath
   # MoreMath version
-  VERSION         = '1.2.1'
+  VERSION         = '1.2.2'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/more_math.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: more_math 1.2.1 ruby lib
+# stub: more_math 1.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "more_math".freeze
-  s.version = "1.2.1".freeze
+  s.version = "1.2.2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/tests/histogram_test.rb

@@ -25,7 +25,7 @@ class HistogramTest < Test::Unit::TestCase
     output = StringIO.new
     histogram.display output
     assert_equal <<~end, output.string
-        2.50000 -|*************************
+        2.50000 -|*************************                         
         1.50000 -|**************************************************
         0.50000 -|**************************************************
     max_count=2
@@ -50,6 +50,23 @@ class HistogramTest < Test::Unit::TestCase
     end
   end
 
+  def test_histogram_display_with_counts_lots
+    srand 1337
+    sequence = Sequence.new 1000.times.map { rand(10) * rand(10) }
+    histogram = Histogram.new sequence, with_counts: true, bins: 3
+    def histogram.utf8?
+      false
+    end
+    output = StringIO.new
+    histogram.display output
+    assert_equal <<~end, output.string
+       67.50000 -|*****                                           81
+       40.50000 -|*************                                  206
+       13.50000 -|********************************************** 713
+    max_count=713
+    end
+  end
+
   def test_histogram_display_utf8
     srand 1337
     sequence = Sequence.new 1000.times.map { rand(10) }
@@ -60,8 +77,8 @@ class HistogramTest < Test::Unit::TestCase
     output = StringIO.new
     histogram.display output
     assert_equal <<~end, output.string
-        7.50000 -|⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ 
-        4.50000 -|⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇
+        7.50000 -|⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿               
+        4.50000 -|⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇                
         1.50000 -|⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ 
     max_count=420
     end
@@ -83,4 +100,29 @@ class HistogramTest < Test::Unit::TestCase
     max_count=420
     end
   end
+
+  def test_histogram_display_with_counts_utf8_zero
+    srand 1337
+    sequence = Sequence.new 1000.times.map { rand(10) * rand(10) }
+    histogram = Histogram.new sequence, with_counts: true, bins: 3
+    def histogram.utf8?
+      true
+    end
+    output = StringIO.new
+    histogram.display output
+    assert_equal <<~end, output.string
+       67.50000 -|⣿⣿⣿⣿⣿                                           81
+       40.50000 -|⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿                                  206
+       13.50000 -|⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿  713
+    max_count=713
+    end
+  end
+
+  private
+
+  def output_histogram(histogram)
+    $stdout.puts
+    histogram.display $stdout
+    $stdout.puts
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: more_math
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Florian Frank