suitcase 1.6.6 → 1.6.7

data/lib/suitcase/hotel/room.rb

@@ -9,7 +9,8 @@ module Suitcase
                     :room_type_description, :price_breakdown, :total_price,
                     :average_nightly_rate, :promo, :arrival, :departure, :rooms,
                     :bed_types, :cancellation_policy, :non_refundable,
-                    :deposit_required, :surcharges, :raw
+                    :guarantee_required, :deposit_required, :surcharges,
+                    :rate_description, :raw
 
       extend Helpers
 
@@ -35,7 +36,8 @@ module Suitcase
         params["arrivalDate"] = @arrival
         params["departureDate"] = @departure
         params["supplierType"] = @supplier_type
-        params["rateKey"] = @rate_key
+        # Only submit the rateKey if it is a merchant hotel
+        params["rateKey"] = @rate_key if @supplier_type == "E"
         params["rateTypeCode"] = @room_type_code
         params["rateCode"] = @rate_code
         params["roomTypeCode"] = @room_type_code
@@ -64,8 +66,8 @@ module Suitcase
           params["room#{index}"] = "#{room[:adults].to_s},#{room[:children_ages].join(",")}"
           params["room#{index}FirstName"] = room[:first_name] || params["firstName"] # defaults to the billing
           params["room#{index}LastName"] = room[:last_name] || params["lastName"] # person's name
-          params["room#{index}BedTypeId"] = room[:bed_type].id
-          params["room#{index}SmokingPreference"] = room[:smoking_preference] or "E"
+          params["room#{index}BedTypeId"] = room[:bed_type].id if @supplier_type == "E"
+          params["room#{index}SmokingPreference"] = room[:smoking_preference] || "E"
         end
         params["stateProvinceCode"] = info[:province]
         params["countryCode"] = info[:country]
@@ -78,11 +80,18 @@ module Suitcase
         res = session.post uri.request_uri, {}
         parsed = JSON.parse res.body
 
-
-        r = Reservation.new(itinerary_id: parsed["HotelRoomReservationResponse"]["itineraryId"],
-                            confirmation_numbers: parsed["HotelRoomReservationResponse"]["confirmationNumbers"],
-                            surcharges: [parsed["HotelRoomReservationResponse"]["RateInfo"]["ChargeableRateInfo"]["Surcharges"]["Surcharge"]].flatten.map { |s| Surcharge.parse(s) } 
-                           )
+        reservation_res = parsed["HotelRoomReservationResponse"]
+        surcharges = if @supplier_type == "E"
+          [reservation_res["RateInfo"]["ChargeableRateInfo"]["Surcharges"]["Surcharge"]].
+            flatten.map { |s| Surcharge.parse(s) }
+        else
+          []
+        end
+        r = Reservation.new(
+          itinerary_id: reservation_res["itineraryId"],
+          confirmation_numbers: reservation_res["confirmationNumbers"],
+          surcharges: surcharges 
+        )
         r.raw = parsed
         r
       end
@@ -97,6 +106,18 @@ module Suitcase
           @max_nightly_rate
         end
       end
+      
+      # Public: The description of the displayed rate.
+      #
+      # Returns the rate description based on the `rate_change` attribute.
+      def room_rate_description
+        if @rate_change
+          "rate changes during the dates requested and the single nightly rate displayed is the highest nightly rate of the dates requested without taxes and fees."
+        else
+          "highest single night rate during the dates selected without taxes or fees"
+        end
+      end
     end
   end
 end
+

data/lib/suitcase/hotel.rb

@@ -323,24 +323,30 @@ module Suitcase
           Configuration.cache.save_query(:avail, params, parsed)
         end
       end
-      hotel_id = parsed["HotelRoomAvailabilityResponse"]["hotelId"]
-      rate_key = parsed["HotelRoomAvailabilityResponse"]["rateKey"]
-      supplier_type = parsed["HotelRoomAvailabilityResponse"]["HotelRoomResponse"][0]["supplierType"]
+      res = parsed["HotelRoomAvailabilityResponse"]
+      hotel_room_res = [res["HotelRoomResponse"]].flatten
+      hotel_id = res["hotelId"]
+      rate_key = res["rateKey"]
+      supplier_type = hotel_room_res[0]["supplierType"]
       Hotel.update_session(parsed, info[:session])
 
-      parsed["HotelRoomAvailabilityResponse"]["HotelRoomResponse"].map do |raw_data|
+      hotel_room_res.map do |raw_data|
         room_data = {}
         room_data[:non_refundable] = raw_data["nonRefundable"]
         room_data[:deposit_required] = raw_data["depositRequired"]
+        room_data[:guarantee_only] = raw_data["guaranteeRequired"]
         room_data[:cancellation_policy] = raw_data["cancellationPolicy"]
         room_data[:rate_code] = raw_data["rateCode"]
         room_data[:room_type_code] = raw_data["roomTypeCode"]
         room_data[:room_type_description] = raw_data["roomTypeDescription"]
+        room_data[:rate_description] = raw_data["rateDescription"]
         room_data[:promo] = raw_data["RateInfo"]["@promo"].to_b
         room_data[:price_breakdown] = raw_data["RateInfo"]["ChargeableRateInfo"]["NightlyRatesPerRoom"]["NightlyRate"].map do |raw|
           NightlyRate.new(raw)
         end if raw_data["RateInfo"]["ChargeableRateInfo"] && raw_data["RateInfo"]["ChargeableRateInfo"]["NightlyRatesPerRoom"] && raw_data["RateInfo"]["ChargeableRateInfo"]["NightlyRatesPerRoom"]["NightlyRate"].is_a?(Array)
         room_data[:total_price] = raw_data["RateInfo"]["ChargeableRateInfo"]["@total"]
+        room_data[:max_nightly_rate] = raw_data["RateInfo"]["ChargeableRateInfo"]["@maxNightlyRate"]
+        room_data[:rate_change] = raw_data["rateChange"]
         room_data[:nightly_rate_total] = raw_data["RateInfo"]["ChargeableRateInfo"]["@nightlyRateTotal"]
         room_data[:average_nightly_rate] = raw_data["RateInfo"]["ChargeableRateInfo"]["@averageRate"]
         room_data[:arrival] = info[:arrival]

data/lib/suitcase/version.rb

@@ -1,3 +1,3 @@
 module Suitcase
-  VERSION = "1.6.6"
+  VERSION = "1.6.7"
 end

data/test/hotels/room_test.rb

@@ -39,7 +39,6 @@ describe Suitcase::Hotel::Room do
 
     it "returns a Suitcase::Reservation" do
       reservation = @room.reserve!(@info)
-      binding.pry
       reservation.must_be_kind_of(Suitcase::Hotel::Reservation)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suitcase
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -203,15 +203,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1258883948376164129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1258883948376164129
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Locates available hotels and rental cars through Expedia and Hotwire
@@ -231,4 +237,3 @@ test_files:
 - test/keys.rb
 - test/minitest_helper.rb
 - test/support/fake_response.rb
-has_rdoc: