rthbound-suitcase 1.7.1 → 1.7.2

data/lib/suitcase/hotel.rb

@@ -151,6 +151,16 @@ module Suitcase
         end
       end
 
+      if info[:arrival] && info[:departure]
+        params["arrivalDate"] = info[:arrival]
+        params["departureDate"] = info[:departure]
+        params.delete(:arrival)
+        params.delete(:departure)
+
+        params.merge!(parameterize_rooms(info[:rooms] || [{ adults: 1 }]))
+        params.delete(:rooms)
+      end
+
       amenities = params[:amenities] ? params[:amenities].map {|amenity| 
         AMENITIES[amenity] 
       }.join(",") : nil
@@ -281,9 +291,8 @@ module Suitcase
     # Returns an Array of Rooms.
     def rooms(info)
       params = { rooms: [{adults: 1, children_ages: []}] }.merge(info)
-      params[:rooms].each_with_index do |room, n|
-        params["room#{n+1}"] = room[:adults].to_s + "," + (room[:children_ages].join(",") if room[:children_ages])
-      end
+      params.merge!(Hotel.parameterize_rooms(params[:rooms]))
+      params.delete(:rooms)
       params["arrivalDate"] = info[:arrival]
       params["departureDate"] = info[:departure]
       params["includeDetails"] = true

data/lib/suitcase/hotel/helpers.rb

@@ -193,6 +193,18 @@ module Suitcase
                               Configuration.hotel_shared_secret + 
                               Time.now.to_i.to_s)
       end
+
+      # Internal: Build a rooms parameter given an array of hashes
+      #
+      # Returns the rooms parameters hash
+      def parameterize_rooms(rooms)
+        params = {}
+        rooms.each_with_index do |room, n|
+          params["room#{n+1}"] = room[:adults].to_s
+          params["room#{n+1}"] += "," + room[:children_ages].join(",") if room[:children_ages]
+        end
+        params
+      end
     end
   end
 end

data/lib/suitcase/hotel/room.rb

@@ -7,8 +7,9 @@ module Suitcase
                     :surcharge_total, :nightly_rate_total, :average_base_rate,
                     :average_rate, :max_nightly_rate, :currency_code, :value_adds,
                     :room_type_description, :price_breakdown, :total_price,
-                    :average_nightly_rate, :promo, :arrival, :departure, :rooms,
-                    :bed_types, :cancellation_policy, :non_refundable,
+                    :average_nightly_rate, :promo, :promo_description,
+                    :arrival, :departure, :rooms, :bed_types,
+                    :cancellation_policy, :non_refundable,
                     :guarantee_required, :deposit_required, :surcharges,
                     :rate_description, :raw, :rate_change, :guarantee_only
 
@@ -68,9 +69,9 @@ module Suitcase
         params["address2"] = info[:address2] if info[:address2]
         params["address3"] = info[:address3] if info[:address3]
         params["city"] = info[:city]
+        params.merge!(parameterize_rooms(@rooms))
         @rooms.each_with_index do |room, index|
           index += 1
-          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 if @supplier_type == "E"

data/lib/suitcase/version.rb

@@ -1,3 +1,3 @@
 module Suitcase
-  VERSION = "1.7.1"
+  VERSION = "1.7.2"
 end

data/test/hotels/helpers_test.rb

@@ -49,4 +49,12 @@ describe Suitcase::Hotel::Helpers do
       signature.must_equal(Digest::MD5.hexdigest("abc12310"))
     end
   end
+
+  describe "#parameterize_rooms" do
+    it "returns a hash of room parameters" do
+      rooms = [{adults: 1}, {adults: 2, children_ages: [3, 5]}]
+      params = Dummy.parameterize_rooms(rooms)
+      params.must_equal({ "room1" => "1", "room2" => "2,3,5" })
+    end
+  end
 end

data/test/hotels/hotel_test.rb

@@ -20,6 +20,16 @@ describe Suitcase::Hotel do
       @hotel.must_be_kind_of(Suitcase::Hotel)
     end
 
+    it "returns available hotels if arrival and departure are passed in" do
+      hotels = Suitcase::Hotel.find(location: "London, UK",
+                                    arrival: "10/13/2013",
+                                    departure: "10/15/2013",
+                                    results: 1)
+      hotels.must_be_kind_of(Array)
+      hotels.first.must_be_kind_of(Suitcase::Hotel)
+      hotels.first.raw["HotelListResponse"]["moreResultsAvailable"].must_equal(true)
+    end
+
     it "returns multiple Hotels if a location is passed in" do
       hotels = Suitcase::Hotel.find(location: "London, UK")
       hotels.must_be_kind_of(Array)

data/test/hotels/room_test.rb

@@ -9,8 +9,8 @@ describe Suitcase::Hotel::Room do
   non_refundable occupancy quoted_occupancy min_guest_age total surcharge_total
   average_base_rate average_base_rate average_rate max_nightly_rate
   currency_code value_adds room_type_description price_breakdown total_price
-  average_nightly_rate promo rate_key hotel_id supplier_type bed_types
-  rooms).each do |attribute|
+  average_nightly_rate promo promo_description rate_key hotel_id
+  supplier_type bed_types rooms).each do |attribute|
     it "has an attr_accessor for #{attribute}" do
       @room.must_respond_to attribute.to_sym
       @room.must_respond_to (attribute + "=").to_sym
@@ -33,7 +33,10 @@ describe Suitcase::Hotel::Room do
                 province: "MA",
                 country: "US",
                 postal_code: "02111" }
-      @room.rooms[0][:bed_type] = @room.bed_types[0]
+      @room.rooms = [{}]
+      @room.rooms[0][:adults] = 1
+      @room.rooms[0][:children_ages] = [5, 3]
+      # @room.rooms[0][:bed_type] = @room.bed_types[0]
       @room.rooms[0][:smoking_preference] = "NS"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rthbound-suitcase
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -204,12 +204,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1478877458648309527
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1478877458648309527
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24