tablestructured 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: afe95e0ea3585ddcf3f5eb0a76439ff7465b73c3
-  data.tar.gz: 9dc5a0d873b750f94a6b38485d88d6169aa5e46e
+SHA256:
+  metadata.gz: 12d89b2a0cfe64d0e225df5f48039f6eb3a57a7f9ff6fd930e996d0ff1165b50
+  data.tar.gz: ee0b66891ddfe222331030ef454485af24485098b7ad00e3babbcebe42348925
 SHA512:
-  metadata.gz: e5a62687c47e0162da70c59c42f1ff1f47dc183094e8a423cef9eae5a6a9e7b20de45bc538a172efdcf1a51f1eb7076e5bf6cb4d01d8ece862d054315d735395
-  data.tar.gz: f9b29c7573f1ad098a576df0c008b468bae2870ed360c4c46b245111cf68dafc754dcc19783757450de657c63dfc4cf6d90923cc626f261599f84856a8c787f6
+  metadata.gz: 632a6b7642ffa08a59a7b8930ff414dcb5c5760307d432eb8581a779f9889b2b52f869e5292e54119dbd829b329835f464413842b91ad750224fe938b63049ab
+  data.tar.gz: b9ab937ba3227e6972b45c978d62e62eb6d2ff9696beeb5d9967f675a49bfbaff15cc4de8395d4a66a1439c0615a009918bc27f2a43d3cfa8a283b12e2f87b27

data/lib/tablestructured.rb

@@ -5,29 +5,34 @@ module TableStructured
       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_first..-1-drop_last].map{ |_| _.text.sub(/\A[[[:space:]]]*/,"").sub(/[[[:space:]]]*\z/,"").to_sym }
+      end.css("thead 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
-      object.css("tbody>tr").map do |_|
+      require "timeout"
+      object.css("tbody > tr").map do |row|
         tds = []
-        Timeout.timeout 2 do
-          tds = _.css("td")[drop_first..-1-drop_last]
+        Timeout.timeout 5 do
+          tds = [row.css("th"), *row.css("td")][drop_first..-1-drop_last]
           if tds.empty?
             STDERR.puts "empty row"
             sleep 0.1
             redo
           end
         end
-        raise Error, "size mismatch (#{ss.size} headers, #{tds.size} row items)" if tds.size != ss.size
+        raise Error, "size mismatch (#{names.size} headers (#{names}), #{tds.size} row items)" if tds.size != names.size
         struct.new *tds
       end
     else

data/tablestructured.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "tablestructured"
-  spec.version      = "0.2.0"
+  spec.version      = "0.4.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.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2023-06-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.2.3
 signing_key: 
 specification_version: 4
 summary: convert two-dimensional Array into an Array of Structs consuming the first