publicstorage 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f797ad8918b9cea8da35957e83b8bbf56ab02f1bfae95ee24a0fe1a316d1117d
-  data.tar.gz: e2a976a36b0fc0d5edefde19c7234b778257341abc9c9507029bac2d6e31f1e3
+  metadata.gz: 289fa9cafef0fbd579e585804481315f664daa8e2366d0af7e29e6e8ca36e2a8
+  data.tar.gz: d3ae363cef7d78466aa500774273910d16eda47cd6305842279636d492bf005f
 SHA512:
-  metadata.gz: eb338e5697de874ba118f47828d19ed3ed817cd136aac67372064fcea2dabde722c34cb39924b55e91bbbca3802b8469b7caf6a5fef5fa64abf559a2c2e38090
-  data.tar.gz: 8ed743ff4a0a59deefe92064d62345d6deaaceb860e597583758b8e7d18eac6f0db6b12f67ef0324212882ef1fea14009501b2ab0566d139241ae4d78d60f7eb
+  metadata.gz: 197fd2db249b2a5022219e7f2e25ac88c4461370ef757e534e273460fe6a13f261a151e541a60a48de591c9c56380f8c1a71c190d079816cbcf0759abe27dfd4
+  data.tar.gz: 11985f88d43d959569dcf396c92e0b17cee9347a22058f1642389f7954880cbde9d0676540356bf8005eafbdc2d3c6f3938619a5d2b7b370090362998f1b6dea

data/lib/publicstorage/facility.rb

@@ -5,6 +5,9 @@ module PublicStorage
   class Facility
     SITEMAP_URL = 'https://www.publicstorage.com/sitemap_0-product.xml'
 
+    DEFAULT_PHONE = '1-800-742-8048'
+    DEFAULT_EMAIL = 'customerservice@publicstorage.com'
+
     PRICE_SELECTOR = '.units-results-section .unit-list-group .unit-list-item'
     LD_SELECTOR = 'script[type="application/ld+json"]'
 
@@ -14,10 +17,22 @@ module PublicStorage
     #   @return [Integer]
     attr_accessor :id
 
+    # @attribute [rw] url
+    #   @return [String]
+    attr_accessor :url
+
     # @attribute [rw] name
     #   @return [String]
     attr_accessor :name
 
+    # @attribute [rw] phone
+    #   @return [String]
+    attr_accessor :phone
+
+    # @attribute [rw] email
+    #   @return [String]
+    attr_accessor :email
+
     # @attribute [rw] address
     #   @return [Address]
     attr_accessor :address
@@ -40,13 +55,13 @@ module PublicStorage
     # @return [Facility]
     def self.fetch(url:)
       document = Crawler.html(url:)
-      parse(document:)
+      parse(url:, document:)
     end
 
     # @param document [NokoGiri::XML::Document]
     #
     # @return [Facility]
-    def self.parse(document:)
+    def self.parse(url:, document:)
       data = parse_ld(document:)
       id = Integer(data['url'].match(ID_REGEX)[:id])
       name = data['name']
@@ -55,7 +70,7 @@ module PublicStorage
 
       prices = document.css(PRICE_SELECTOR).map { |element| Price.parse(element:) }
 
-      new(id:, name:, address:, geocode:, prices:)
+      new(id:, url:, name:, address:, geocode:, prices:)
     end
 
     # @param document [NokoGiri::XML::Document]
@@ -81,23 +96,31 @@ module PublicStorage
     end
 
     # @param id [String]
+    # @param url [String]
     # @param name [String]
     # @param address [Address]
     # @param geocode [Geocode]
     # @param prices [Array<Price>]
-    def initialize(id:, name:, address:, geocode:, prices:)
+    def initialize(id:, url:, name:, address:, geocode:, phone: DEFAULT_PHONE, email: DEFAULT_EMAIL, prices: [])
       @id = id
+      @url = url
       @name = name
       @address = address
       @geocode = geocode
+      @phone = phone
+      @email = email
       @prices = prices
     end
 
     # @return [String]
     def inspect
       props = [
+        "id=#{@id.inspect}",
+        "url=#{@url.inspect}",
         "address=#{@address.inspect}",
         "geocode=#{@geocode.inspect}",
+        "phone=#{@phone.inspect}",
+        "email=#{@email.inspect}",
         "prices=#{@prices.inspect}"
       ]
       "#<#{self.class.name} #{props.join(' ')}>"

data/lib/publicstorage/features.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module PublicStorage
+  # The features (e.g. climate-controlled, inside-drive-up-access, outside-drive-up-access, etc) of a price.
+  class Features
+    # @param data [Hash]
+    #
+    # @return [Features]
+    def self.parse(data:)
+      features = data['features']
+      new(
+        climate_controlled: features&.include?('climate controlled'),
+        drive_up_access: features&.include?('drive-up access'),
+        first_floor_access: features&.include?('1st floor')
+      )
+    end
+
+    # @param climate_controlled [Boolean]
+    # @param drive_up_access [Boolean]
+    # @param first_floor_access [Boolean]
+    def initialize(climate_controlled:, drive_up_access:, first_floor_access:)
+      @climate_controlled = climate_controlled
+      @drive_up_access = drive_up_access
+      @first_floor_access = first_floor_access
+    end
+
+    # @return [String]
+    def inspect
+      props = [
+        "climate_controlled=#{@climate_controlled}",
+        "drive_up_access=#{@drive_up_access}",
+        "first_floor_access=#{@first_floor_access}"
+      ]
+
+      "#<#{self.class.name} #{props.join(' ')}>"
+    end
+
+    # @return [String] e.g. "Climate Controlled + First Floor Access"
+    def text
+      amenities.join(' + ')
+    end
+
+    # @return [Array<String>]
+    def amenities
+      [].tap do |amenities|
+        amenities << 'Climate Controlled' if climate_controlled?
+        amenities << 'Drive-Up Access' if drive_up_access?
+        amenities << 'First Floor Access' if first_floor_access?
+      end
+    end
+
+    # @return [Boolean]
+    def climate_controlled?
+      @climate_controlled
+    end
+
+    # @return [Boolean]
+    def drive_up_access?
+      @drive_up_access
+    end
+
+    # @return [Boolean]
+    def first_floor_access?
+      @first_floor_access
+    end
+  end
+end

data/lib/publicstorage/price.rb

@@ -13,16 +13,22 @@ module PublicStorage
     #   @return [Dimensions]
     attr_accessor :dimensions
 
+    # @attribute [rw] features
+    #   @return [Features]
+    attr_accessor :features
+
     # @attribute [rw] rates
     #   @return [Rates]
     attr_accessor :rates
 
     # @param id [String]
     # @param dimensions [Dimensions]
+    # @param features [Features]
     # @param rates [Rates]
-    def initialize(id:, dimensions:, rates:)
+    def initialize(id:, dimensions:, features:, rates:)
       @id = id
       @dimensions = dimensions
+      @features = features
       @rates = rates
     end
 
@@ -31,14 +37,15 @@ module PublicStorage
       props = [
         "id=#{@id.inspect}",
         "dimensions=#{@dimensions.inspect}",
+        "features=#{@features.inspect}",
         "rates=#{@rates.inspect}"
       ]
       "#<#{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) | $100 (street) / $90 (web) | Climate Controlled"
     def text
-      "#{@id} | #{@dimensions.text} | #{@rates.text}"
+      "#{@id} | #{@dimensions.text} | #{@rates.text} | #{@features.text}"
     end
 
     # @param element [Nokogiri::XML::Element]
@@ -49,10 +56,12 @@ module PublicStorage
 
       rates = Rates.parse(data:)
       dimensions = Dimensions.parse(data:)
+      features = Features.parse(data:)
 
       new(
         id: element.attr('data-unitid'),
         dimensions: dimensions,
+        features: features,
         rates: rates
       )
     end

data/lib/publicstorage/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publicstorage
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Kevin Sylvestre
@@ -87,6 +87,7 @@ files:
 - lib/publicstorage/crawler.rb
 - lib/publicstorage/dimensions.rb
 - lib/publicstorage/facility.rb
+- lib/publicstorage/features.rb
 - lib/publicstorage/fetch_error.rb
 - lib/publicstorage/geocode.rb
 - lib/publicstorage/link.rb
@@ -100,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.1.0
-  changelog_uri: https://github.com/ksylvest/publicstorage/releases/tag/v1.1.0
+  source_code_uri: https://github.com/ksylvest/publicstorage/tree/v1.3.0
+  changelog_uri: https://github.com/ksylvest/publicstorage/releases/tag/v1.3.0
   documentation_uri: https://publicstorage.ksylvest.com/
 post_install_message: 
 rdoc_options: []