marktable 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 776f59a6e0c0ee0b8e52f3fd4b9dd7a8ae8e1acbb93ff98504bb382dfecc93e9
-  data.tar.gz: 8df1d4b723562ced9f83e172165ed07d934e95fe2d9fe7c39411371b960dadfb
+  metadata.gz: e7f873538494ff9b1c7c9a5f74b25560c0a329e13ae77ab2648cedbe46dba1e7
+  data.tar.gz: 0bfc592905ad86578cf9fcfd953ffd589aebada3120d1f460e0c61818a5bea44
 SHA512:
-  metadata.gz: ed5b2e94ca382771d81d5c6423fa43e38dded1cbfe315c6fedd098b0f77efc66d18b7e62372f8ac2e16884a3d3495f5631fee13b96623d8575276e8b6827b619
-  data.tar.gz: 28d859a6e6c1709ee0be5c3ff7f63fd91f87688d6c5169d0193790889e590ce4b0602afa7c1a5f48693227bf963cca9396a26900f037899351d4c54c69783833
+  metadata.gz: da0ff6b0f29523c3b7cd99d31fe08d4cf0c79fb52bca4eb2603096396c560cf1734bf33b21990ba449c73a3b476d71d9985c62e743e8cd3525bd72d45c605937
+  data.tar.gz: cb6f9e8813e96393110f52a591d7a61a5b4e66d407db33fee2a8a52f347a934cb9586838d801195248b441b8999cee817819bfda83410faf7db0ff48d2738d0b

data/README.md

@@ -60,8 +60,8 @@ expect(html_table).to match_markdown(expected_markdown)
 ```ruby
 # From markdown to other formats
 markdown = <<~MARKDOWN
-  | Name | Age  |
-  |------|----- |
+  | Name  | Age |
+  |------ | --- |
   | Alice | 30  |
   | Bob   | 25  |
 MARKDOWN

data/lib/marktable/rspec/init.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative '../rspec'

data/lib/marktable/rspec.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'capybara'
+require 'nokogiri'
+require 'marktable'
+
+# Register the matchers if RSpec is defined
+if defined?(RSpec)
+  RSpec::Matchers.define :match_markdown do |expected_markdown|
+    chain :with_format do |format|
+      @format = format
+    end
+
+    match do |actual|
+      @expected_data = parse_input(expected_markdown, :markdown)
+      @format ||= infer_format(actual)
+      @actual_data = parse_input(actual, @format)
+
+      # Compare data using to_a for consistent comparison
+      @actual_data.to_a == @expected_data.to_a
+    end
+
+    failure_message do
+      format_failure_message(@expected_data, @actual_data)
+    end
+
+    failure_message_when_negated do
+      "Expected markdown tables to differ, but they match:\n\n" \
+      "#{@actual_data.to_md}"
+    end
+
+    private
+
+    def parse_input(input, format = nil)
+      return input if input.is_a?(Marktable::Table)
+
+      # Handle both Capybara::Node::Element and Capybara::Node::Simple
+      if capybara?(input)
+        # Convert Capybara element to Nokogiri element or HTML
+        input = input.native
+        format = :html
+      end
+
+      # Handle Nokogiri elements
+      if nokogiri?(input)
+        input = input.to_html
+        format = :html
+      end
+
+      Marktable::Table.new(input, type: format)
+    end
+
+    def html?(data)
+      nokogiri?(data) || capybara?(data)
+    end
+
+    def capybara?(data)
+      defined?(Capybara::Node::Base) && data.is_a?(Capybara::Node::Base) ||
+        defined?(Capybara::Node::Simple) && data.is_a?(Capybara::Node::Simple) ||
+        defined?(Capybara::Node::Element) && data.is_a?(Capybara::Node::Element)
+    end
+
+    def nokogiri?(data)
+      defined?(Nokogiri::XML::Node) && data.is_a?(Nokogiri::XML::Node)
+    end
+
+    def infer_format(data)
+      case data
+      when Array
+        :array
+      when CSV::Table
+        :csv
+      when Marktable::Table
+        :markdown
+      when html?(data)
+        :html
+      else
+        :markdown
+      end
+    end
+
+    def format_failure_message(expected_data, actual_data)
+      "Expected markdown table to match:\n\n" \
+      "Expected:\n#{expected_data.to_md}\n\n" \
+      "Actual:\n#{actual_data.to_md}\n\n" \
+      "Parsed expected data: #{expected_data.to_a.inspect}\n" \
+      "Parsed actual data: #{actual_data.to_a.inspect}"
+    end
+  end
+end

data/lib/marktable/tables/html.rb

@@ -14,7 +14,7 @@ module Marktable
       end
 
       def parse
-        return blank if table.nil? || rows.empty?
+        return Tables::Base.blank if table.nil? || rows.empty?
 
         if has_headers?
           headers = extract_row_cells(first_row)
@@ -48,7 +48,31 @@ module Marktable
       end
 
       def extract_row_cells(row)
-        row.css('th, td').map(&:text)
+        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
       end
 
       def first_row

data/lib/marktable/version.rb

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

data/lib/marktable.rb

@@ -22,3 +22,5 @@ module Marktable
     Table.new(table, type: :html)
   end
 end
+
+require_relative 'marktable/rspec' if defined?(RSpec) || defined?(::RSpec::Core)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marktable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Francois Gaspard
@@ -67,6 +67,8 @@ files:
 - lib/marktable/formatters/html.rb
 - lib/marktable/formatters/markdown.rb
 - lib/marktable/row.rb
+- lib/marktable/rspec.rb
+- lib/marktable/rspec/init.rb
 - lib/marktable/table.rb
 - lib/marktable/tables/array.rb
 - lib/marktable/tables/base.rb
@@ -74,7 +76,6 @@ files:
 - lib/marktable/tables/html.rb
 - lib/marktable/tables/markdown.rb
 - lib/marktable/version.rb
-- spec/support/matchers/markdown_matchers.rb
 homepage: https://github.com/Francois-gaspard/marktable
 licenses:
 - MIT

data/spec/support/matchers/markdown_matchers.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'capybara'
-require 'nokogiri'
-
-RSpec::Matchers.define :match_markdown do |expected_markdown|
-  chain :with_format do |format|
-    @format = format
-  end
-
-  match do |actual|
-    @expected_data = parse_input(expected_markdown, :markdown)
-    @format ||= infer_format(actual)
-    @actual_data = parse_input(actual, @format)
-
-    # Compare data using to_a for consistent comparison
-    @actual_data.to_a == @expected_data.to_a
-  end
-
-  failure_message do
-    format_failure_message(@expected_data, @actual_data)
-  end
-
-  failure_message_when_negated do
-    "Expected markdown tables to differ, but they match:\n\n" \
-    "#{@actual_data.to_md}"
-  end
-
-  private
-
-  def parse_input(input, format = nil)
-    return input if input.is_a?(Marktable::Table)
-
-    Marktable::Table.new(input, type: format)
-  end
-
-  def infer_format(data)
-    case data
-    when Array
-      :array
-    when CSV::Table
-      :csv
-    when Marktable::Table
-      :markdown
-    else
-      :markdown
-    end
-  end
-
-  def format_failure_message(expected_data, actual_data)
-    "Expected markdown table to match:\n\n" \
-    "Expected:\n#{expected_data.to_md}\n\n" \
-    "Actual:\n#{actual_data.to_md}\n\n" \
-    "Parsed expected data: #{expected_data.to_a.inspect}\n" \
-    "Parsed actual data: #{actual_data.to_a.inspect}"
-  end
-end