table_analysis 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c714b1154af38fd8e20438d082b4e6b59a5e28ca86e5bed9c08a6415532bbfb
-  data.tar.gz: 4a1feeb00edf08359c5d3940083ea52bd2bed4952a0a7177b6fe1d4f52bad453
+  metadata.gz: 6d14e89ab00de3db0ebfb32f5e28e32991c4ed82b9c2f47ba7591412dbe46668
+  data.tar.gz: e1dfa8cb739efed8ab5a1bf46b72ea6de6f7acdab2aef07945d3460a8f139340
 SHA512:
-  metadata.gz: 253c452bf8e0e64309d2f961bdb43be522f8e6708303d62325e9dcb3508422c67b50d2c81c3d817e1bbcca430478da84875acdf538097623192572ee909dc76e
-  data.tar.gz: 05bad6505409b3178b794588e0bd1d44f922b456215c9f886f1a74f38142d9f0f8c8da7181930801d60291156310ee3759e001d363ab296e180d71d0a1d2ea32
+  metadata.gz: b0ea4f6fe0d62f2b12935c1811629385bdc5c6b54cfce504a1890e2cac2cedbbe64760e9dc9d6e01e0a701ca77915347b1a19fece3f21e5bcd6a52f8b3e4bcb3
+  data.tar.gz: c7c8f0124b653386f472c2a76a90c60a7a2462a45372dcf22571524631ae0526bb4bb30f23f4797a550dc4cdac1a53f65dbc15095ca209334d3f5239ec07b45b

data/demo.rb

@@ -0,0 +1,5 @@
+require './lib/table_analysis.rb'
+
+doc = File.read('file/demo2.html')
+
+TableAnalysis::Main.generator(doc, 1)

data/lib/table_analysis/{main.rb → core.rb}

@@ -3,7 +3,7 @@ require_relative 'body'
 require_relative 'table'
 
 module TableAnalysis
-  class Main
+  class Core
     attr_accessor :header, :table, :body_tds, :pointer, :x_max, :y_max
 
     def initialize(header, table, body_tds)
@@ -21,7 +21,6 @@ module TableAnalysis
         current_seat_position = seat_down
         reserved_seat(current_seat_position, body_td.rowspan, body_td.colspan) if body_td.reserved_seat?
       end
-
       @table
     end
 
@@ -33,7 +32,7 @@ module TableAnalysis
     # 坐下
     def seat_down
       if is_unreserved_seat?
-        @table[@pointer[0]][@pointer[1]] = seat_down_value(@pointer)
+        @table[@pointer[0]][@pointer[1]] = seat_down_value
         current_seat_position = @pointer.dup
         pointer_increase
         current_seat_position
@@ -57,8 +56,8 @@ module TableAnalysis
     end
 
     # 身份值
-    def seat_down_value(position)
-      @header[position[1]]
+    def seat_down_value
+      @header[@pointer[1]]
     end
 
     def pointer_increase

data/lib/table_analysis/header.rb

@@ -1,11 +1,15 @@
 module TableAnalysis
   class Header
-    def self.config(name, *trs)
+    def self.config(selected_cols, *trs)
       result = []
       trs.flatten.each do |tr|
-        result << Array.new(tr.length) { tr.name.to_s == name.to_s ? 1 : 0 }
+        result << Array.new(tr.length)
       end
-      result.flatten
+      result = result.flatten
+      selected_cols.each do |selected_col|
+        result[selected_col - 1] = 1
+      end
+      result.map! { |r| r.nil? ? 0 : r }
     end
   end
 

data/lib/table_analysis/version.rb

@@ -1,3 +1,3 @@
 module TableAnalysis
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/table_analysis.rb

@@ -1,7 +1,56 @@
-require 'table_analysis/main.rb'
-require 'table_analysis/version.rb'
-
+require_relative 'table_analysis/core'
+require_relative 'table_analysis/version'
+require 'nokogiri'
 module TableAnalysis
+  class Main
+    def self.generator(html, *selected_cols)
+      selected_cols = selected_cols.flatten 
+      doc = Nokogiri::HTML(html, nil, 'utf-8')
+      # 多个table,仅处理第一个
+      table = doc.xpath('//table')[0]
+
+      header_content_tds = []
+      body_content_tds = []
+      body_tr_size = 0
+      table.xpath('./tr').each_with_index do |tr, tr_index|
+        if tr_index == 0
+          tr.xpath('./td').each do |td|
+            header_name = td.content
+            colspan = td.attribute('colspan')&.value
+            header_content_tds << [header_name, colspan]
+          end
+        else
+          body_tr_size += 1
+          tr.xpath('./td').each_with_index do |td, td_index|
+            rowspan = td.attribute('rowspan')&.value 
+            colspan = td.attribute('colspan')&.value
+            body_content_tds << [rowspan, colspan]
+          end
+        end
+      end
+
+      header_tds = header_content_tds.map do |header_content_td|
+        TableAnalysis::HeaderTd.config(header_content_td[0], header_content_td[1])
+      end
+
+      header = TableAnalysis::Header.config(selected_cols, header_tds)
+      table = TableAnalysis::Table.config(body_tr_size, header)
+
+      body_tds = body_content_tds.map do |body_td|
+        TableAnalysis::BodyTd.config(body_td[0], body_td[1])
+      end
+
+      content_maps = TableAnalysis::Core.new(header, table, body_tds).entrance
+
+      header_map = [Array.new(header_tds.size){0}]
+
+      table_maps = header_map + content_maps
+
+      p table_maps
+      table_maps
+    end
+  end
+
   class Error < StandardError; end
   # Your code goes here...
 end

data/table_analysis.gemspec

@@ -1,18 +1,17 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "table_analysis/version"
+require 'table_analysis/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "table_analysis"
+  spec.name          = 'table_analysis'
   spec.version       = TableAnalysis::VERSION
-  spec.authors       = ["mico_xiaozhen@sina.com"]
-  spec.email         = ["mico_xiaozhen@sina.com"]
+  spec.authors       = ['mico_xiaozhen@sina.com']
+  spec.email         = ['mico_xiaozhen@sina.com']
 
-  spec.summary       = %q{进行表格分析}
+  spec.summary       = '进行表格分析'
   # spec.description   = %q{TODO: Write a longer description or delete this line.}
-  spec.homepage      = "https://github.com/mico-xiaozhen/table_analysis"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/mico-xiaozhen/table_analysis'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -23,20 +22,21 @@ Gem::Specification.new do |spec|
     # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
     # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'nokogirl', '~> 1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_analysis
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mico_xiaozhen@sina.com
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogirl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email:
 - mico_xiaozhen@sina.com
@@ -70,14 +84,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- demo1.rb
-- demo2.rb
+- demo.rb
 - file/demo2.html
 - lib/table_analysis.rb
 - lib/table_analysis/body.rb
+- lib/table_analysis/core.rb
 - lib/table_analysis/double_dimensional_array.rb
 - lib/table_analysis/header.rb
-- lib/table_analysis/main.rb
 - lib/table_analysis/table.rb
 - lib/table_analysis/version.rb
 - table_analysis.gemspec

data/demo1.rb

@@ -1,28 +0,0 @@
-require_relative 'main'
-
-header_content_tds = [
-  ['姓名', 1], ['年龄', 1], ['内容', 2] # [name, colspan]
-]
-
-body_content_tds = [
-  [1, 1], [1, 1], [1, 1], [1, 1], # //tr//td [rowspan, colspan]
-  [1, 1], [3, 1], [1, 2],
-  [2, 1],         [1, 2],
-  [1, 1], [1, 1]
-]
-
-find_name = '姓名'
-tr_sizes = 4
-
-headerTds = header_content_tds.map do |header_content_td|
-  TableAnalysis::HeaderTd.config(header_content_td[0], header_content_td[1])
-end
-
-header = TableAnalysis::Header.config(find_name, headerTds)
-table = TableAnalysis::Table.config(tr_sizes, header)
-
-body_tds = body_content_tds.map do |body_td|
-  TableAnalysis::BodyTd.config(body_td[0], body_td[1])
-end
-
-p TableAnalysis::Main.new(header, table, body_tds).entrance

data/demo2.rb

@@ -1,41 +0,0 @@
-require_relative 'main'
-require 'nokogiri'
-
-doc = File.open('file/demo2.html') { |f| Nokogiri::HTML(f, nil, 'utf-8') }
-tables = doc.xpath('//table')
-tables.each do |table|
-  header_content_tds = []
-  body_content_tds = []
-  tr_sizes = 0 
-  table.xpath('./tr').each_with_index do |tr, index|
-    if index == 0
-      tr.xpath('./td').each do |td|
-        header_name = td.content
-        colspan = td.attribute('colspan')&.value
-        header_content_tds << [header_name, colspan] 
-      end
-    else
-      tr_sizes += 1 
-      tr.xpath('./td').each do |td|
-        rowspan = td.attribute('rowspan')&.value 
-        colspan = td.attribute('colspan')&.value
-        body_content_tds << [rowspan, colspan] 
-      end
-    end
-  end
-  # p header_content_tds
-  # p body_content_tds
-  p find_name = header_content_tds[1][0].delete('\n').strip
-  headerTds = header_content_tds.map do |header_content_td|
-    TableAnalysis::HeaderTd.config(header_content_td[0], header_content_td[1])
-  end
-  # p headerTds
-  header = TableAnalysis::Header.config(find_name, headerTds)
-  table = TableAnalysis::Table.config(tr_sizes, header)
-  # p header 
-  body_tds = body_content_tds.map do |body_td|
-    TableAnalysis::BodyTd.config(body_td[0], body_td[1])
-  end
-  # p body_tds 
-  p TableAnalysis::Main.new(header, table, body_tds).entrance
-end