marktable 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1784dd519b087a312b16b62a5b562b4e96c6d9b2b8d2120fbedfbd26610c9b08
-  data.tar.gz: dbdd8c041ff3601a869bd1645ff040b3727272475742573d31c9e9b0f4be0c3c
+  metadata.gz: 7b7b5feb35551a6a59edde7ca07f5d40d42db64a59db7ab63ec9c30b3bd91639
+  data.tar.gz: efb35fdc7273544d43abf282401e8468c4952c515d89d0a51cea5097efffbe05
 SHA512:
-  metadata.gz: 80378878aca4a4aac40969c76c007ba82073bf6ddb4a3ec601fe2b73f904c0d09efef2212b7a4e396dbedb215402e71563f1de84ca6f9c8861fe3bb7ce6eb282
-  data.tar.gz: 3bc02122e8896440a1fa5c959e344db546dedcca04355e142509b39ffd605e2d71ecb00b6d0d4d9b868088c2b85e8b1fb3ac00da63a4fcedfc2a2efbc83c1938
+  metadata.gz: 076bedb8bcc98ee8b02f1b253037ad8e35b43d235b8406a6e79bd08ed0ca9826894d9e6f3bafbd26c6c27e54e4b15bc0366962758343604b83e929e854556e01
+  data.tar.gz: 9fcfd90ad2851a656670c7a7e73ab55943925db60223fc37bf947d7ffca91c8cdec1384ec035c226681eaf038712f58e5cb2f559eba9ba9efdfa471fba45c470

data/lib/marktable/rspec.rb

@@ -6,15 +6,17 @@ require 'marktable'
 
 # Register the matchers if RSpec is defined
 if defined?(RSpec)
-  RSpec::Matchers.define :match_markdown do |expected_markdown|
+  RSpec::Matchers.define :match_markdown do |expected_markdown, ignore_headers: false|
+
     chain :with_format do |format|
       @format = format
     end
 
     match do |actual|
-      @expected_data = parse_input(expected_markdown, :markdown)
+      @ignore_headers = ignore_headers
       @format ||= infer_format(actual)
       @actual_data = parse_input(actual, @format)
+      @expected_data = parse_input(expected_markdown, :markdown)
 
       # Compare data using to_a for consistent comparison
       @actual_data.to_a == @expected_data.to_a
@@ -36,8 +38,7 @@ if defined?(RSpec)
 
       # Handle both Capybara::Node::Element and Capybara::Node::Simple
       if capybara?(input)
-        # Convert Capybara element to Nokogiri element or HTML
-        input = input.native
+        input = parse_capybara_html(input)
         format = :html
       end
 
@@ -47,13 +48,28 @@ if defined?(RSpec)
         format = :html
       end
 
-      Marktable::Table.new(input, type: format)
+      # Pass headers option if it was specified in the chain
+      options = { type: format }
+      options[:headers] = false if @ignore_headers
+      Marktable::Table.new(input, **options)
     end
 
     def html?(data)
       nokogiri?(data) || capybara?(data)
     end
 
+    def parse_capybara_html(data)
+      rows = data.all('tr').map do |row|
+        cells = row.all('th,td').map do |cell|
+          cell_text = cell.text.tr("\n", ' ').strip
+          cell_type = cell.tag_name
+          "<#{cell_type}>#{cell_text}</#{cell_type}>"
+        end
+        "<tr>#{cells.join}</tr>"
+      end
+      "<table>#{rows.join}</table>"
+    end
+
     def capybara?(data)
       defined?(Capybara::Node::Base) && data.is_a?(Capybara::Node::Base) ||
         defined?(Capybara::Node::Simple) && data.is_a?(Capybara::Node::Simple) ||

data/lib/marktable/table.rb

@@ -13,8 +13,8 @@ module Marktable
       result = parser.parse
       @rows = result.rows
       @headers = result.headers
-      # Validate headers if present
-      validate_headers if @headers
+      # Validate headers if present and not explicitly disabled
+      validate_headers if @headers && headers != false
       # Fix: Initialize @has_headers based on whether @headers is present
       @has_headers = !@headers.nil?
     end

data/lib/marktable/tables/csv.rb

@@ -44,7 +44,7 @@ module Marktable
 
         csv_table.each do |csv_row|
           # Convert CSV::Row to hash then to our Row
-          row_data = csv_row.to_h
+          row_data = csv_row.to_h.transform_values { |v| v.nil? ? '' : v }
           rows << Row.new(row_data, headers: headers)
         end
 
@@ -56,10 +56,12 @@ module Marktable
 
         if csv_table.is_a?(::CSV::Table)
           csv_table.each do |csv_row|
-            rows << Row.new(csv_row.fields)
+            fields = csv_row.fields.map { |v| v.nil? ? '' : v }
+            rows << Row.new(fields)
           end
         else
           csv_table.each do |fields|
+            fields = fields.map { |v| v.nil? ? '' : v }
             rows << Row.new(fields)
           end
         end

data/lib/marktable/tables/html.rb

@@ -47,44 +47,24 @@ module Marktable
         end
       end
 
-      def extract_row_cells(row)
-        row.css('th, td').map do |cell|
-          # Get text content
-          text = cell.text
-          
-          # Handle JSON content specially to preserve important whitespace
-          if text.include?('{') && text.include?('}')
-            # Process JSON content more carefully
-            # 1. Remove newlines
-            # 2. Preserve spaces between JSON delimiters
-            # 3. Normalize other whitespace
-            json_content = text.gsub(/\r?\n/, ' ')        # Replace newlines with spaces
-                              .gsub(/(\{)\s*/, '\1 ')     # Ensure exactly one space after opening brace
-                              .gsub(/\s*(\})/, ' \1')     # Ensure exactly one space before closing brace
-                              .gsub(/\s+/, ' ')           # Collapse other consecutive whitespace
-                              .gsub(/\A\s+|\s+\z/, '')    # Trim leading/trailing whitespace
-                              .gsub(/\u00A0/, ' ')        # Replace   with spaces
-            json_content
-          else
-            # For regular content
-            text.gsub(/\r?\n/, '')          # Remove all newlines completely
-                .gsub(/\s+/, ' ')           # Collapse consecutive whitespace
-                .gsub(/\A\s+|\s+\z/, '')    # Trim leading/trailing whitespace
-                .gsub(/\u00A0/, ' ')        # Replace   with spaces
-          end
-        end
+      def rows
+        @rows ||= table.css('tr')
       end
 
       def first_row
-        @first_row ||= rows.first
+        rows.first
       end
 
       def has_headers?
-        @has_headers ||= first_row.css('th').any? || @headers_flag
+        return false if @headers_flag == false
+        return true if @headers_flag == true
+
+        # Auto-detect headers if not explicitly specified
+        first_row&.css('th').any?
       end
 
-      def rows
-        @rows ||= table.css('tr')
+      def extract_row_cells(row)
+        row.css('th, td').map { |cell| cell.text.tr("\n", ' ').strip }
       end
     end
   end

data/lib/marktable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marktable
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marktable
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Francois Gaspard