tablestructured 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a5c9006b6d4ebf186aa8724d2dfa389a70f44bed
-  data.tar.gz: b0d01cc440f469ecff3c49420b2c35a24eb84c19
+SHA256:
+  metadata.gz: a18246ac024ad7427f265067f356a4e8b7ef1dc368a3648588f16b20a29fc8c0
+  data.tar.gz: 8d7879c11f295400cab85f894b32ab09d6919b62d3613c412a742f8b699aee95
 SHA512:
-  metadata.gz: 355ee52c41d87fde5a2a28480223abfbe6efe7d63eee84b88ded1efcd9b58a5eb54fdcf92614db43263620ab68b0a55bec4e29c90363dd6adc1bd76aaf9d12fa
-  data.tar.gz: 9716ee1c7b6bd0874f896341e94110bee09234421351476d9bae2ba294e9fda0472c3ae335d860d79f432c4b55c3432b630303653fde9961ce8e2bad1a0cdf97
+  metadata.gz: f3eb3f0131ed50ea19405dd47e5164d3ed61d28cfcb67119787ecea019c64d26273371dde7546a156dd4d49049d73c971743a17af0091ca3e60f1ee13bdece72
+  data.tar.gz: 87c75e478c0f7c806c18d7d0d1a7b6d17f2d409b38752de8989f0d6468d96c459c2cf24f626ef5711027b9fd665e863b23ac841908257c197985d6ac2c52f90e

data/lib/tablestructured.rb

@@ -1,23 +1,43 @@
 module TableStructured
-  def self.new object, headers: :top, drop: 0  # TODO: headers_left should probably mean the ids of entries
-    if object.respond_to? :css
+  Error = Class.new RuntimeError
+  def self.new object, headers: :top, drop_first: 0, drop_last: 0  # TODO: headers_left should probably mean the ids of entries
+    if object.nil?
+      raise ArgumentError, "passed object can be an Array or Ferrum Node, but not Nil"
+    elsif object.respond_to? :css
       # the xml object ignores the :headers arg for now
-      ss = if :top == headers
+      names = if :top == headers
         object
       elsif headers.respond_to? :css
         headers
       else
         fail "invalid type of headers"
-      end.css("th").drop(drop).map{ |_| _.text.sub(/\A[[[:space:]]]*/,"").sub(/[[[:space:]]]*\z/,"").to_sym }
+      end.css("th")[drop_first..-1-drop_last].map do |_|
+        _.text.sub(/\A[[[:space:]]]*/,"").sub(/[[[:space:]]]*\z/,"")
+      end
+      t = names.group_by(&:itself).map{ |k, g| [k, g.size.times.to_a] if 1 < g.size }.compact.to_h
+      names = names.map{ |_| if i = t[_]&.shift then "#{_}_#{i+1}" else _ end.to_sym }
       struct = begin
-        Struct.new *ss
+        Struct.new *names
       rescue NameError
-        raise $!.exception "#{$!}: #{ss.inspect}"
+        raise $!.exception "#{$!}: #{names.inspect}"
+      end
+      require "timeout"
+      object.css("tbody>tr").map do |_|
+        tds = []
+        Timeout.timeout 2 do
+          tds = _.css("td")[drop_first..-1-drop_last]
+          if tds.empty?
+            STDERR.puts "empty row"
+            sleep 0.1
+            redo
+          end
+        end
+        raise Error, "size mismatch (#{names.size} headers, #{tds.size} row items)" if tds.size != names.size
+        struct.new *tds
       end
-      object.css("tbody>tr").map{ |_| struct.new *_.css("td").drop(drop) }
     else
-      struct = Struct.new *object.first.map(&:to_s).map(&:to_sym).tap{ |_| fail "headers should be unique" if _.uniq! }
-      object.drop(1).map{ |_| struct.new *_ }
+      struct = Struct.new *(headers == :top ? object.first : headers).map(&:to_s).map(&:to_sym).tap{ |_| fail "headers should be unique" if _.uniq! }
+      object.drop(headers == :top ? 1 : 0).map{ |_| struct.new *_ }
     end
   end
 end

data/tablestructured.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "tablestructured"
-  spec.version      = "0.1.2"
+  spec.version      = "0.3.0"
   spec.summary      = "convert two-dimensional Array into an Array of Structs consuming the first row and/or column as attributes"
 
   spec.author       = "Victor Maslov aka Nakilon"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tablestructured
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nakilon@gmail.com
@@ -39,8 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.3.25
 signing_key: 
 specification_version: 4
 summary: convert two-dimensional Array into an Array of Structs consuming the first