suitcase 1.2.6 → 1.2.7

data/README.md

@@ -1,7 +1,7 @@
 Suitcase
 ========
 
-Suitcase is a Ruby library that utilizes the EAN (Expedia.com) API for locating available hotels, rental cars, and flights.
+Ruby library that utilizes the EAN (Expedia.com) API for locating available hotels (and maybe rental cars and flights someday, too).
 
 Installation
 ------------

data/lib/suitcase/hotel/hotel.rb

@@ -22,14 +22,14 @@ module Suitcase
     extend Suitcase::Helpers
 
     AMENITIES = { pool: 1,
-                  fitness_center: 2,
-                  restaurant: 3,
-                  children_activities: 4,
-                  breakfast: 5,
-                  meeting_facilities: 6,
-                  pets: 7,
-                  wheelchair_accessible: 8,
-                  kitchen: 9 }
+      fitness_center: 2,
+      restaurant: 3,
+      children_activities: 4,
+      breakfast: 5,
+      meeting_facilities: 6,
+      pets: 7,
+      wheelchair_accessible: 8,
+      kitchen: 9 }
 
     attr_accessor :id, :name, :address, :city, :province, :amenities, :country_code, :high_rate, :low_rate, :longitude, :latitude, :rating, :postal_code, :supplier_type, :images, :nightly_rate_total, :airport_code, :property_category, :confidence_rating, :amenity_mask, :location_description, :short_description, :hotel_in_destination, :proximity_distance, :property_description, :number_of_floors, :number_of_rooms, :deep_link, :tripadvisor_rating
 
@@ -52,7 +52,7 @@ module Suitcase
     # an Array of Hotels.
     def self.find(info)
       if info[:ids]
-        info[:ids].map { |id| find_by_id(id, info[:session]) }
+        find_by_ids(info[:ids], info[:session])
       elsif info[:id]
         find_by_id(info[:id], info[:session])
       else
@@ -73,6 +73,7 @@ module Suitcase
       else
         url = url(:method => "info", :params => params, :session => session)
         raw = parse_response(url)
+        handle_errors(raw)
         Configuration.cache.save_query(:info, params, raw) if Configuration.cache?
       end
       hotel_data = parse_information(raw)
@@ -80,6 +81,24 @@ module Suitcase
       Hotel.new(hotel_data)
     end
 
+    def self.find_by_ids(ids, session)
+      params = { hotelIdList: ids.join(",") }
+      if Configuration.cache? and Configuration.cache.cached?(:list, params)
+        raw = Configuration.cache.get_query(:list, params)
+      else
+        url = url(:method => "list", :params => params, :session => session)
+        raw = parse_response(url)
+        handle_errors(raw)
+        Configuration.cache.save_query(:list, params, raw) if Configuration.cache?
+      end
+      hotels = []
+      split(raw).each do |hotel_data|
+        hotels.push Hotel.new(parse_information(hotel_data))
+      end
+      update_session(raw, session)
+      hotels
+    end
+
     # Public: Find a hotel by info other than it's id.
     #
     # info - a Hash of options described in the Hotel
@@ -92,7 +111,7 @@ module Suitcase
       params.delete(:results)
       params["destinationString"] = params[:location]
       params.delete(:location)
-      amenities = params[:amenities] ? params[:amenities].map { |amenity| old + AMENITIES[amenity] }.join(",") : nil
+      amenities = params[:amenities] ? params[:amenities].map { |amenity| AMENITIES[amenity] }.join(",") : nil
       params["minRate"] = params[:min_rate] if params[:min_rate]
       params["maxRate"] = params[:max_rate] if params[:max_rate]
       params[:amenities] = amenities if amenities
@@ -150,7 +169,7 @@ module Suitcase
         message = info["HotelInformationResponse"]["EanWsError"]["presentationMessage"]
       end
       raise EANException.new(message) if message
-   end
+    end
 
     def self.split(parsed)
       hotels = parsed["HotelListResponse"]["HotelList"]

data/lib/suitcase/version.rb

@@ -1,3 +1,3 @@
 module Suitcase
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

data/suitcase.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Walter Nelson"]
   s.email       = ["walter.john.nelson@gmail.com"]
   s.homepage    = "http://github.com/thoughtfusion/suitcase"
-  s.summary     = %q{Locates available hotels, rental cars, and flights}
-  s.description = %q{Suitcase utilizes the EAN (Expedia.com) API for locating info about hotels, rental cars, and flights.}
+  s.summary     = %q{Locates available hotels with the Expedia API}
+  s.description = %q{Ruby library that utilizes the EAN (Expedia.com) API for locating available hotels (and maybe rental cars and flights someday, too).}
 
   s.rubyforge_project = "suitcase"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suitcase
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22060760 !ruby/object:Gem::Requirement
+  requirement: &16751760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22060760
+  version_requirements: *16751760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22059980 !ruby/object:Gem::Requirement
+  requirement: &16751320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22059980
+  version_requirements: *16751320
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &22058860 !ruby/object:Gem::Requirement
+  requirement: &16750760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22058860
+  version_requirements: *16750760
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &22058320 !ruby/object:Gem::Requirement
+  requirement: &16750320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22058320
+  version_requirements: *16750320
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &22057560 !ruby/object:Gem::Requirement
+  requirement: &16749760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,9 +65,9 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22057560
-description: Suitcase utilizes the EAN (Expedia.com) API for locating info about hotels,
-  rental cars, and flights.
+  version_requirements: *16749760
+description: Ruby library that utilizes the EAN (Expedia.com) API for locating available
+  hotels (and maybe rental cars and flights someday, too).
 email:
 - walter.john.nelson@gmail.com
 executables: []
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2601824217631768176
+      hash: -2177735995865373908
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,13 +129,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2601824217631768176
+      hash: -2177735995865373908
 requirements: []
 rubyforge_project: suitcase
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Locates available hotels, rental cars, and flights
+summary: Locates available hotels with the Expedia API
 test_files:
 - spec/caching_spec.rb
 - spec/helpers_spec.rb