underpass 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5920d16962c26dd7711747653a0ce891250e870d2a675f51402354306a3e93
-  data.tar.gz: 1770e8e1e320916d9a53673df975ec1a7293d0d1064bdb0d68c2ab50cd168aeb
+  metadata.gz: 5537c4b977692f332de7f6b4432f000da4c025005118521df1272d74719a6245
+  data.tar.gz: 83455326c173828d22cb7f983612e4c726e13047ef4dea721b304f5d722472b3
 SHA512:
-  metadata.gz: f67e73666224ec23cf123b2803438a4b893359039da09fd9209506dea49b2b8685b04a8287955bc2c811224d786a9ca17be7ebcd22fc64242000147d10fe0ae8
-  data.tar.gz: dcbf032eae5a06497068f36861073dfa846d889c4bbab7681db81127a878824a70edb43dffb022bcae188afb8a40b2bea7deae6d3be9fc4cd429246fdf2e8fc4
+  metadata.gz: e91f105de2883607534d05c777c1bf83ae7f160461f33dbbb6a2ab273faf6ef9f93cfdf312c7bf21a161e7355325488c1ca4cb0c99c29251a94eabdbfbe85ab7
+  data.tar.gz: 0fca925ecf8188fb6aa16d62162b51c671336d90124c490bff82a9e02e31158d3b92a8f816338f1178f2a8dfdf6e50adfb61888eec15fb6fb31ccef29161b187

data/README.md

@@ -420,6 +420,19 @@ rescue Underpass::ApiError => e
 end
 ```
 
+For syntax errors (the most common 400 from Overpass), the structured data is just as rich:
+
+```ruby
+begin
+  Underpass::QL::Query.perform_raw('nod["amenity"="cafe"];')
+rescue Underpass::ApiError => e
+  e.code           # => "syntax"
+  e.http_status    # => 400
+  e.error_message  # => "Error: line 3: parse error: Unknown type \"nod\""
+  e.details        # => { line: 3 }
+end
+```
+
 ### Error Codes
 
 | Code | Description | HTTP Status |

data/lib/underpass/error_parser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'cgi'
+
 module Underpass
   # Parses HTML error responses from the Overpass API into structured data.
   #
@@ -35,26 +37,53 @@ module Underpass
 
     # Extracts error text from HTML or returns the body as-is.
     #
+    # Overpass sometimes wraps the real error message in a <p> and uses
+    # <strong> only as an inline label (e.g. "<p><strong>Error</strong>:
+    # line 3: parse error: ...</p>"). Scan every <p> first and prefer one
+    # whose stripped text matches a known pattern, so label-only <strong>
+    # tags don't swallow the useful content.
+    #
     # @param body [String] the response body
     # @return [String] the extracted error text
     def self.extract_error_text(body)
       return '' if body.nil? || body.empty?
 
-      # Try to extract text from <strong> tags (common Overpass error format)
-      if (match = body.match(%r{<strong[^>]*>(.*?)</strong>}im))
-        return match[1].gsub(/<[^>]+>/, '').strip
-      end
+      paragraphs = extract_paragraphs(body)
+      from_paragraphs = pick_paragraph(paragraphs)
+      return CGI.unescapeHTML(from_paragraphs) if from_paragraphs
 
-      # Try to extract from <p> tags
-      if (match = body.match(%r{<p[^>]*>(.*?)</p>}im))
-        return match[1].gsub(/<[^>]+>/, '').strip
-      end
+      from_strong = extract_strong_text(body)
+      return CGI.unescapeHTML(from_strong) unless from_strong.empty?
 
-      # Fall back to stripping all HTML tags
-      body.gsub(/<[^>]+>/, ' ').gsub(/\s+/, ' ').strip
+      CGI.unescapeHTML(body.gsub(/<[^>]+>/, ' ').gsub(/\s+/, ' ').strip)
     end
     private_class_method :extract_error_text
 
+    def self.extract_paragraphs(body)
+      body.scan(%r{<p[^>]*>(.*?)</p>}im)
+          .map { |m| m[0].gsub(/<[^>]+>/, '').strip }
+          .reject(&:empty?)
+    end
+    private_class_method :extract_paragraphs
+
+    # Picks the first paragraph matching a known pattern, or the last
+    # paragraph as a general-context fallback.
+    def self.pick_paragraph(paragraphs)
+      return if paragraphs.empty?
+
+      matched = paragraphs.find { |p| PATTERNS.each_value.any? { |rx| p.match?(rx) } }
+      matched || paragraphs.last
+    end
+    private_class_method :pick_paragraph
+
+    def self.extract_strong_text(body)
+      match = body.match(%r{<strong[^>]*>(.*?)</strong>}im)
+      return '' unless match
+
+      match[1].gsub(/<[^>]+>/, '').strip
+    end
+    private_class_method :extract_strong_text
+
     # Parses the error text against known patterns.
     #
     # @param text [String] the extracted error text
@@ -84,9 +113,9 @@ module Underpass
     private_class_method :parse_memory
 
     def self.parse_syntax(text)
-      return unless (match = text.match(PATTERNS[:syntax]))
+      return unless text.match(PATTERNS[:syntax])
 
-      { code: 'syntax', message: match[1].strip, details: extract_syntax_details(match[1]) }
+      { code: 'syntax', message: text.strip, details: extract_syntax_details(text) }
     end
     private_class_method :parse_syntax
 

data/lib/underpass/shape.rb

@@ -20,8 +20,11 @@ module Underpass
       #
       # @param way [Hash] a parsed way element
       # @param nodes [Hash{Integer => Hash}] node lookup table
-      # @return [RGeo::Feature::Polygon] the polygon geometry
+      # @return [RGeo::Feature::Polygon, nil] the polygon geometry, or +nil+
+      #   if the way has fewer than 4 points
       def polygon_from_way(way, nodes)
+        return nil if way[:nodes].size < 4
+
         factory.polygon(line_string_from_way(way, nodes))
       end
 
@@ -103,7 +106,11 @@ module Underpass
         return [] if way_ids.empty?
 
         sequences = WayChain.new(way_ids, ways).merged_sequences
-        sequences.map { |ids| factory.linear_ring(points_from_node_ids(ids, nodes)) }
+        sequences.filter_map do |ids|
+          next if ids.size < 4
+
+          factory.linear_ring(points_from_node_ids(ids, nodes))
+        end
       end
 
       def matching_inner_rings(outer_ring, inner_rings)

data/lib/underpass/version.rb

@@ -13,7 +13,7 @@ module Underpass
   module VERSION
     MAJOR = 0
     MINOR = 9
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: underpass
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Janos Rusiczki