uhaul 0.1.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a37ead64b21ccff91595e73dfedf11b378c2e5ea14acdd0d18e9d45735e3a5
-  data.tar.gz: d355639b46eb03ce4ce4be447520f05551ecfc8f23f7ebacc8260a6bb5d71203
+  metadata.gz: 4acc4dc138e904232902f124d9ee0c78923dc74c609c42515b97e83cdeea3fb2
+  data.tar.gz: 9e98885feb0367400d6a444f191b859d2e54abf646c9dda26938545f0d2bf8c6
 SHA512:
-  metadata.gz: b73ef2ae65031b627177dd1b8c5fa647ce6273b3f09efb8975a42182d6be90e05d6f6e27c5c50dfae3c836f81cd48e1211fd57bf2918081cc6664999b3daef24
-  data.tar.gz: bec905b2070dd9a60d0d32b1f3f3de1fbe184d27f495152524911f90d9eff9c1b3c2b6b833b1e3f3cb26960de25a606396d3ca0b9dcf9292f42a1498bed1fc98
+  metadata.gz: 3ecf98d2ab243fe983f6ef926c6fd425d988676173892a92990845b489561de61525ea30653d66c1b9d5956842006901064847c46aba4c5b9894c8f1a2846940
+  data.tar.gz: dde69a5ed918065d156872112b37b6d67b6f04a462f18f492da53ca7ecd56224ad38d1659f9e0b2bfa86f7e2f79684a0f7cdf391e1dbbece994e80dfec480e40

data/README.md

@@ -18,9 +18,9 @@ gem install uhaul
 require 'uhaul'
 
 UHaul.configure do |config|
-  config.user_agent = '../..' # ENV['NSASTORAGE_USER_AGENT']
-  config.timeout = 30 # ENV['NSASTORAGE_TIMEOUT']
-  config.proxy_url = 'http://user:pass@superproxy.zenrows.com:1337' # ENV['NSASTORAGE_PROXY_URL']
+  config.user_agent = '../..' # ENV['UHAUL_USER_AGENT']
+  config.timeout = 30 # ENV['UHAUL_TIMEOUT']
+  config.proxy_url = 'http://user:pass@superproxy.zenrows.com:1337' # ENV['UHAUL_PROXY_URL']
 end
 ```
 

data/lib/uhaul/config.rb

@@ -20,10 +20,10 @@ module UHaul
     attr_accessor :proxy_url
 
     def initialize
-      @accept_language = ENV.fetch('NSASTORAGE_ACCEPT_LANGUAGE', 'en-US,en;q=0.9')
-      @user_agent = ENV.fetch('NSASTORAGE_USER_AGENT', "uhaul.rb/#{VERSION}")
-      @timeout = Integer(ENV.fetch('NSASTORAGE_TIMEOUT', 60))
-      @proxy_url = ENV.fetch('NSASTORAGE_PROXY_URL', nil)
+      @accept_language = ENV.fetch('UHAUL_ACCEPT_LANGUAGE', 'en-US,en;q=0.9')
+      @user_agent = ENV.fetch('UHAUL_USER_AGENT', "uhaul.rb/#{VERSION}")
+      @timeout = Integer(ENV.fetch('UHAUL_TIMEOUT', 60))
+      @proxy_url = ENV.fetch('UHAUL_PROXY_URL', nil)
     end
 
     # @return [Boolean]

data/lib/uhaul/crawler.rb

@@ -43,7 +43,7 @@ module UHaul
     # @param url [String]
     # @return [HTTP::Response]
     def fetch(url:)
-      response = connection.get(url)
+      response = connection.follow.get(url)
       raise FetchError.new(url:, response: response.flush) unless response.status.ok?
 
       response

data/lib/uhaul/dimensions.rb

@@ -3,11 +3,9 @@
 module UHaul
   # The dimensions (width + depth + sqft) of a price.
   class Dimensions
-    DEFAULT_WIDTH = 5.0 # feet
-    DEFAULT_DEPTH = 5.0 # feet
-    DEFAULT_HEIGHT = 8.0 # feet
+    class ParseError < StandardError; end
 
-    DIMENSIONS_REGEX = /(?<width>[\d\.]+) x (?<depth>[\d\.]+)/
+    DIMENSIONS_REGEX = /(?<width>[\d\.]+)'\s*x\s*(?<depth>[\d\.]+)'\s*x\s*(?<height>[\d\.]+)'/
 
     # @attribute [rw] depth
     #   @return [Float]
@@ -40,11 +38,6 @@ module UHaul
       "#<#{self.class.name} #{props.join(' ')}>"
     end
 
-    # @return [String] e.g. "5×5"
-    def id
-      "#{format('%g', @width)}×#{format('%g', @depth)}"
-    end
-
     # @return [Integer]
     def sqft
       Integer(@width * @depth)
@@ -60,16 +53,17 @@ module UHaul
       "#{format('%g', @width)}' × #{format('%g', @depth)}' (#{sqft} sqft)"
     end
 
-    # @param element [Nokogiri::XML::Element]
+    # @param text [String]
     #
     # @return [Dimensions]
-    def self.parse(element:)
-      text = element.at_css('.unit-select-item-detail').text
+    def self.parse(text:)
       match = DIMENSIONS_REGEX.match(text)
+      raise ParseError, "unknown length / width / height for #{text}" unless match
 
-      width = match ? Float(match[:width]) : DEFAULT_WIDTH
-      depth = match ? Float(match[:depth]) : DEFAULT_DEPTH
-      new(depth:, width:, height: DEFAULT_HEIGHT)
+      width = Float(match[:width])
+      depth = Float(match[:depth])
+      height = Float(match[:height])
+      new(depth:, width:, height:)
     end
   end
 end

data/lib/uhaul/facility.rb

@@ -7,6 +7,8 @@ module UHaul
   class Facility
     class ParseError < StandardError; end
 
+    PRICES_SELECTOR = '#roomTypes > ul:not([id*="VehicleStorage"]) > li'
+
     SITEMAP_URLS = %w[
       https://www.uhaul.com/Locations/Sitemaps/Sitemap-for-Storage-in-AL.ashx
       https://www.uhaul.com/Locations/Sitemaps/Sitemap-for-Storage-in-AK.ashx
@@ -62,8 +64,7 @@ module UHaul
     ].freeze
 
     DEFAULT_EMAIL = 'service@uhaul.com'
-    DEFAULT_PHONE = '+1-800-468-4285
-'
+    DEFAULT_PHONE = '+1-800-468-4285'
 
     # @attribute [rw] id
     #   @return [String]
@@ -130,7 +131,7 @@ module UHaul
 
       geocode = Geocode.parse(data: data['geo'])
       address = Address.parse(data: data['address'])
-      prices = [] # TODO
+      prices = document.css(PRICES_SELECTOR).map { |element| Price.parse(element:) }.compact
 
       new(id:, url:, name:, address:, geocode:, prices:)
     end

data/lib/uhaul/features.rb

@@ -3,15 +3,13 @@
 module UHaul
   # The features (e.g. climate-controlled, inside-drive-up-access, outside-drive-up-access, etc) of a price.
   class Features
-    # @param element [Nokogiri::XML::Element]
+    # @param text [String]
     #
     # @return [Features]
-    def self.parse(element:)
-      text = element.text
-
+    def self.parse(text:)
       new(
-        climate_controlled: text.include?('Heated and Cooled'),
-        drive_up_access: text.include?('Drive Up Access'),
+        climate_controlled: text.include?('Climate') && !text.include?('No Climate'),
+        drive_up_access: text.include?('Drive Up'),
         first_floor_access: text.include?('1st Floor')
       )
     end
@@ -36,15 +34,6 @@ module UHaul
       "#<#{self.class.name} #{props.join(' ')}>"
     end
 
-    # @return [String] e.g. ""
-    def id
-      [].tap do |ids|
-        ids << 'cc' if climate_controlled?
-        ids << 'dua' if drive_up_access?
-        ids << 'ffa' if first_floor_access?
-      end.join('-')
-    end
-
     # @return [String] e.g. "Climate Controlled + First Floor Access"
     def text
       amenities.join(' + ')

data/lib/uhaul/geocode.rb

@@ -18,8 +18,8 @@ module UHaul
     #
     # @return [Geocode]
     def self.parse(data:)
-      latitude = data[:latitude]
-      longitude = data[:longitude]
+      latitude = Float(data['latitude'])
+      longitude = Float(data['longitude'])
 
       new(latitude:, longitude:)
     end

data/lib/uhaul/link.rb

@@ -8,7 +8,6 @@ module UHaul
     attr_accessor :loc
 
     # @param loc [String]
-    # @param lastmod [String, nil]
     def initialize(loc:)
       @loc = loc
     end

data/lib/uhaul/price.rb

@@ -22,18 +22,6 @@ module UHaul
     #   @return [Rates]
     attr_accessor :rates
 
-    # @param facility_id [Integer]
-    #
-    # @return [Array<Price>]
-    def self.fetch(facility_id:)
-      url = "https://www.uhaul.com/facility-units/#{facility_id}"
-      data = Crawler.json(url:)['data']
-      return [] if data['error']
-
-      html = data['html']['units']
-      Nokogiri::HTML(html).css(PRICE_SELECTOR).map { |element| parse(element:) }
-    end
-
     # @param id [String]
     # @param dimensions [Dimensions]
     # @param features [Features]
@@ -56,7 +44,7 @@ module UHaul
       "#<#{self.class.name} #{props.join(' ')}>"
     end
 
-    # @return [String] e.g. "123 | 5' × 5' (25 sqft) | $100 (street) / $90 (web)"
+    # @return [String] e.g. "123 | 5' × 5' (25 sqft) | $90"
     def text
       "#{@id} | #{@dimensions.text} | #{@rates.text} | #{@features.text}"
     end
@@ -65,12 +53,15 @@ module UHaul
     #
     # @return [Price]
     def self.parse(element:)
-      link = element.at_xpath(".//a[contains(text(), 'Rent')]|//a[contains(text(), 'Reserve')]")
-      dimensions = Dimensions.parse(element:)
-      features = Features.parse(element:)
-      rates = Rates.parse(element:)
+      id_element = element.at_css('form input[name="RentableInventoryPk"]')
+      return unless id_element
+
+      id = id_element['value']
+      text = element.text.strip.gsub(/\s+/, ' ')
 
-      id = link ? ID_REGEX.match(link['href'])[:id] : "#{dimensions.id}-#{features.id}"
+      dimensions = Dimensions.parse(text:)
+      features = Features.parse(text:)
+      rates = Rates.parse(text:)
 
       new(id:, dimensions:, features:, rates:)
     end

data/lib/uhaul/rates.rb

@@ -3,57 +3,38 @@
 module UHaul
   # The rates (street + web) for a facility
   class Rates
-    STREET_SELECTOR = '.part_item_old_price'
-    WEB_SELECTOR = '.part_item_price'
-    VALUE_REGEX = /(?<value>[\d\.]+)/
+    RATE_REGEX = /\$(?<price>[\d\.\,]+) Per Month/
 
-    # @attribute [rw] street
+    # @attribute [rw] rate
     #   @return [Integer]
-    attr_accessor :street
+    attr_accessor :price
 
-    # @attribute [rw] web
-    #   @return [Integer]
-    attr_accessor :web
+    alias street price
+    alias web price
 
-    # @param element [Nokogiri::XML::Element]
+    # @param text [String]
     #
     # @return [Rates]
-    def self.parse(element:)
-      street = parse_value(element: element.at_css(STREET_SELECTOR))
-      web = parse_value(element: element.at_css(WEB_SELECTOR))
-
-      new(street: street || web, web: web || street)
-    end
-
-    # @param element [Nokogiri::XML::Element]
-    #
-    # @return [Float, nil]
-    def self.parse_value(element:)
-      return if element.nil?
+    def self.parse(text:)
+      price = Float(RATE_REGEX.match(text)[:price].gsub(',', ''))
 
-      match = VALUE_REGEX.match(element.text)
-      Float(match[:value]) if match
+      new(price:)
     end
 
     # @param street [Integer]
     # @param web [Integer]
-    def initialize(street:, web:)
-      @street = street
-      @web = web
+    def initialize(price:)
+      @price = price
     end
 
     # @return [String]
     def inspect
-      props = [
-        "street=#{@street.inspect}",
-        "web=#{@web.inspect}"
-      ]
-      "#<#{self.class.name} #{props.join(' ')}>"
+      "#<#{self.class.name} price=#{@price.inspect}>"
     end
 
-    # @return [String] e.g. "$80 (street) | $60 (web)"
+    # @return [String] e.g. "$80"
     def text
-      "$#{@street} (street) | $#{@web} (web)"
+      "$#{@price}"
     end
   end
 end

data/lib/uhaul/sitemap.rb

@@ -16,7 +16,7 @@ module UHaul
         Link.new(loc:)
       end
 
-      new(links: links.filter { |link| link.loc.match(%r{/Self-Storage/.*/\d+}) })
+      new(links: links.filter { |link| link.loc.match(%r{/Self-Storage-.*/\d+}) })
     end
 
     # @param url [String]

data/lib/uhaul/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uhaul
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Kevin Sylvestre
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -117,7 +117,7 @@ metadata:
   homepage_uri: https://github.com/ksylvest/uhaul
   source_code_uri: https://github.com/ksylvest/uhaul
   changelog_uri: https://github.com/ksylvest/uhaul
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.5.23
+signing_key: 
 specification_version: 4
 summary: A crawler for UHaul.
 test_files: []