touringplans 0.2.6 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73b59b67226a12fe4d77223e9068c45928359062571a0c0571a769a6b22c3df2
-  data.tar.gz: 40253a1085b837c4a99bec95d70ce9f79c75f189f3461acd463ad7edce8d9307
+  metadata.gz: 9a1f5173ae5122387ff736c9330ecdf98d29307d3839276179f74d25fe734d55
+  data.tar.gz: 832f6fc645e19986c3cced3e7b84695ecc7f7a68fb4d1ea84082811a0cde02b7
 SHA512:
-  metadata.gz: 605df55c3dc98501e5892af6e9b3a6ec6d02a95048973fae82b66c80ba2626e93f4dd2253dd1f2a1db5388b84ed9785a5ca9270fb327f01adf728cd39c738921
-  data.tar.gz: 86e2240776b188df0128d40cfc4ef9ddb108ea609bc91a0f4493fc4cfc0cd8ce09b7746ee9f3eb8e3d6bf3526163143bae2249412d5d94e15363f2142b3e1787
+  metadata.gz: 910c19291ef5eb840fa9d437c1d90ab39841d95b9ce4dd622c408ab39e10aa177f782820b97dabfbd19915cada6ddf6051d033a758150fe030cf1167d33f0803
+  data.tar.gz: d1ae5e6902c623fc6326901a9b23bf624914b33d467aded6dab9ae3824d7fd19539aee9503e3d9ca83db74d735ae45ea070f62c4590952bdcaa84de78af1900b

data/.version

@@ -1 +1 @@
-0.2.6
+0.3.5

data/lib/routes.yml

@@ -419,6 +419,9 @@ epcot_attractions_mission_space_orange:
 epcot_attractions_reflections_of_china:
   method: get
   path: "/epcot/attractions/reflections-of-china.json"
+epcot_attractions_remys_ratatouille_adventure:
+  method: get
+  path: "/epcot/attractions/remys-ratatouille-adventure.json"
 epcot_attractions_the_seas_main_tank_and_exhibits:
   method: get
   path: "/epcot/attractions/the-seas-main-tank-and-exhibits.json"
@@ -800,3 +803,117 @@ hollywood_studios_dining_roundup_rodeo_bbq:
 hollywood_studios_dining_scifi_dine_in_theater_restaurant:
   method: get
   path: "/hollywood-studios/dining/scifi-dine-in-theater-restaurant.json"
+walt_disney_world_hotels_fort_wilderness_campsites:
+  method: get
+  path: "/walt-disney-world/hotels/fort-wilderness-campsites.json"
+walt_disney_world_hotels_disneys_animal_kingdom_lodge:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-animal-kingdom-lodge.json"
+walt_disney_world_hotels_disneys_beach_club_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-beach-club-resort.json"
+walt_disney_world_hotels_disneys_boardwalk_inn:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-boardwalk-inn.json"
+walt_disney_world_hotels_disneys_contemporary_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-contemporary-resort.json"
+walt_disney_world_hotels_disneys_grand_floridian_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-grand-floridian-resort.json"
+walt_disney_world_hotels_disneys_polynesian_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-polynesian-resort.json"
+walt_disney_world_hotels_disneys_wilderness_lodge:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-wilderness-lodge.json"
+walt_disney_world_hotels_disneys_yacht_club_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-yacht-club-resort.json"
+walt_disney_world_hotels_shades_of_green_at_walt_disney_world:
+  method: get
+  path: "/walt-disney-world/hotels/shades-of-green-at-walt-disney-world.json"
+walt_disney_world_hotels_star_wars_galactic_starcruiser:
+  method: get
+  path: "/walt-disney-world/hotels/star-wars-galactic-starcruiser.json"
+walt_disney_world_hotels_dolphin_at_walt_disney_world:
+  method: get
+  path: "/walt-disney-world/hotels/dolphin-at-walt-disney-world.json"
+walt_disney_world_hotels_swan_at_walt_disney_world:
+  method: get
+  path: "/walt-disney-world/hotels/swan-at-walt-disney-world.json"
+walt_disney_world_hotels_disney_world_swan_reserve:
+  method: get
+  path: "/walt-disney-world/hotels/disney-world-swan-reserve.json"
+walt_disney_world_hotels_bay_lake_tower_at_disneys_contemporary_resort:
+  method: get
+  path: "/walt-disney-world/hotels/bay-lake-tower-at-disneys-contemporary-resort.json"
+walt_disney_world_hotels_disneys_wilderness_lodge_villas:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-wilderness-lodge-villas.json"
+walt_disney_world_hotels_copper_creek_villas:
+  method: get
+  path: "/walt-disney-world/hotels/copper-creek-villas.json"
+walt_disney_world_hotels_animal_kingdom_villas_jambo:
+  method: get
+  path: "/walt-disney-world/hotels/animal-kingdom-villas-jambo.json"
+walt_disney_world_hotels_disneys_animal_kingdom_villas:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-animal-kingdom-villas.json"
+walt_disney_world_hotels_disneys_beach_club_villas:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-beach-club-villas.json"
+walt_disney_world_hotels_disneys_boardwalk_villas:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-boardwalk-villas.json"
+walt_disney_world_hotels_disneys_old_key_west_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-old-key-west-resort.json"
+walt_disney_world_hotels_disneys_polynesian_villas_bungalows:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-polynesian-villas-bungalows.json"
+walt_disney_world_hotels_disneys_riviera_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-riviera-resort.json"
+walt_disney_world_hotels_disneys_saratoga_springs_resort_spa:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-saratoga-springs-resort-spa.json"
+walt_disney_world_hotels_disney_reflections:
+  method: get
+  path: "/walt-disney-world/hotels/disney-reflections.json"
+walt_disney_world_hotels_the_villas_at_disneys_grand_floridian_resort_and_spa:
+  method: get
+  path: "/walt-disney-world/hotels/the-villas-at-disneys-grand-floridian-resort-and-spa.json"
+walt_disney_world_hotels_treehouse_villas_at_disneys_saratoga_springs_resort:
+  method: get
+  path: "/walt-disney-world/hotels/treehouse-villas-at-disneys-saratoga-springs-resort.json"
+walt_disney_world_hotels_disneys_caribbean_beach_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-caribbean-beach-resort.json"
+walt_disney_world_hotels_disneys_coronado_springs_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-coronado-springs-resort.json"
+walt_disney_world_hotels_disneys_port_orleans_resort_french_quarter:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-port-orleans-resort-french-quarter.json"
+walt_disney_world_hotels_disneys_port_orleans_resort_riverside:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-port-orleans-resort-riverside.json"
+walt_disney_world_hotels_fort_wilderness_resort_cabins:
+  method: get
+  path: "/walt-disney-world/hotels/fort-wilderness-resort-cabins.json"
+walt_disney_world_hotels_disneys_all_star_movies_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-all-star-movies-resort.json"
+walt_disney_world_hotels_disneys_all_star_music_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-all-star-music-resort.json"
+walt_disney_world_hotels_disneys_all_star_sports_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-all-star-sports-resort.json"
+walt_disney_world_hotels_disneys_art_of_animation_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-art-of-animation-resort.json"
+walt_disney_world_hotels_disneys_pop_century_resort:
+  method: get
+  path: "/walt-disney-world/hotels/disneys-pop-century-resort.json"

data/lib/touringplans/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Touringplans
-  VERSION = "0.2.6"
+  VERSION = "0.3.5"
 end

data/lib/touringplans.rb

@@ -12,14 +12,6 @@ module Touringplans
     include Dry.Types()
   end
 
-  include HTTParty
-  # currently Touring Plans has no verision in its API
-  DEFAULT_API_VERSION = "1"
-  DEFAULT_BASE_URI  = "https://touringplans.com/"
-  DEFAULT_QUERY     = {}
-
-  base_uri DEFAULT_BASE_URI
-
   ROUTES = {
     magic_kingdom_dining: {
       method: "get",
@@ -80,13 +72,13 @@ module Touringplans
     walt_disney_world_disney_springs_resorts: {
       method: "get",
       path: "/walt-disney-world/hotels.json"
-    },
-  }
+    }
+  }.freeze
 
   def self.routes
     ROUTES
   end
-  
+
   # deals solely with how to create access to the resource, the lock of "lock & key"
   class Connection
     # concerned only on where it gets the info it needs
@@ -96,6 +88,7 @@ module Touringplans
     # currently Touring Plans has no verision in its API
     DEFAULT_API_VERSION = "1"
     DEFAULT_BASE_URI  = "https://touringplans.com/"
+    # do not freeze DEFAULT_QUERY
     DEFAULT_QUERY     = {}
 
     base_uri DEFAULT_BASE_URI
@@ -158,12 +151,13 @@ module Touringplans
     end
   end
 
+  # Generates and updates routes for all types of venues in a YAML document.
   class RoutesTable
-    require 'fileutils'
-    def initialize(filename: "routes_table.yml")      
-      @filename         = filename
+    require "fileutils"
+    def initialize(filename: "routes_table.yml")
+      @filename = filename
     end
-    
+
     def self.original_routes
       # this method exists so that we can create a yaml file of routes
       tpr = Touringplans.routes
@@ -177,9 +171,9 @@ module Touringplans
       # # create new hash with string keys
       # string_keys.zip(rt_values).to_h
     end
-    
+
     def self.symbolize_keys(hash)
-      hash.inject({}){|result, (key, value)|
+      hash.each_with_object({}) do |(key, value), result|
         new_key = case key
                   when String then key.to_sym
                   else key
@@ -189,13 +183,12 @@ module Touringplans
                     else value
                     end
         result[new_key] = new_value
-        result
-      }
+      end
     end
 
     def self.stringify_keys(hash)
       # inspired by https://avdi.codes/recursively-symbolize-keys/
-      hash.inject({}){|result, (key, value)|
+      hash.each_with_object({}) do |(key, value), result|
         new_key = case key
                   when Symbol then key.to_s
                   else key
@@ -205,21 +198,20 @@ module Touringplans
                     else value
                     end
         result[new_key] = new_value
-        result
-      }
-    end  
+      end
+    end
 
-    def self.load_routes_file(relative_file_path: "/lib/routes.yml")
-        routes_file = FileUtils.getwd() + relative_file_path
-        YAML.load(File.read(routes_file))
+    def self.load_routes_file(routes_relative_file_path: "/routes.yml")
+      tp_path = $LOAD_PATH.grep(/touringplans/).last
+      routes_file = "#{tp_path}#{routes_relative_file_path}"
+      YAML.safe_load(File.read(routes_file))
     end
-    
-    
+
     def self.update_file
       # gather info into hashes
       attractions_routes    = _generate_interest_routes_hash("attractions")
       dining_routes         = _generate_interest_routes_hash("dining")
-      hotels_routes         = {} #_generate_interest_routes_hash("hotels")
+      hotels_routes         = _generate_interest_routes_hash("hotels")
       updated_routes        = original_routes.merge(attractions_routes, dining_routes, hotels_routes)
 
       updated_routes_yaml   = _convert_hash_to_yaml(updated_routes)
@@ -230,12 +222,13 @@ module Touringplans
 
     def self._initialize_file
       # delete old file if it exits
-      lib_dir     =  FileUtils.getwd() + "/lib"
+      lib_dir = FileUtils.getwd + "/lib"
       routes_file = "#{lib_dir}/routes.yml"
 
       # ensure the file exists
       touched_routes_file_array = FileUtils.touch(routes_file)
-      touched_routes_file = touched_routes_file_array.first
+      # we want the first string value
+      touched_routes_file_array.first
     end
 
     def self._generate_interest_routes_hash(interest)
@@ -243,7 +236,7 @@ module Touringplans
       interest_routes = {}
 
       interest_venues.each do |iv|
-        new_route = self._generate_interest_route(iv.venue_permalink, interest, iv.permalink)
+        new_route = _generate_interest_route(iv.venue_permalink, interest, iv.permalink)
         key = new_route.keys.first
         values = new_route[key]
         interest_routes[key] = values
@@ -251,7 +244,7 @@ module Touringplans
 
       interest_routes
     end
-    
+
     def self._generate_interest_route(venue_permalink, interest_permalink, place_permalink)
       # {magic_kingdom_attractions_haunted_mansion: {
       #   method: "get",
@@ -264,12 +257,8 @@ module Touringplans
       method  = "get"
       format  = "json"
 
-      hash = { key => { "method".to_s  => "get",
-                        "path".to_s    => "#{path}.#{format}"
-                      }
-      }
-
-      hash
+      { key => { "method".to_s => method,
+                 "path".to_s => "#{path}.#{format}" } }
     end
 
     def self._convert_hash_to_yaml(hash)
@@ -281,13 +270,13 @@ module Touringplans
       new_file.write(content)
       new_file.close
     end
-    
+
     def self._read_file_to_terminal(file)
       new_file = File.open(file, "r")
       new_file.close
     end
-    
   end
+
   # model with the attributes
   class CounterServiceLocation < Dry::Struct
     transform_keys(&:to_sym)
@@ -347,7 +336,7 @@ module Touringplans
     attribute :kosher_available, Types::Params::Bool
     attribute :dinable_id, Types::Params::Integer
     attribute :dinable_type, Types::String.optional
-    attribute :venue_permalink, Types::String.optional    
+    attribute :venue_permalink, Types::String.optional
   end
 
   # model with the attributes
@@ -380,11 +369,11 @@ module Touringplans
     attribute :house_specialties, Types::String.optional
     attribute :counter_quality_rating, Types::String.optional
     attribute :counter_value_rating, Types::String.optional
-    attribute :table_quality_rating, Types::Params::Decimal.optional
-    attribute :table_value_rating, Types::Params::Decimal.optional
-    attribute :overall_rating, Types::Params::Decimal.optional
-    attribute :service_rating, Types::Params::Decimal.optional
-    attribute :friendliness_rating, Types::Params::Decimal.optional
+    attribute :table_quality_rating, Types::Params::Float.optional
+    attribute :table_value_rating, Types::Params::Float.optional
+    attribute :overall_rating, Types::Params::Float.optional
+    attribute :service_rating, Types::Params::Float.optional
+    attribute :friendliness_rating, Types::Params::Float.optional
     attribute :adult_breakfast_menu_url, Types::String.optional
     attribute :adult_lunch_menu_url, Types::String.optional
     attribute :adult_dinner_menu_url, Types::String.optional
@@ -412,6 +401,69 @@ module Touringplans
     attribute :venue_permalink, Types::String.optional
   end
 
+  # model with the attributes
+  class DiningVenueFull < Dry::Struct
+    transform_keys(&:to_sym)
+
+    attribute :name, Types::String
+    attribute :permalink, Types::String
+    attribute :category_code, Types::String
+    attribute :portion_size, Types::String.optional
+    attribute :cost_code, Types::String.optional
+    attribute :cuisine, Types::String
+    attribute :phone_number, Types::String.optional
+    attribute :entree_range, Types::String.optional
+    attribute :when_to_go, Types::String.optional
+    attribute :parking, Types::String.optional
+    attribute :bar, Types::String.optional
+    attribute :wine_list, Types::String.optional
+    attribute :dress, Types::String.optional
+    attribute :awards, Types::String.optional
+    attribute :breakfast_hours, Types::String.optional
+    attribute :lunch_hours, Types::String.optional
+    attribute :dinner_hours, Types::String.optional
+    attribute :house_specialties, Types::String.optional
+    attribute :counter_quality_rating, Types::String.optional
+    attribute :counter_value_rating, Types::String.optional
+    attribute :table_quality_rating, Types::Float.optional
+    attribute :table_value_rating, Types::Float.optional
+    attribute :overall_rating, Types::Float.optional
+    attribute :service_rating, Types::Float.optional
+    attribute :friendliness_rating, Types::Float.optional
+    attribute :adult_breakfast_menu_url, Types::String.optional
+    attribute :adult_lunch_menu_url, Types::String.optional
+    attribute :adult_dinner_menu_url, Types::String.optional
+    attribute :child_breakfast_menu_url, Types::String.optional
+    attribute :child_lunch_menu_url, Types::String.optional
+    attribute :child_dinner_menu_url, Types::String.optional
+    attribute :requires_credit_card, Types::Params::Bool
+    attribute :requires_pre_payment, Types::Params::Bool
+    attribute :created_at, Types::Params::DateTime
+    attribute :updated_at, Types::Params::DateTime
+    attribute :extinct_on, Types::Params::DateTime.optional
+    attribute :opened_on, Types::Params::DateTime.optional
+    attribute :disney_permalink, Types::String.optional
+    attribute :code, Types::String.optional
+    attribute :short_name, Types::String.optional
+    attribute :accepts_reservations, Types::Params::Bool
+    attribute :kosher_available, Types::Params::Bool
+    attribute :operator_id, Types::Coercible::Integer.optional
+    attribute :operator_url, Types::String.optional
+    attribute :operator_type, Types::String.optional
+    attribute :walking_time_proxy_id, Types::Integer.optional
+    attribute :sort_name, Types::String.optional
+    attribute :mobile_ordering, Types::Bool.optional
+    attribute :extinct_on_uncertain, Types::String.optional
+    attribute :opened_on_uncertain, Types::String.optional
+    attribute :opened_on_known, Types::String.optional
+    attribute :operational_notes, Types::String.optional
+    attribute :latitude, Types::String.optional
+    attribute :longitude, Types::String.optional
+    attribute :summary_at_top, Types::Bool.optional
+
+  end
+
+
   # model with the attributes
   class ParkAttraction < Dry::Struct
     transform_keys(&:to_sym)
@@ -420,7 +472,91 @@ module Touringplans
     attribute :short_name, Types::String
     attribute :permalink, Types::String
     attribute :venue_permalink, Types::String
-    
+  end
+
+    # model with the attributes
+  class ParkAttractionFull < Dry::Struct
+    transform_keys(&:to_sym)
+
+    attribute :name, Types::String
+    attribute :fastpass_booth, Types::Bool
+    attribute :short_name, Types::String.optional
+    attribute :created_at, Types::Params::DateTime
+    attribute :updated_at, Types::Params::DateTime
+    attribute :open_emh_morning, Types::Bool
+    attribute :open_emh_evening, Types::Bool
+    attribute :single_rider, Types::Bool
+    attribute :time_zone, Types::String.optional
+    attribute :seasonal, Types::Bool
+    attribute :open_very_merry, Types::Bool
+    attribute :open_not_so_scary, Types::Bool
+    attribute :category_code, Types::String.optional
+    attribute :duration, Types::Float.optional
+    attribute :scheduled_code, Types::String.optional
+    attribute :what_it_is, Types::String.optional
+    attribute :scope_and_scale_code, Types::String.optional
+    attribute :when_to_go, Types::String.optional
+    attribute :average_wait_per_hundred, Types::Float.optional
+    attribute :average_wait_assumes, Types::String.optional
+    attribute :loading_speed, Types::String.optional
+    attribute :probable_wait_time, Types::String.optional
+    attribute :special_needs, Types::String.optional
+    attribute :height_restriction, Types::Coercible::Integer.optional
+    attribute :intense, Types::Bool
+    attribute :extinct_on, Types::Params::DateTime.optional
+    attribute :opened_on, Types::Params::DateTime.optional
+    attribute :frightening, Types::Bool
+    attribute :physical_considerations, Types::Bool
+    attribute :handheld_captioning, Types::Bool
+    attribute :video_captioning, Types::Bool
+    attribute :reflective_captioning, Types::Bool
+    attribute :assistive_listening, Types::Bool
+    attribute :audio_description, Types::Bool
+    attribute :wheelchair_transfer_code, Types::String.optional
+    attribute :no_service_animals, Types::Bool
+    attribute :sign_language, Types::Bool
+    attribute :service_animal_check, Types::Bool
+    attribute :not_to_be_missed, Types::Bool
+    attribute :rider_swap, Types::Bool
+    attribute :ultimate_code, Types::String.optional
+    attribute :ultimate_task, Types::String.optional
+    attribute :park_entrance, Types::Bool
+    # attribute :relative_open, Types::Float.optional
+    # attribute :relative_close, Types::Bool.optional
+    attribute :close_at_dusk, Types::Bool.optional
+    attribute :crowd_calendar_version, Types::Integer
+    attribute :match_name, Types::String.optional
+    attribute :crazy_threshold, Types::Integer.optional
+    attribute :fastpass_only, Types::Bool
+    attribute :allow_showtimes_after_close, Types::Bool
+    attribute :disconnected_fastpass_booth, Types::Bool
+    attribute :arrive_before, Types::Integer.optional
+    attribute :arrive_before_fp, Types::Integer.optional
+    attribute :allow_time_restriction, Types::Bool
+    attribute :relative_open_to_sunset, Types::Integer.optional
+    attribute :relative_close_to_sunset, Types::Integer.optional
+    attribute :closing_round_code, Types::String.optional
+    attribute :walking_time_proxy_id, Types::Integer.optional
+    # attribute :flexible_duration, Types::Bool
+    attribute :operator_id, Types::Coercible::Integer.optional
+    attribute :operator_type, Types::String.optional
+    attribute :hide_app, Types::Bool
+    attribute :showtime_proxy_id, Types::Integer.optional
+    attribute :sort_name, Types::String
+    attribute :extinct_on_uncertain, Types::Bool.optional
+    attribute :opened_on_uncertain, Types::Bool.optional
+    attribute :ignore_scrapes, Types::Bool.optional
+    attribute :extra_cost, Types::Bool
+    attribute :climate_controlled, Types::Bool
+    attribute :wet, Types::Bool.optional
+    attribute :operational_notes, Types::String.optional
+    # attribute :masthead_circle_x, Types::Integer
+    # attribute :masthead_circle_y, Types::Integer
+    attribute :latitude, Types::String.optional
+    attribute :longitude, Types::String.optional
+    attribute :open_early, Types::Bool
+    attribute :themeparks_entity_id, Types::String.optional
+    attribute :has_virtual_queue, Types::Bool
   end
 
   # model with the attributes
@@ -434,49 +570,78 @@ module Touringplans
     attribute :venue_permalink, Types::String.optional
   end
 
-  PLACE_KEYS          = %i[magic_kingdom 
-                          animal_kingdom 
-                          epcot 
-                          hollywood_studios 
-                          walt_disney_world
-                      ].freeze
-                      # {interest:"interest_type"}
-  INTERESTS           = %i[counter_services 
-                          table_services 
-                          attractions 
-                          hotels 
-                          campground
-                          deluxe_hotels
-                          deluxe_villas
-                          moderate_hotels
-                          value_hotels
-                          disney_springs_resorts
-                        ].freeze
-    HOTEL_CATEGORIES  = %i[campground 
-                          deluxe_hotels 
-                          deluxe_villas 
-                          moderate_hotels 
-                          value_hotels 
-                          disney_springs_resorts]
+  # model with the attributes
+  class HotelFull < Dry::Struct
+    transform_keys(&:to_sym)
+
+    attribute :name, Types::Coercible::String
+    attribute :address, Types::Coercible::String.optional
+    attribute :city, Types::Coercible::String.optional
+    attribute :state_code, Types::Coercible::String.optional
+    attribute :zip_code, Types::Coercible::String.optional
+    attribute :phone_number, Types::Coercible::String.optional
+    attribute :url, Types::Coercible::String.optional
+    attribute :off_site, Types::Bool
+    attribute :water_sports, Types::Bool
+    attribute :marina, Types::Bool
+    attribute :beach, Types::Bool
+    attribute :tennis, Types::Bool
+    attribute :biking, Types::Bool
+    attribute :suites, Types::Bool
+    attribute :concierge_floor, Types::Bool
+    attribute :room_service, Types::Bool
+    attribute :wired_internet, Types::Bool
+    attribute :wireless_internet, Types::Bool
+    attribute :num_rooms, Types::Coercible::Integer
+    attribute :theme, Types::Coercible::String.optional
+    attribute :cost_range, Types::Coercible::String.optional
+    attribute :shuttle_to_parks, Types::Bool
+    attribute :cost_estimate, Types::Coercible::String.optional
+    attribute :lodging_area_code, Types::Coercible::String.optional
+    attribute :category_code, Types::Coercible::String.optional
+  end
+
+  PLACE_KEYS          = %i[magic_kingdom
+                           animal_kingdom
+                           epcot
+                           hollywood_studios
+                           walt_disney_world].freeze
+  # {interest:"interest_type"}
+  INTERESTS           = %i[counter_services
+                           table_services
+                           dining
+                           attractions
+                           hotels
+                           campground
+                           deluxe_hotels
+                           deluxe_villas
+                           moderate_hotels
+                           value_hotels
+                           disney_springs_resorts].freeze
+  HOTEL_CATEGORIES = %i[campground
+                        deluxe_hotels
+                        deluxe_villas
+                        moderate_hotels
+                        value_hotels
+                        disney_springs_resorts].freeze
 
   # list interest at location
   # current interest are "counter service" "table service", and  "attractions"
   # current locations are the four parks
   def self.list(interest, location)
     return "The location is not on Disney property" unless PLACE_KEYS.include? _symbolize(location)
-    return "The interest is not valid"         unless INTERESTS.include? _symbolize(interest)
+    return "The interest is not valid" unless INTERESTS.include? _symbolize(interest)
 
     client = _setup_client
     listings            = []
     interest_type       = _determine_interest_type(interest)
-    route               = _assemble_route(location, interest_type)
+    route               = _assemble_route(location, interest_type, "list")
     response            = client.send(route).parsed_response
     listing_hashes      = _collect_listing_hashes_from_response(interest, response)
     listing_hashes.each do |item|
-      item["venue_permalink"] =  location.to_s.downcase.gsub(" ", "-")
+      item["venue_permalink"] = location.to_s.downcase.gsub(" ", "-").gsub("_", "-")
     end
 
-    listing_hashes
     listing_hashes.each do |hash|
       listing = _set_model_from_hash(interest, hash)
       listings << listing
@@ -519,22 +684,22 @@ module Touringplans
     places.flatten
   end
 
-  def self.show(interest_type, short_name)
-    return "The interest_type is not valid" unless %i[dining attractions hotels].include? _symbolize(interest_type)
-
-    # get a list of every model of one kind of interest_type (dining, attractions, hotels)
-    places = list_all(interest_type)
+  def self.show(place, interest_type, permalink)
+    # see specs for examples
+    return "The location is not on Disney property" unless PLACE_KEYS.include? _symbolize(place)
+    return "The interest_type is not valid" unless INTERESTS.include? _symbolize(interest_type)
 
-    # filter by short_name
-    places.find  { |place| place.short_name == short_name }
+    client    = _setup_client
+    route     = _assemble_route(place, interest_type, permalink)
+    response  = client.send(route).parsed_response
+    _set_model_from_hash(interest_type, response)
   end
 
   def self._setup_client
     connection = Connection.new
     connection.query(key: "HowdyLen")
-    routes = Touringplans::RoutesTable.symbolize_keys(Touringplans::RoutesTable.load_routes_file)   
+    routes = Touringplans::RoutesTable.symbolize_keys(Touringplans::RoutesTable.load_routes_file)
     Client.new(connection: connection, routes: routes)
-
   end
 
   def self._format_location_name(location_name)
@@ -546,8 +711,7 @@ module Touringplans
 
     interest_type = "dining" if interest == "counter services"
     interest_type = "dining" if interest == "table services"
-    interest_type = "hotels" if %i[campground deluxe_hotels deluxe_villas moderate_hotels value_hotels disney_springs_resorts
-                                  ].include? _symbolize(interest)
+    interest_type = "hotels" if %i[campground deluxe_hotels deluxe_villas moderate_hotels value_hotels disney_springs_resorts].include? _symbolize(interest)
 
     interest_type
   end
@@ -561,11 +725,16 @@ module Touringplans
     str.to_sym
   end
 
-  
-  def self._assemble_route(location, interest_type)
-    formatted_location      = location.to_s.downcase.gsub(" ", "_")
-    formatted_interest_type = interest_type.to_s.downcase.gsub(" ", "_")
-    "#{formatted_location}_#{formatted_interest_type}"
+  def self._assemble_route(collection, interest_type, venue)
+    # format route
+    collection    = collection.to_s.downcase.gsub(" ", "_").gsub("-", "_")
+    interest_type = interest_type.to_s.downcase.gsub(" ", "_").gsub("-", "_")
+    venue         = venue.to_s.downcase.gsub(" ", "_").gsub("-", "_")
+
+    route = [collection, interest_type, venue].join("_")
+    route = [collection, interest_type].join("_") if venue == "list"
+
+    route
   end
 
   def self._collect_listing_hashes_from_response(interest, response)
@@ -581,15 +750,13 @@ module Touringplans
 
     listing_hashes
   end
-  
+
   def self.list_all_hotels(response_from_touringplans_hotels_url)
     listing_hashes = []
 
     response_from_touringplans_hotels_url.each do |child|
       child.each do |grandchild|
-        if "#{grandchild.class}" == "Array"
-          listing_hashes << grandchild
-        end          
+        listing_hashes << grandchild if grandchild.class.to_s == "Array"
       end
     end
 
@@ -597,39 +764,43 @@ module Touringplans
   end
 
   # search for hotels of a category_code
-  def self.list_hotels_of_a_category(hotels, interest) 
-    hotel_categories = {campground:"campground", deluxe_hotels:"deluxe", 
-                    deluxe_villas:"deluxe_villa", moderate_hotels:"moderate", 
-                    value_hotels:"value", disney_springs_resorts: NilClass}
+  def self.list_hotels_of_a_category(hotels, interest)
+    hotel_categories = { campground: "campground", deluxe_hotels: "deluxe",
+                         deluxe_villas: "deluxe_villa", moderate_hotels: "moderate",
+                         value_hotels: "value", disney_springs_resorts: NilClass }
     # get a list of every hotel model
 
     # filter by category_code
-    # disney springs category code is null.  We need to find a rule for finding those that don't have any of the values of 
+    # disney springs category code is null.  We need to find a rule for finding those that don't have any of the values of
     # hotel categories
     if interest == "disney springs resorts"
-    target_hotels = hotels.find_all  { |hotel| hotel.category_code.class == NilClass }       
-      
+      hotels.find_all { |hotel| hotel.category_code.instance_of?(NilClass) }
+
     else
-    target_hotels = hotels.find_all  { |hotel| hotel.category_code == hotel_categories[_symbolize(interest)] }       
-      
-    end
+      hotels.find_all { |hotel| hotel.category_code == hotel_categories[_symbolize(interest)] }
 
-    target_hotels
+    end
   end
-  
+
   def generate_route_table
     # initial_routes = ROUTES
-
   end
-  
-  
+
   def self._set_model_from_hash(interest, hash)
     hotel_categories = %i[campground deluxe_hotels deluxe_villas moderate_hotels value_hotels disney_springs_resorts hotels]
 
-    listing = CounterServiceLocation.new(hash)  if interest == "counter services"
-    listing = TableServiceLocation.new(hash)    if interest == "table services"
-    listing = ParkAttraction.new(hash)          if interest == "attractions"
-    listing = Hotel.new(hash)                   if hotel_categories.include? _symbolize(interest)
+    if hash["permalink"].to_s.length > 1
+      listing = CounterServiceLocation.new(hash)  if interest == "counter services"
+      listing = TableServiceLocation.new(hash)    if interest == "table services"
+      listing = ParkAttraction.new(hash)          if interest == "attractions"
+      listing = DiningVenueFull.new(hash)         if interest == "dining"
+      listing = Hotel.new(hash)                   if hotel_categories.include? _symbolize(interest)      
+    else
+      listing = DiningVenueFull.new(hash)         if interest == "dining"
+      listing = ParkAttractionFull.new(hash)      if interest == "attractions"
+      listing = HotelFull.new(hash)               if hotel_categories.include? _symbolize(interest)            
+    end
+
     listing
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: touringplans
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.5
 platform: ruby
 authors:
 - captproton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print