publicstorage 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 289fa9cafef0fbd579e585804481315f664daa8e2366d0af7e29e6e8ca36e2a8
-  data.tar.gz: d3ae363cef7d78466aa500774273910d16eda47cd6305842279636d492bf005f
+  metadata.gz: c9f5251b3a20251494fcb996abc4a615d4aea13328e56930cadf9d9cc55b7b85
+  data.tar.gz: c6118d03fc038114cca43d836c7699a3b1992a482bda995f2138272076ee318e
 SHA512:
-  metadata.gz: 197fd2db249b2a5022219e7f2e25ac88c4461370ef757e534e273460fe6a13f261a151e541a60a48de591c9c56380f8c1a71c190d079816cbcf0759abe27dfd4
-  data.tar.gz: 11985f88d43d959569dcf396c92e0b17cee9347a22058f1642389f7954880cbde9d0676540356bf8005eafbdc2d3c6f3938619a5d2b7b370090362998f1b6dea
+  metadata.gz: f29a0afa30474641681ec49b9a3b80e3e5fcffd30b26b53ae65aaf316d78bceafb894bbc789bcc8440f95220d7e1e44f290915464ebcab658560538d3c6f794b
+  data.tar.gz: 193ffa5234a99e8238d8f06c3e31bdaeb6bf6fe17e3be3b5378718866a7a943982d56b70695b314a0bda23edac14b6f7f7cf209edcf8ac82a51033c0e80fa53a

data/lib/publicstorage/address.rb

@@ -51,11 +51,21 @@ module PublicStorage
     # @return [Address]
     def self.parse(data:)
       new(
-        street: data['streetAddress'],
+        street: stripe_leading_or_trailing_null(data['streetAddress']),
         city: data['addressLocality'],
         state: data['addressRegion'],
         zip: data['postalCode']
       )
     end
+
+    # NOTE: this fixes a bug w/ publicstorage that currently exists where addresses have a leading / trailing null.
+    #
+    # @param value [String]
+    #
+    # @return [String]
+    def self.stripe_leading_or_trailing_null(value)
+      match = value.match(/\A(?:null)?(?<text>.*?)(?:null)?\z/)
+      match[:text]
+    end
   end
 end

data/lib/publicstorage/facility.rb

@@ -8,6 +8,7 @@ module PublicStorage
     DEFAULT_PHONE = '1-800-742-8048'
     DEFAULT_EMAIL = 'customerservice@publicstorage.com'
 
+    NAME_SELECTOR = '.plp-page-header'
     PRICE_SELECTOR = '.units-results-section .unit-list-group .unit-list-item'
     LD_SELECTOR = 'script[type="application/ld+json"]'
 
@@ -62,17 +63,36 @@ module PublicStorage
     #
     # @return [Facility]
     def self.parse(url:, document:)
-      data = parse_ld(document:)
-      id = Integer(data['url'].match(ID_REGEX)[:id])
-      name = data['name']
+      data = parse_ld(document: document)
+      id = parse_id(data: data)
+      name = parse_name(document: document)
       address = Address.parse(data: data['address'])
       geocode = Geocode.parse(data: data['geo'])
-
-      prices = document.css(PRICE_SELECTOR).map { |element| Price.parse(element:) }
+      prices = parse_prices(document: document)
 
       new(id:, url:, name:, address:, geocode:, prices:)
     end
 
+    # @param data [Hash]
+    #
+    # @return [Integer]
+    def self.parse_id(data:)
+      Integer(data['url'].match(ID_REGEX)[:id])
+    end
+
+    # @param document [NokoGiri::XML::Document]
+    #
+    # @return [String]
+    def self.parse_name(document:)
+      document.at_css(NAME_SELECTOR).text.gsub(/\s+/, ' ').strip
+    end
+
+    # @param docunent [NokoGiri::XML::Document]
+    # @return Array<Price>
+    def self.parse_prices(document:)
+      document.css(PRICE_SELECTOR).map { |element| Price.parse(element:) }
+    end
+
     # @param document [NokoGiri::XML::Document]
     #
     # @return [Hash]

data/lib/publicstorage/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publicstorage
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Kevin Sylvestre
@@ -101,8 +101,8 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/ksylvest/publicstorage
-  source_code_uri: https://github.com/ksylvest/publicstorage/tree/v1.3.0
-  changelog_uri: https://github.com/ksylvest/publicstorage/releases/tag/v1.3.0
+  source_code_uri: https://github.com/ksylvest/publicstorage/tree/v1.4.0
+  changelog_uri: https://github.com/ksylvest/publicstorage/releases/tag/v1.4.0
   documentation_uri: https://publicstorage.ksylvest.com/
 post_install_message: 
 rdoc_options: []