nvim 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b10be9d49da003c89060559febe3e475e543660e957e6c3dffc15522fbbdd5
-  data.tar.gz: 5d4ea6f5bf523a0a8918eb5a6defbbdf58bfd001fde2ba77d75c4ccd2a75858b
+  metadata.gz: ba92c6fed4951efb4f5e19baeb500fa284eb4ff74bdc2c583024633e193c3678
+  data.tar.gz: 5642a68aef2c9310c7ee42dc2ce52dc20c5ba45413a69fc17897fbdcde7f8702
 SHA512:
-  metadata.gz: 976dbd80726c5626ff8aacefe48f3b9a3f30b432eb915ab82dca589604bc23260f8073184bf007a168acf7576d1923c8ede6fc3d59f64f7751ec54e4d4a37867
-  data.tar.gz: 8f1f04a090a323ffed4011a7a8c22953a3d294034d5e319f5825307c9c45528766a6ac1268483ba540e773d3b6763048580032aa6f4dfc191d89d7e8355fb648
+  metadata.gz: 5a8d2c4fd3b66d4dba74c446f65ae08820dd5feb026e0ab14f8f97af54b495ef421220614473867e3e71039221d471f1da2976240f47fc8f5c96ce3738973320
+  data.tar.gz: d33e37d115531e00811714e86de6902be1db2a40748676200e7ee9590556d31f3edfe85ba3078ee3879831536f947222983f17d36a70db4b3b6b7af8b78fa2a8

data/INFO.yaml

@@ -3,7 +3,7 @@
 #
 
 nvim:
-  version: 1.1.0
+  version: 1.2.0
   license: BSD-2-Clause+
   authors:
     - Bertram Scharpf

data/README.md

@@ -150,9 +150,12 @@ Further, a simple number/cash summing tool is included.
 ```
 Apples    :     3.99
 Bananas   : 5 * 0.40          # multiplication
-Oranges   :     3.59 | -10%   # percentage added (here subtracted)
+Oranges   :     3.59 - 10%    # percentage added (here subtracted)
 Kiwi      :     0,40          # comma is allowed
 Coconut   :     5,-           # empty decimal places
+# !dot                        # dot forced now
+Tangerines:     4.44
+# !comma                      # result with comma
 ~
 ~
 :%ruby +

data/lib/neovim/info.rb

@@ -1,10 +1,10 @@
 require "neovim/meta.rb"
 Neovim::INFO = Neovim::Meta.new "nvim",
-  version: "1.1.0",
+  version: "1.2.0",
   license: "BSD-2-Clause+",
   authors: ["Bertram Scharpf"],
   email: "software@bertram-scharpf.de",
   summary: "Yet another Ruby client for Neovim",
   description: "A simple Ruby client for Neovim.\nClean code, minimal dependecies, no frills, no wokeness.",
   homepage: "https://github.com/BertramScharpf/ruby-nvim",
-  commit: "45c1473"
+  commit: "2f15f07"

data/lib/neovim/ruby_provider.rb

@@ -117,53 +117,6 @@ module Neovim
       run_dsl DslProvider, &block
     end
 
-    def build_sum lines
-      require "bigdecimal"
-      sum = BigDecimal 0
-      prev, decs = 0, 0
-      sep = "."
-      lines.each { |l|
-        l.slice! /^.*:/
-        l.slice! /#.*/
-        l = l.split /(?:\+\s+|\|)/
-        l.map! { |m|
-          m.strip!
-          if m =~ %r/ *%\z/ then
-            prev * (BigDecimal $`) / 100
-          else
-            m = m.split "*"
-            m.map! { |n|
-              n.sub! /,/ do sep = $& ; "." end
-                n.sub! /\.(?:-+|([0-9]+))/ do
-                  if $1 then
-                    d = $1.length
-                    decs = d if decs < d
-                    ".#$1"
-                  else
-                    decs = 2
-                    nil
-                  end
-                end
-                BigDecimal n
-            }
-            prev = m.inject do |p,e| p*e end
-          end
-        }
-        sum = l.inject sum do |s,e| s+e end
-      }
-      sum = sum.round decs
-      case sum
-      when BigDecimal then
-        sum = sum.to_s "F"
-        sum.sub! /(?:\.([0-9]+))?\z/ do
-          sep + ($1.to_s.ljust decs, "0")
-        end
-      when Integer    then
-        sum = sum.to_s
-      end
-      sum
-    end
-
   end
 
   plugin_provider do |dsl|
@@ -180,7 +133,7 @@ module Neovim
           r.each do |l|
             require l
           rescue LoadError
-            client.err_writeln + $!.to_s
+            client.out_write "Warning: #$!"
           end
         end
       end
@@ -226,9 +179,16 @@ module Neovim
         client.command "#{lst}"
         set_globals client, fst..lst do |lines|
           WriteBuf.redirect client do
-            s = build_sum lines
-            puts "-"*(s.length + 4)
-            puts s
+            require "neovim/tools/calculator"
+            @calc ||= Calculator.new
+            @calc.reset!
+            w = 0
+            lines.each { |l|
+              l.length.tap { |g| w = g if g > w }
+              @calc.add l
+            }
+            puts "-"*w
+            puts @calc.result
           rescue
             puts "Error: #$! (#{$!.class})"
           end

data/lib/neovim/tools/calculator.rb

@@ -0,0 +1,112 @@
+#
+#  neovim/tools/calculator.rb  --  Simple calculator
+#
+
+require "supplement"
+require "bigdecimal"
+
+
+module Neovim
+
+  class Calculator
+
+    def result
+      r = @result.round @decs
+      case r
+      when BigDecimal then
+        r = r.to_s "F"
+        r.sub! /(?:(\.)([0-9]+))?\z/ do
+          (@sep||$1) + ($2.to_s.ljust @decs, "0")
+        end
+      when Integer    then
+        r = r.to_s
+      end
+      r
+    end
+
+    def reset!
+      @result = nil
+    end
+
+    def decs= d ; @decs = Integer d ; end
+
+    def dot!   ; @sep, @grp = ".", "," ; end
+    def comma! ; @sep, @grp = ",", "." ; end
+    def dot?   ; @sep == "." ; end
+    def comma? ; @sep == "," ; end
+
+    def add line
+      line = line.chomp
+      line.slice! /#.*/
+      if $& =~ /!(\w+)/ then
+        case $1
+          when "c", "comma", "k", "komma" then comma!
+          when "d", "dot", "p", "point"   then dot!
+          when /\A\d+\z/                  then @decs = $1.to_i
+        end
+      end
+      line.slice! /^.*:/
+      line.strip!
+      line.notempty? or return
+
+      products = []
+      line.split /(?<![,.])[+-]/ do |p|
+        products.push [ (split_products p), $& == "-"]
+      end
+
+      minus = false
+      products.each { |p,nm|
+        if not @result then @result =  p
+        elsif minus    then @result -= p
+        else                @result += p
+        end
+        minus = nm
+      }
+      @result
+    end
+
+    private
+
+    def split_products p
+      nums = []
+      p.split /[*\/]/ do |n|
+        nums.push [ (parse_number n), $& == "/"]
+      end
+
+      inv = false
+      prod = nil
+      nums.each  { |n,ni|
+        if not prod then prod =  n
+        elsif inv   then prod /= n
+        else             prod *= n
+        end
+        inv = ni
+      }
+      @prev = prod
+    end
+
+    def parse_number n
+      n.strip!
+      if n =~ %r/ *%\z/ then
+        @prev * (BigDecimal $`) / 100
+      else
+        comma! if not @sep and n =~ /\d,\d/
+        case @sep
+        when "," then n.gsub! @grp, "_" ; n.sub! @sep, "."
+        when "." then n.gsub! @grp, "_"
+        end
+        if    n =~ /\.-/ then
+          n = $`
+          @decs ||= 2
+        elsif n =~ /\.(\d*)/ then
+          d = $1.length
+          @decs = d if not @decs or @decs < d
+        end
+        @decs.nonzero? ? (BigDecimal n) : (Integer n)
+      end
+    end
+
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nvim
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies: []
 description:
 email: software@bertram-scharpf.de
@@ -39,6 +39,7 @@ files:
 - lib/neovim/remote.rb
 - lib/neovim/remote_object.rb
 - lib/neovim/ruby_provider.rb
+- lib/neovim/tools/calculator.rb
 - lib/neovim/tools/copy.rb
 - lib/neovim/vimscript_provider.rb
 homepage: https://github.com/BertramScharpf/ruby-nvim
@@ -60,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Yet another Ruby client for Neovim