rbfind 2.2 → 2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ec1222c8e64f36c9927aa96c1c4f2a737d624d142fea22bfce274637074a7b
-  data.tar.gz: 6c34e268c249977c6c74dc3bf42d841ea63c2649274742be29918a1c19d592a0
+  metadata.gz: 0655e863af78b2081d7306e8823694ef7ad5c48625dbdd9c7f0f75fb8a85d4d7
+  data.tar.gz: 0ef05d8082c2487d7079176ea8373f31e392d41eb1dd269555c47832ff313689
 SHA512:
-  metadata.gz: c71fdaa76238ddae6fcc6b887bf30280f7f48c97e92d324ad5a400f81de8038f4fbe1b10ff931e4cc8f80604d69e71e496a80f99544ff5ba5a37ad0beb1dc2ea
-  data.tar.gz: b12aad69797682840b1a75b07b77f5474d5aab8e66b4b536dfe41e538e7f5fee493aaf5ad493db8419454532729600acc037e0936001b193d7911a44ac886f73
+  metadata.gz: 915e2359d8bb0c7814c682f8247e71eb7db8742a8095c2cdbb44194252df0ba2636602443ca916055a3f260cece8de837118c565c76ca2bfb470dd2409749a94
+  data.tar.gz: f72fdc455e7ac5eba31060f3c96176f47985f7a4f41fd55d089dc78d7b713838365c5b949f537b7089b223829e63ac5ed64935af9a80a90639e31aa7ade67474

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.2".freeze
+  VERSION = "2.3".freeze
 
 =begin rdoc
 

data/lib/rbfind/table.rb

@@ -9,18 +9,28 @@ module RbFind
 
     def initialize *heads
       heads.flatten!
-      @heads = heads
+      @heads = heads.map { |h|
+        a = case h
+          when />\z/  then +1
+          when /\^\z/ then  0
+          when /<?\z/ then -1
+        end
+        [ $`, a]
+      }
       @rows = []
     end
 
-    def spawn
-      self.class.new *@heads
+    attr_reader :heads
+    protected :heads
+    def initialize_copy oth
+      @heads = oth.heads
+      @rows = []
     end
 
     def add *row
       row.flatten!
       n = @heads.size
-      row[ 0, n] = row[ 0, n].map { |r| r.to_s }
+      row.map! { |r| break if n.zero? ; n -= 1 ; r.to_s }
       @rows.push row
     end
 
@@ -38,14 +48,14 @@ module RbFind
 
     def make_lines head: false
       rs = @rows
-      rs.unshift heads_plain if head
+      rs.unshift @heads.map { |(h,a)| h } if head
       w = calc_widths
       rs.each { |r|
-        j = (w.zip @heads, r).map { |v,h,c|
-          case h
-            when />\z/  then c.rjust  v
-            when /\^\z/ then c.center v
-            when /<?\z/ then c.ljust  v
+        j = (w.zip @heads, r).map { |v,(_,a),c|
+          case a
+            when -1 then c.ljust  v
+            when  0 then c.center v
+            when +1 then c.rjust  v
           end
         }
         l = j.join " "
@@ -59,14 +69,14 @@ module RbFind
       @html = ""
       tag :table, table, nl: 2 do
         tag :tr, row, nl: 1 do
-          (@heads.zip heads_plain).each { |h,c|
-            tag :td, c.downcase, align: (html_align h) do @html << c end
+          @heads.each { |(h,a)|
+            tag :td, h.downcase, align: a do @html << h end
           }
         end
         @rows.each { |r|
           tag :tr, table, nl: 1 do
-            (@heads.zip heads_plain, r).each { |h,g,c|
-              tag :td, g.downcase, align: (html_align h) do @html << c end
+            (@heads.zip r).each { |(g,a),c|
+              tag :td, g.downcase, align: a do @html << c end
             }
           end
         }
@@ -86,13 +96,9 @@ module RbFind
       w
     end
 
-    def heads_plain
-      @heads.map { |h| h.sub /\W\z/, "" }
-    end
-
     def tag name, cls, nl: 0, align: nil
       @html << "<#{name}"
-      @html << " style=\"text-align: " << align << ";\"" if align
+      @html << " style=\"text-align: " << (html_align align) << ";\"" if align
       @html << " class=\"" << cls << "\"" if cls
       @html << ">"
       @html << $/ if nl > 1
@@ -101,11 +107,11 @@ module RbFind
       @html << $/ if nl > 0
     end
 
-    def html_align h
-      case h
-        when />/  then "right"
-        when /\^/ then "center"
-        when /<?/ then "left"
+    def html_align a
+      case a
+        when -1 then "left"
+        when  0 then "center"
+        when +1 then "right"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbfind
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.3'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies: []
 description: |
   A replacement for the standard UNIX command find.