youplot 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83145e216c0d124d537c8a01d63f9203730a74191fefcb9de5743b08e0e504bd
-  data.tar.gz: a246eab22f11ab8c526cc838d9f2fbf7d249721b4782287087c08a5410f8647b
+  metadata.gz: 6db41d30d7f51a3209bd6c17e805c7dd6bcaf68db325ffb2d23b95850837d8d4
+  data.tar.gz: 1580e5501a9b635cc871c9d572549e4d33cc46e265ffe7befcd0a9d51285673a
 SHA512:
-  metadata.gz: d9138c26fade36d7d0ca19100b47dcb8e65c8c884d13b74d258dcae9ea304ced2fc783b08e871d76607e57e394e6b861c81f1f5030caba53493b2f4740a05cd2
-  data.tar.gz: f293d686791ba1481948877e534c9085e99c24ab9c36026979002ecaa9ee2ece6f12ad7193cda936c62e472e2f94008466cc666e9405157bfcc348c4c21c4579
+  metadata.gz: 4a60bbfd3edf64151c20a23bb3e13b7f528e7a313030d8e1134bb5cac7918aff2cc604fca301c2a86c3f8e8a8a6b411bb0e28fbb15b179ff4528559ded890cc7
+  data.tar.gz: b76603426970dc8d7c019bb394374d9c1e851a216a0d6607f5adcd9532649a25a6fd56113bce037d92a3eb66fdcab533f58391d8db93aa5091020c15c0043b16

data/lib/youplot/backends/processing.rb

@@ -6,22 +6,30 @@ module YouPlot
     module Processing
       module_function
 
-      def count_values(arr, tally: true)
+      def count_values(arr, tally: true, reverse: false)
         # tally was added in Ruby 2.7
-        if tally && Enumerable.method_defined?(:tally)
-          arr.tally
-        else
-          # value_counts Enumerable::Statistics
-          arr.value_counts(dropna: false)
-        end
-          .sort do |a, b|
-            # compare values
-            r = b[1] <=> a[1]
-            # If the values are the same, compare by name
-            r = a[0] <=> b[0] if r == 0
-            r
+        result = \
+          if tally && Enumerable.method_defined?(:tally)
+            arr.tally
+          else
+            # value_counts Enumerable::Statistics
+            arr.value_counts(dropna: false)
           end
-          .transpose
+
+        # sorting
+        result = result.sort do |a, b|
+          # compare values
+          r = b[1] <=> a[1]
+          # If the values are the same, compare by name
+          r = a[0] <=> b[0] if r.zero?
+          r
+        end
+
+        # --reverse option
+        result.reverse! if reverse
+
+        # prepare for barplot
+        result.transpose
       end
     end
   end

data/lib/youplot/backends/unicode_plot.rb

@@ -14,12 +14,12 @@ module YouPlot
 
       module_function
 
-      def barplot(data, params, fmt = nil, count: false)
+      def barplot(data, params, fmt = nil, count: false, reverse: false)
         headers = data.headers
         series = data.series
         # `uplot count`
         if count
-          series = Processing.count_values(series[0])
+          series = Processing.count_values(series[0], reverse: reverse)
           params.title = headers[0] if headers
         end
         if series.size == 1

data/lib/youplot/command.rb

@@ -146,7 +146,7 @@ module YouPlot
       when :bar, :barplot
         @backend.barplot(data, params, options[:fmt])
       when :count, :c
-        @backend.barplot(data, params, count: true)
+        @backend.barplot(data, params, count: true, reverse: options[:reverse])
       when :hist, :histogram
         @backend.histogram(data, params)
       when :line, :lineplot

data/lib/youplot/dsv.rb

@@ -14,7 +14,7 @@ module YouPlot
 
       # Remove blank lines
       arr.delete_if do |i|
-        i == [] or i.all? nil
+        i == [] or i.all?(&:nil?)
       end
 
       # get header

data/lib/youplot/options.rb

@@ -11,8 +11,8 @@ module YouPlot
     :fmt,
     :progressive,
     :encoding,
-    :color_names,
-    :debug,
-    keyword_init: true
+    :reverse,      # count
+    :color_names,  # color
+    :debug
   )
 end

data/lib/youplot/parser.rb

@@ -15,16 +15,16 @@ module YouPlot
       @command = nil
 
       @options = Options.new(
-        delimiter: "\t",
-        transpose: false,
-        headers: nil,
-        pass: false,
-        output: $stderr,
-        fmt: 'xyy',
-        progressive: false,
-        encoding: nil,
-        color_names: false,
-        debug: false
+        "\t",    # elimiter:
+        false,   # transpose:
+        nil,     # headers:
+        false,   # pass:
+        $stderr, # output:
+        'xyy',   # fmt:
+        false,   # progressive:
+        nil,     # encoding:
+        false,   # color_names:
+        false    # debug:
       )
 
       @params = Parameters.new
@@ -163,7 +163,8 @@ module YouPlot
     end
 
     def sub_parser_add_canvas
-      sub_parser.on_head('--canvas STR', String, 'type of canvas') do |v|
+      canvas_types = UnicodePlot::Canvas::CANVAS_CLASS_MAP.keys.join(', ')
+      sub_parser.on_head('--canvas STR', String, 'type of canvas', "(#{canvas_types})") do |v|
         params.canvas = v.to_sym
       end
     end
@@ -226,6 +227,9 @@ module YouPlot
         sub_parser_add_xscale
 
       when :count, :c
+        sub_parser.on_head('-r', '--reverse', TrueClass, 'reverse the result of comparisons') do |v|
+          options.reverse = v
+        end
         sub_parser_add_symbol
         sub_parser_add_xscale
 
@@ -270,7 +274,7 @@ module YouPlot
         sub_parser_add_xlim
 
       when :colors, :color, :colours, :colour
-        sub_parser.on_head('-n', '--names', 'show color names only', TrueClass) do |v|
+        sub_parser.on_head('-n', '--names', TrueClass, 'show color names only') do |v|
           options[:color_names] = v
         end
 

data/lib/youplot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YouPlot
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: youplot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-30 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode_plot