tablestructured 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c77dbdbe0cccc56193727474e29adcbeae82f32
-  data.tar.gz: adf4183d1aaf55fbce1c65f40b920c01ea787e6e
+  metadata.gz: afe95e0ea3585ddcf3f5eb0a76439ff7465b73c3
+  data.tar.gz: 9dc5a0d873b750f94a6b38485d88d6169aa5e46e
 SHA512:
-  metadata.gz: 2f96dfc2fda4cee69e3cc9cfa3c0132a570e805a2cdff7fb6deec1f394531e839134a87a1fd16d83ef7c73db023b3e1c12fd8825d4de9f01ec3721935b9c6b60
-  data.tar.gz: 6ddb896c4c6320c9a4f0002f9389009726e477fc86c13c340832c9fb53a878acc21c0f6ef6f92c1a09771c240b51cf074b9b9167d56622429a5d21a022e68ca6
+  metadata.gz: e5a62687c47e0162da70c59c42f1ff1f47dc183094e8a423cef9eae5a6a9e7b20de45bc538a172efdcf1a51f1eb7076e5bf6cb4d01d8ece862d054315d735395
+  data.tar.gz: f9b29c7573f1ad098a576df0c008b468bae2870ed360c4c46b245111cf68dafc754dcc19783757450de657c63dfc4cf6d90923cc626f261599f84856a8c787f6

data/lib/tablestructured.rb

@@ -1,12 +1,38 @@
 module TableStructured
-  def self.new object, headers: :top  # 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
-      struct = Struct.new *object.at_css("thead").css("th").map(&:text).map(&:to_sym).tap{ |_| fail "headers should be unique" if _.uniq! }
-      object.css("tr").drop(1).map{ |_| struct.new *_.css("td") }
+      ss = 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 }
+      struct = begin
+        Struct.new *ss
+      rescue NameError
+        raise $!.exception "#{$!}: #{ss.inspect}"
+      end
+      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 (#{ss.size} headers, #{tds.size} row items)" if tds.size != ss.size
+        struct.new *tds
+      end
     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.1"
+  spec.version      = "0.2.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.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-09-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nakilon@gmail.com