publicstorage 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2bf23e38fa3f9d3a9aebab0d6283a5647df197c987cbd5c79b57a59d7838efd
-  data.tar.gz: 771bdb24ed0f74864fbec98eb4f0ed5c337e256d9b2f934c09df480d5ab205cb
+  metadata.gz: fc55c7ceabfcca39423c75b3315ded193267c2d02da648056b472c4f6e5ca64a
+  data.tar.gz: ed7aaea3035fe7aaa876febfa809a90cf9559080e61aeca1fdffb8ed338bba61
 SHA512:
-  metadata.gz: 94ae28707de256932033d3dea9e0a9492de8086e88fb96dcebdac744e1a27727bd57f696a877a89c631243065b25fd9a6f0c19813a846059d319c2c0ebd6073c
-  data.tar.gz: e1496da21aa0fccf557e5fa7c8a1e6e4ed76df02ae4a6c1f6387a1ebc07e04259d15bfefdb6a40c1b9e9b310ac99680d8337094cc390d4c2ee32ad1b1b1f563e
+  metadata.gz: b4d628a25a0af8d0754c98868d3a7cd18c2a8b7d6d9dc6f66fbd1a1a83454aea72c108806f3e25a4311d5aa80862cb4a7798cd5645e08484b4f44179139f1cd3
+  data.tar.gz: 46684da48469510751828b452b5f00381caf94b460da89383675429ed8974878355e03cb5e2fdc879db59b5a8e591a83a557b77f131558a4ad91fafb84dc05d9

data/README.md

@@ -23,8 +23,7 @@ sitemap.links.each do |link|
 
   facility = PublicStorage::Facility.fetch(url:)
 
-  puts "Line 1: #{facility.address.line1}"
-  puts "Line 2: #{facility.address.line2}"
+  puts "Street: #{facility.address.street}"
   puts "City: #{facility.address.city}"
   puts "State: #{facility.address.state}"
   puts "ZIP: #{facility.address.zip}"
@@ -33,8 +32,10 @@ sitemap.links.each do |link|
   puts
 
   facility.prices.each do |price|
-    puts "UID: #{price.uid}"
-    puts "Dimensions: #{price.dimensions.display}"
+    puts "ID: #{price.id}"
+    puts "Width: #{price.dimensions.width}"
+    puts "Depth: #{price.dimensions.depth}"
+    puts "SQFT: #{price.dimensions.sqft}"
     puts "Rates: $#{price.rates.street} (street) / $#{price.rates.web} (web)"
     puts
   end

data/lib/publicstorage/address.rb

@@ -3,13 +3,9 @@
 module PublicStorage
   # Represents an address associated with a facility.
   class Address
-    # @attribute [rw] line1
+    # @attribute [rw] street
     #   @return [String]
-    attr_accessor :line1
-
-    # @attribute [rw] line2
-    #   @return [String]
-    attr_accessor :line2
+    attr_accessor :street
 
     # @attribute [rw] city
     #   @return [String]
@@ -23,14 +19,12 @@ module PublicStorage
     #   @return [String]
     attr_accessor :zip
 
-    # @param line1 [String]
-    # @param line2 [String]
+    # @param street [String]
     # @param city [String]
     # @param state [String]
     # @param zip [String]
-    def initialize(line1:, line2:, city:, state:, zip:)
-      @line1 = line1
-      @line2 = line2
+    def initialize(street:, city:, state:, zip:)
+      @street = street
       @city = city
       @state = state
       @zip = zip
@@ -39,8 +33,7 @@ module PublicStorage
     # @return [String]
     def inspect
       props = [
-        "line1=#{@line1.inspect}",
-        "line2=#{@line2.inspect}",
+        "street=#{@street.inspect}",
         "city=#{@city.inspect}",
         "state=#{@state.inspect}",
         "zip=#{@zip.inspect}"
@@ -53,10 +46,9 @@ module PublicStorage
     # @return [Address]
     def self.parse(data:)
       new(
-        line1: data['line1'],
-        line2: data['line2'],
-        city: data['city'],
-        state: data['stateName'],
+        street: data['streetAddress'],
+        city: data['addressLocality'],
+        state: data['addressRegion'],
         zip: data['postalCode']
       )
     end

data/lib/publicstorage/dimensions.rb

@@ -3,6 +3,8 @@
 module PublicStorage
   # The dimensions associated with a price.
   class Dimensions
+    SELECTOR = '.unit-size'
+
     # @attribute [rw] depth
     #   @return [Integer]
     attr_accessor :depth
@@ -15,19 +17,13 @@ module PublicStorage
     #   @return [Integer]
     attr_accessor :sqft
 
-    # @attribute [rw] display
-    #   @return [String]
-    attr_accessor :display
-
-    # @param depth [Integer]
-    # @param width [Integer]
+    # @param depth [Float]
+    # @param width [Float]
     # @param sqft [Integer]
-    # @param display [String]
-    def initialize(depth:, width:, sqft:, display:)
+    def initialize(depth:, width:, sqft:)
       @depth = depth
       @width = width
       @sqft = sqft
-      @display = display
     end
 
     # @return [String]
@@ -35,17 +31,21 @@ module PublicStorage
       props = [
         "depth=#{@depth.inspect}",
         "width=#{@width.inspect}",
-        "sqft=#{@sqft.inspect}",
-        "display=#{@display.inspect}"
+        "sqft=#{@sqft.inspect}"
       ]
       "#<#{self.class.name} #{props.join(' ')}>"
     end
 
-    # @param data [Hash]
+    # @param element [Nokogiri::XML::Element]
     #
     # @return [Dimensions]
-    def self.parse(data:)
-      new(depth: data['depth'], width: data['width'], sqft: data['squareFoot'], display: data['display'])
+    def self.parse(element:)
+      match = element.at(SELECTOR).text.match(/(?<depth>[\d\.]+)'x(?<width>[\d\.]+)'/)
+      depth = Float(match[:depth])
+      width = Float(match[:width])
+      sqft = Integer(depth * width)
+
+      new(depth:, width:, sqft:)
     end
   end
 end

data/lib/publicstorage/facility.rb

@@ -5,6 +5,8 @@ module PublicStorage
   class Facility
     SITEMAP_URL = 'https://www.publicstorage.com/sitemap_0-product.xml'
 
+    PRICE_SELECTOR = '.units-results-section .unit-list-group .unit-list-item'
+
     # @attribute [rw] address
     #   @return [Address]
     attr_accessor :address
@@ -46,21 +48,19 @@ module PublicStorage
     # @return [Facility]
     def self.fetch(url:)
       document = Crawler.html(url:)
-      data = JSON.parse(document.at('#__NEXT_DATA__').text)
-      parse(data:)
+      parse(document:)
     end
 
-    # @param data [Hash]
+    # @param document [NokoGiri::XML::Document]
     #
     # @return [Facility]
-    def self.parse(data:)
-      page_data = data.dig('props', 'pageProps', 'pageData', 'data')
-      facility_data = page_data.dig('facilityData', 'data')
-      unit_classes = page_data.dig('unitClasses', 'data', 'unitClasses')
+    def self.parse(document:)
+      data = JSON.parse(document.at_css('script[type="application/ld+json"]').text)
+      item = data.find { |entry| entry['@type'] == 'SelfStorage' }
+      address = Address.parse(data: item['address'])
+      geocode = Geocode.parse(data: item['geo'])
 
-      address = Address.parse(data: facility_data['store']['address'])
-      geocode = Geocode.parse(data: facility_data['store']['geocode'])
-      prices = unit_classes.map { |price_data| Price.parse(data: price_data) }
+      prices = document.css(PRICE_SELECTOR).map { |element| Price.parse(element:) }
 
       new(address:, geocode:, prices:)
     end

data/lib/publicstorage/price.rb

@@ -3,13 +3,9 @@
 module PublicStorage
   # A price associated with a unit.
   class Price
-    # @attribute [rw] uid
+    # @attribute [rw] id
     #   @return [String]
-    attr_accessor :uid
-
-    # @attribute [rw] availability
-    #   @return [Availability]
-    attr_accessor :availability
+    attr_accessor :id
 
     # @attribute [rw] dimensions
     #   @return [Dimensions]
@@ -19,13 +15,11 @@ module PublicStorage
     #   @return [Rates]
     attr_accessor :rates
 
-    # @param uid [String]
-    # @param availability [Availability]
+    # @param id [String]
     # @param dimensions [Dimensions]
     # @param rates [Rates]
-    def initialize(uid:, availability:, dimensions:, rates:)
-      @uid = uid
-      @availability = availability
+    def initialize(id:, dimensions:, rates:)
+      @id = id
       @dimensions = dimensions
       @rates = rates
     end
@@ -33,24 +27,22 @@ module PublicStorage
     # @return [String]
     def inspect
       props = [
-        "uid=#{@uid.inspect}",
-        "availability=#{@availability.inspect}",
+        "id=#{@id.inspect}",
         "dimensions=#{@dimensions.inspect}",
         "rates=#{@rates.inspect}"
       ]
       "#<#{self.class.name} #{props.join(' ')}>"
     end
 
-    # @param data [Hash]
+    # @param element [Nokogiri::XML::Element]
     #
     # @return [Price]
-    def self.parse(data:)
-      availability = Availability.parse(data: data['availability'])
-      dimensions = Dimensions.parse(data: data['dimensions'])
-      rates = Rates.parse(data: data['rates'])
+    def self.parse(element:)
+      rates = Rates.parse(element:)
+      dimensions = Dimensions.parse(element:)
+
       new(
-        uid: data['uid'],
-        availability: availability,
+        id: element.attr('data-unitid'),
         dimensions: dimensions,
         rates: rates
       )

data/lib/publicstorage/rates.rb

@@ -3,9 +3,8 @@
 module PublicStorage
   # The rates associated with a price
   class Rates
-    # @attribute [rw] nsc
-    #   @return [Integer]
-    attr_accessor :nsc
+    STREET_SELECTOR = '.unit-prices .unit-pricing .unit-strike-through-price'
+    WEB_SELECTOR = '.unit-prices .unit-pricing .unit-price'
 
     # @attribute [rw] street
     #   @return [Integer]
@@ -15,11 +14,9 @@ module PublicStorage
     #   @return [Integer]
     attr_accessor :web
 
-    # @param nsc [Integer]
     # @param street [Integer]
     # @param web [Integer]
-    def initialize(nsc:, street:, web:)
-      @nsc = nsc
+    def initialize(street:, web:)
       @street = street
       @web = web
     end
@@ -27,22 +24,19 @@ module PublicStorage
     # @return [String]
     def inspect
       props = [
-        "nsc=#{@nsc.inspect}",
         "street=#{@street.inspect}",
         "web=#{@web.inspect}"
       ]
       "#<#{self.class.name} #{props.join(' ')}>"
     end
 
-    # @param data [Hash]
+    # @param element [Nokogiri::XML::Element]
     #
     # @return [Rates]
-    def self.parse(data:)
-      new(
-        nsc: data['nsc'],
-        street: data['street'],
-        web: data['web']
-      )
+    def self.parse(element:)
+      street = Integer(element.at(STREET_SELECTOR).text.match(/(?<value>\d+)/)[:value])
+      web = Integer(element.at(WEB_SELECTOR).text.match(/(?<value>\d+)/)[:value])
+      new(street:, web:)
     end
   end
 end

data/lib/publicstorage/version.rb

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

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: publicstorage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Kevin Sylvestre
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
 date: 2024-11-27 00:00:00.000000000 Z
@@ -79,7 +79,6 @@ files:
 - bin/setup
 - lib/publicstorage.rb
 - lib/publicstorage/address.rb
-- lib/publicstorage/availability.rb
 - lib/publicstorage/crawler.rb
 - lib/publicstorage/dimensions.rb
 - lib/publicstorage/facility.rb
@@ -97,7 +96,7 @@ metadata:
   homepage_uri: https://github.com/ksylvest/publicstorage
   source_code_uri: https://github.com/ksylvest/publicstorage
   changelog_uri: https://github.com/ksylvest/publicstorage
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -112,8 +111,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 PublicStorage.
 test_files: []

data/lib/publicstorage/availability.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module PublicStorage
-  # The availability associated with a price.
-  class Availability
-    # @attribute [rw] available
-    #   @return [String]
-    attr_accessor :available
-
-    # @param available [String]
-    def initialize(available:)
-      @available = available
-    end
-
-    # @return [String]
-    def inspect
-      props = [
-        "available=#{@available.inspect}"
-      ]
-      "#<#{self.class.name} #{props.join(' ')}>"
-    end
-
-    # @param data [Hash]
-    #
-    # @return [Availability]
-    def self.parse(data:)
-      new(available: data['available'])
-    end
-  end
-end