nsastorage 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecae367c1dc75c720c89af10a90e6325bfe10c03dbfee675a125a45c70fcc6f5
-  data.tar.gz: dbd35a90238e4a806a9e569bae4c99f474f101d92e906eef91cec2a7c85867b2
+  metadata.gz: 6bf4dc5114c043fc32d886eb98d630f24bfff9d3ccefbdd3a92b006c3cb967d4
+  data.tar.gz: c81742bdf7d0d35c5dc23b2584ad10d47b370a1de6e564e08233ed9db7b21538
 SHA512:
-  metadata.gz: 3fa08993d81f797354e095db5f367e650a4c58c67763fa147f65de1cc4794113c7b4394bb5656219484ac62dd530c4dc70fc5b2aa86a6b826140b0c1cd767575
-  data.tar.gz: 2b0dbea4c879f0d44d0716772830b330d497ee1c8170969909db7dcdb375203b50672cba4d1f4611e29e3cd800e183aeee405e4f90b040b5fc7994a936691695
+  metadata.gz: 801e52c62bdac13fcc9338496e47d866bb8392cf7b988b2535596963c5030bc90a5400ce7ad173d71e4a7cac61a89c0a196f0d064115431219fe5301167b9f2e
+  data.tar.gz: ad2da5dfc46c674e85bc310312f6e30feb65f19df3036ce0ba91ee16bd5676c30fe1e5d75241a2e0bbaf7fcd79d67034360455cd00f95ebcf3f31294feff0d94

data/lib/nsastorage/address.rb

@@ -3,6 +3,8 @@
 module NSAStorage
   # The address (street + city + state + zip) of a facility.
   class Address
+    ADDRESS_SELECTOR = '.item-des-box .text-box i'
+    ADDRESS_REGEX = /(?<street>.+),\s+(?<city>.+),\s+(?<state>.+)\s+(?<zip>\d{5})/
     # @attribute [rw] street
     #   @return [String]
     attr_accessor :street
@@ -46,15 +48,17 @@ module NSAStorage
       "#{street}, #{city}, #{state} #{zip}"
     end
 
-    # @param data [Hash]
+    # @param document [Nokogiri::HTML::Document]
     #
     # @return [Address]
-    def self.parse(data:)
+    def self.parse(document:)
+      element = document.at_css(ADDRESS_SELECTOR)
+      match = element.text.match(ADDRESS_REGEX)
       new(
-        street: data['streetAddress'],
-        city: data['addressLocality'],
-        state: data['addressRegion'],
-        zip: data['postalCode']
+        street: match[:street],
+        city: match[:city],
+        state: match[:state],
+        zip: match[:zip]
       )
     end
   end

data/lib/nsastorage/crawler.rb

@@ -5,6 +5,13 @@ module NSAStorage
   class Crawler
     HOST = 'https://www.nsastorage.com'
 
+    # @attribute url [String]
+    # @raise [FetchError]
+    # @return [Hash]
+    def self.json(url:)
+      new.json(url:)
+    end
+
     # @param url [String]
     # @raise [FetchError]
     # @return [Nokogiri::HTML::Document]
@@ -42,6 +49,13 @@ module NSAStorage
       response
     end
 
+    # @param url [String]
+    # @raise [FetchError]
+    # @return [Hash]
+    def json(url:)
+      JSON.parse(String(fetch(url:).body))
+    end
+
     # @param url [String]
     # @raise [FetchError]
     # @return [Nokogiri::XML::Document]

data/lib/nsastorage/dimensions.rb

@@ -5,6 +5,8 @@ module NSAStorage
   class Dimensions
     DEFAULT_HEIGHT = 8.0 # feet
 
+    DIMENSIONS_REGEX = /(?<width>[\d\.]+) x (?<depth>[\d\.]+)/
+
     # @attribute [rw] depth
     #   @return [Float]
     attr_accessor :depth
@@ -55,9 +57,8 @@ module NSAStorage
     #
     # @return [Dimensions]
     def self.parse(element:)
-      text = element.text
-      match = text.match(/(?<width>[\d\.]+)'x(?<depth>[\d\.]+)'/)
-      raise text.inspect if match.nil?
+      text = element.at_css('.unit-select-item-detail').text
+      match = DIMENSIONS_REGEX.match(text)
 
       width = Float(match[:width])
       depth = Float(match[:depth])

data/lib/nsastorage/facility.rb

@@ -7,13 +7,11 @@ module NSAStorage
   class Facility
     class ParseError < StandardError; end
 
-    DEFAULT_EMAIL = 'TODO'
-    DEFAULT_PHONE = 'TODO'
+    DEFAULT_EMAIL = 'customerservice@nsabrands.com'
+    DEFAULT_PHONE = '+1-844-434-1150'
 
     SITEMAP_URL = 'https://www.nsastorage.com/sitemap.xml'
 
-    ID_REGEX = %r{/(?<id>\d+)}
-
     # @attribute [rw] id
     #   @return [String]
     attr_accessor :id
@@ -64,13 +62,14 @@ module NSAStorage
     #
     # @return [Facility]
     def self.parse(url:, document:)
-      data = parse_json_ld(document: document)
-      id = ID_REGEX.match(url)[:id]
+      id = Integer(document.at_css('[data-facility-id]')['data-facility-id'])
+      name = document.at_css('.section-title').text.strip
 
-      address = Address.parse(data: data['address'])
-      geocode = Geocode.parse(data: data['address'])
+      geocode = Geocode.parse(document:)
+      address = Address.parse(document:)
+      prices = Price.fetch(facility_id: id)
 
-      new(id:, url:, name: data['name'], address:, geocode:)
+      new(id:, url:, name:, address:, geocode:, prices:)
     end
 
     # @param document [Nokogiri::HTML::Document]
@@ -78,11 +77,19 @@ module NSAStorage
     # @raise [ParseError]
     #
     # @return [Hash]
-    def self.parse_json_ld(document:)
-      document
-        .xpath('//script[@type="application/ld+json"]')
-        .map { |script| JSON.parse(script.text) }
-        .find { |data| data['@type'] == 'SelfStorage' }
+    def self.parse_ld_json_script(document:)
+      parse_ld_json_scripts(document:).find do |data|
+        data['@type'] == 'SelfStorage'
+      end || raise(ParseError, 'missing ld+json')
+    end
+
+    # @param document [Nokogiri::HTML::Document]
+    #
+    # @return [Array<Hash>]
+    def self.parse_ld_json_scripts(document:)
+      elements = document.xpath('//script[@type="application/ld+json"]')
+
+      elements.map { |element| element.text.empty? ? {} : JSON.parse(element.text) }
     end
 
     # @param id [String]

data/lib/nsastorage/features.rb

@@ -11,20 +11,17 @@ module NSAStorage
 
       new(
         climate_controlled: text.include?('Climate controlled'),
-        inside_drive_up_access: text.include?('Inside drive-up access'),
-        outside_drive_up_access: text.include?('Outside drive-up access'),
-        first_floor_access: text.include?('1st floor access')
+        drive_up_access: text.include?('Drive Up Access'),
+        first_floor_access: text.include?('1st Floor')
       )
     end
 
     # @param climate_controlled [Boolean]
-    # @param inside_drive_up_access [Boolean]
-    # @param outside_drive_up_access [Boolean]
+    # @param drive_up_access [Boolean]
     # @param first_floor_access [Boolean]
-    def initialize(climate_controlled:, inside_drive_up_access:, outside_drive_up_access:, first_floor_access:)
+    def initialize(climate_controlled:, drive_up_access:, first_floor_access:)
       @climate_controlled = climate_controlled
-      @inside_drive_up_access = inside_drive_up_access
-      @outside_drive_up_access = outside_drive_up_access
+      @drive_up_access = drive_up_access
       @first_floor_access = first_floor_access
     end
 
@@ -32,8 +29,7 @@ module NSAStorage
     def inspect
       props = [
         "climate_controlled=#{@climate_controlled}",
-        "inside_drive_up_access=#{@inside_drive_up_access}",
-        "outside_drive_up_access=#{@outside_drive_up_access}",
+        "drive_up_access=#{@drive_up_access}",
         "first_floor_access=#{@first_floor_access}"
       ]
 
@@ -49,8 +45,7 @@ module NSAStorage
     def amenities
       [].tap do |amenities|
         amenities << 'Climate Controlled' if climate_controlled?
-        amenities << 'Inside Drive-Up Access' if inside_drive_up_access?
-        amenities << 'Outside Drive-Up Access' if outside_drive_up_access?
+        amenities << 'Drive-Up Access' if drive_up_access?
         amenities << 'First Floor Access' if first_floor_access?
       end
     end
@@ -60,19 +55,9 @@ module NSAStorage
       @climate_controlled
     end
 
-    # @return [Boolean]
-    def inside_drive_up_access?
-      @inside_drive_up_access
-    end
-
-    # @return [Boolean]
-    def outside_drive_up_access?
-      @outside_drive_up_access
-    end
-
     # @return [Boolean]
     def drive_up_access?
-      inside_drive_up_access? || outside_drive_up_access?
+      @drive_up_access
     end
 
     # @return [Boolean]

data/lib/nsastorage/geocode.rb

@@ -3,6 +3,9 @@
 module NSAStorage
   # The geocode (latitude + longitude) of a facility.
   class Geocode
+    LATITUDE_REGEX = /\\u0022lat\\u0022:(?<latitude>[\+\-\d\.]+)/
+    LONGITUDE_REGEX = /\\u0022long\\u0022:(?<longitude>[\+\-\d\.]+)/
+
     # @attribute [rw] latitude
     #   @return [Float]
     attr_accessor :latitude
@@ -11,14 +14,14 @@ module NSAStorage
     #   @return [Float]
     attr_accessor :longitude
 
-    # @param data [Hash]
+    # @param document [Nokogiri::HTML::Document]
     #
     # @return [Geocode]
-    def self.parse(data:)
-      new(
-        latitude: data['latitude'],
-        longitude: data['longitude']
-      )
+    def self.parse(document:)
+      latitude = LATITUDE_REGEX.match(document.text)[:latitude]
+      longitude = LONGITUDE_REGEX.match(document.text)[:longitude]
+
+      new(latitude: Float(latitude), longitude: Float(longitude))
     end
 
     # @param latitude [Float]

data/lib/nsastorage/price.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 module NSAStorage
-  # The price (id + dimensions + rate) for a facility
+  # The price (id + dimensions + rate) for a facility.
   class Price
+    ID_REGEX = %r{(?<id>\d+)/rent/}
     # @attribute [rw] id
     #   @return [String]
     attr_accessor :id
@@ -19,6 +20,15 @@ module NSAStorage
     #   @return [Rates]
     attr_accessor :rates
 
+    # @param facility_id [Integer]
+    #
+    # @return [Array<Price>]
+    def self.fetch(facility_id:)
+      url = "https://www.nsastorage.com/facility-units/#{facility_id}"
+      html = Crawler.json(url:)['data']['html']['units']
+      Nokogiri::HTML(html).css('[data-unit-size]').map { |element| parse(element:) }
+    end
+
     # @param id [String]
     # @param dimensions [Dimensions]
     # @param features [Features]
@@ -50,8 +60,9 @@ module NSAStorage
     #
     # @return [Price]
     def self.parse(element:)
+      link = element.at_xpath("//a[contains(text(), 'Rent')]")
       new(
-        id: element.attr('id'),
+        id: ID_REGEX.match(link['href'])[:id],
         dimensions: Dimensions.parse(element:),
         features: Features.parse(element:),
         rates: Rates.parse(element:)

data/lib/nsastorage/rates.rb

@@ -3,8 +3,8 @@
 module NSAStorage
   # The rates (street + web) for a facility
   class Rates
-    STREET_SELECTOR = '.ptOriginalPriceSpan'
-    WEB_SELECTOR = '.ptDiscountPriceSpan'
+    STREET_SELECTOR = '.part_item_old_price'
+    WEB_SELECTOR = '.part_item_price'
     VALUE_REGEX = /(?<value>[\d\.]+)/
 
     # @attribute [rw] street

data/lib/nsastorage/sitemap.rb

@@ -19,7 +19,7 @@ module NSAStorage
         Link.new(loc:, lastmod:)
       end
 
-      new(links: links)
+      new(links: links.filter { |link| link.loc.match(%r{/storage/}) })
     end
 
     # @param url [String]

data/lib/nsastorage/version.rb

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

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: nsastorage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kevin Sylvestre
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
 date: 2024-12-11 00:00:00.000000000 Z
@@ -117,7 +117,7 @@ metadata:
   homepage_uri: https://github.com/ksylvest/nsastorage
   source_code_uri: https://github.com/ksylvest/nsastorage
   changelog_uri: https://github.com/ksylvest/nsastorage
-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 NSAStorage.
 test_files: []