uhaul 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6abdb81d3f63d578fd92845c756fd0bc0d4673b53ded8071c20e9568bdb04067
-  data.tar.gz: a0788d4f607f9774117d01e0e8590cdd01b46ce9f176dd8cb9b6feabd5a089b7
+  metadata.gz: 22343f801475f0781ff4ec3722470098b7d05e124b56253deb9d912d1dd54fac
+  data.tar.gz: f49c694569358b34e8dddf4a5493a5cbbce5ec7e77a19c2c2d3c8a7515f821d4
 SHA512:
-  metadata.gz: 3b05f8006e9ddb4760c3c98dd2d40948e9df8d1a3752d6dead5a2a05844168c8d5be4a2aefa824f885d1a572dfbeaff725fd9eaa3828e49144691dd591f62293
-  data.tar.gz: e8658751bc9003a8f734b0517d283c6c310c498fc10fab282b89c34b70291219b798f3a48843fa933e48d18c02a041bef62fe377d832862d240edbfc87a1e589
+  metadata.gz: 3ad0314baee02a85ca1587c923fd6748ad6c14833ee17536efe2a4251753ac8a1afd23d917585a93c31da4033dc4c37bd827e8ea5e9dfc483a534ad6b79b48ed
+  data.tar.gz: 81376338d60cd9f9875f9d9dfa3c72dd880fbd9821c3d73f678f0ed8d0dc7abc189ca596c2d479d8528e55f536fdf49b7fb1060b42c625a110269e59b94eb45e

data/lib/uhaul/address.rb

@@ -3,8 +3,6 @@
 module UHaul
   # The address (street + city + state + zip) of a facility.
   class Address
-    ADDRESS_SELECTOR = '.item-des-box .text-box .part_title_1'
-    ADDRESS_REGEX = /(?<street>.+),\s+(?<city>.+),\s+(?<state>.+)\s+(?<zip>\d{5})/
     # @attribute [rw] street
     #   @return [String]
     attr_accessor :street
@@ -48,16 +46,57 @@ module UHaul
       "#{street}, #{city}, #{state} #{zip}"
     end
 
+    # @param document [String]
+    # @param data [Hash] optional
+    #
+    # @return [Address]
+    def self.parse(document:, data:)
+      parse_by_data(data:) || parse_by_document(document:)
+    end
+
     # @param data [Hash]
     #
     # @return [Address]
-    def self.parse(data:)
+    def self.parse_by_data(data:)
+      address = data&.dig('address')
+      return unless address
+
       new(
-        street: data['streetAddress'],
-        city: data['addressLocality'],
-        state: data['addressRegion'],
-        zip: data['postalCode']
+        street: address['streetAddress'],
+        city: address['addressLocality'],
+        state: address['addressRegion'],
+        zip: address['postalCode']
       )
     end
+
+    # @param document [Nokogiri::HTML::Document]
+    #
+    # @return [Address]
+    def self.parse_by_document(document:)
+      element = document.at_css('address')
+      return unless element
+
+      element.text.match(/(?<street>.+)[\r\n,]+(?<city>.+)[\r\n,]+(?<state>.+)[\r\n\s,]+(?<zip>\d{5})/) do |match|
+        new(
+          street: strip(match[:street]),
+          city: strip(match[:city]),
+          state: strip(match[:state]),
+          zip: strip(match[:zip])
+        )
+      end
+    end
+
+    # @param text [String]
+    #
+    # @return [String]
+    def self.strip(text)
+      return unless text
+
+      text
+        .strip
+        .gsub(/^[\s\p{Space},],+/, '')
+        .gsub(/[\s\p{Space},]+$/, '')
+        .gsub(/[\s\p{Space}]+/, ' ')
+    end
   end
 end

data/lib/uhaul/crawl.rb

@@ -33,7 +33,7 @@ module UHaul
       @stdout.puts(facility.text)
       facility.prices.each { |price| @stdout.puts(price.text) }
       @stdout.puts
-    rescue FetchError => e
+    rescue UHaul::Error => e
       @stderr.puts("url=#{url} error=#{e.message}")
     end
   end

data/lib/uhaul/dimensions.rb

@@ -3,8 +3,6 @@
 module UHaul
   # The dimensions (width + depth + sqft) of a price.
   class Dimensions
-    class ParseError < StandardError; end
-
     DIMENSIONS_REGEX = /(?<width>[\d\.]+)'\s*x\s*(?<depth>[\d\.]+)'\s*x\s*(?<height>[\d\.]+)'/
 
     # @attribute [rw] depth

data/lib/uhaul/facility.rb

@@ -5,8 +5,6 @@ module UHaul
   #
   # e.g. https://www.uhaul.com/Locations/Self-Storage-near-Inglewood-CA-90301/712030/
   class Facility
-    class ParseError < StandardError; end
-
     PRICES_SELECTOR = '#roomTypes > ul:not([id*="VehicleStorage"]) > li'
 
     SITEMAP_URLS = %w[
@@ -126,11 +124,11 @@ module UHaul
     def self.parse(url:, document:)
       data = parse_ld_json_script(document:)
 
-      id = data['@id'].match(%r{(?<id>\d+)/#})[:id]
-      name = data['name']
+      id = parse_id!(document:)
+      name = parse_name!(document:)
 
-      geocode = Geocode.parse(data: data['geo'] || data['areaServed']['geoMidpoint'])
-      address = Address.parse(data: data['address'])
+      geocode = Geocode.parse(data:, document:)
+      address = Address.parse(data:, document:)
       prices = document.css(PRICES_SELECTOR).map { |element| Price.parse(element:) }.compact
 
       new(id:, url:, name:, address:, geocode:, prices:)
@@ -144,7 +142,7 @@ module UHaul
     def self.parse_ld_json_script(document:)
       parse_ld_json_scripts(document:).find do |data|
         %w[SelfStorage LocalBusiness].include?(data['@type'])
-      end || raise(ParseError, 'missing ld+json')
+      end
     end
 
     # @param document [Nokogiri::HTML::Document]
@@ -156,6 +154,29 @@ module UHaul
       elements.map { |element| element.text.empty? ? {} : JSON.parse(element.text) }
     end
 
+    # @param document [Nokogiri::HTML::Document]
+    #
+    # @raise [ParseError]
+    #
+    # @return [String]
+    def self.parse_id!(document:)
+      element = document.at_xpath('//link[@rel="canonical"]') || raise(ParseError, 'missing <link rel="canonical">')
+
+      href = element['href']
+      href.match(%r{(?<id>\d+)/$})[:id]
+    end
+
+    # @param document [Nokogiri::HTML::Document]
+    #
+    # @raise [ParseError]
+    #
+    # @return [String]
+    def self.parse_name!(document:)
+      element = document.at_xpath('//title') || raise(ParseError, 'missing <title>...</title>')
+
+      element.text.match(/\|\s*(?<name>.*)\s*$/)[:name].strip
+    end
+
     # @param id [String]
     # @param url [String]
     # @param name [String]

data/lib/uhaul/geocode.rb

@@ -14,16 +14,6 @@ module UHaul
     #   @return [Float]
     attr_accessor :longitude
 
-    # @param data [Hash]
-    #
-    # @return [Geocode]
-    def self.parse(data:)
-      latitude = Float(data['latitude'])
-      longitude = Float(data['longitude'])
-
-      new(latitude:, longitude:)
-    end
-
     # @param latitude [Float]
     # @param longitude [Float]
     def initialize(latitude:, longitude:)
@@ -44,5 +34,38 @@ module UHaul
     def text
       "#{@latitude},#{@longitude}"
     end
+
+    # @param document [String]
+    # @param data [Hash] optional
+    #
+    # @return [Address]
+    def self.parse(document:, data:)
+      parse_by_data(data:) || parse_by_document(document:)
+    end
+
+    # @param data [Hash]
+    #
+    # @return [Address]
+    def self.parse_by_data(data:)
+      coordinates = data&.dig('areaServed', 'geoMidpoint')
+      return unless coordinates
+
+      new(
+        latitude: Float(coordinates['latitude']),
+        longitude: Float(coordinates['longitude'])
+      )
+    end
+
+    # @param document [Nokogiri::HTML::Document]
+    #
+    # @return [Address]
+    def self.parse_by_document(document:)
+      document.text.match(/latitude:\s*(?<latitude>[\+\-\d\.]+),\s*longitude:\s*(?<longitude>[\+\-\d\.]+)/) do |match|
+        new(
+          latitude: Float(match[:latitude]),
+          longitude: Float(match[:longitude])
+        )
+      end
+    end
   end
 end

data/lib/uhaul/parse_error.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module UHaul
+  # Raised for unexpected HTTP responses.
+  class ParseError < Error
+  end
+end

data/lib/uhaul/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UHaul
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uhaul
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 2025-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -105,6 +105,7 @@ files:
 - lib/uhaul/fetch_error.rb
 - lib/uhaul/geocode.rb
 - lib/uhaul/link.rb
+- lib/uhaul/parse_error.rb
 - lib/uhaul/price.rb
 - lib/uhaul/rates.rb
 - lib/uhaul/sitemap.rb
@@ -115,8 +116,8 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/ksylvest/uhaul
-  source_code_uri: https://github.com/ksylvest/uhaul/tree/v1.1.0
-  changelog_uri: https://github.com/ksylvest/uhaul/releases/tag/v1.1.0
+  source_code_uri: https://github.com/ksylvest/uhaul/tree/v1.2.0
+  changelog_uri: https://github.com/ksylvest/uhaul/releases/tag/v1.2.0
   documentation_uri: https://uhaul.ksylvest.com/
 post_install_message: 
 rdoc_options: []