suitcase 1.1.9 → 1.2.0.pre

data/.gitignore

@@ -2,4 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
-spec/api_key.rb
+spec/keys.rb

data/lib/suitcase.rb

@@ -1,3 +1,4 @@
+require 'patron'
 require 'json'
 require 'net/http'
 require 'date/format'

data/lib/suitcase/helpers.rb

@@ -3,13 +3,25 @@ module Suitcase
     def url(method, params, include_key=true, include_cid=true, secure=false, as_form=false)
       params["apiKey"] = Configuration.hotel_api_key if include_key
       params["cid"] = (Configuration.hotel_cid ||= 55505) if include_cid
-      url = "http#{secure ? "s" : ""}://api.ean.com/ean-services/rs/hotel/v3/#{method.to_s}#{as_form ? "" : "?"}"
+      url = main_url(secure) + method.to_s + (as_form ? "" : "?")
       url += params.map { |key, value| "#{key}=#{value}"}.join("&")
       URI.parse(URI.escape(url))
     end
 
+    def main_url(secure)
+      "http#{secure ? "s" : ""}://#{secure ? "book." : ""}api.ean.com/ean-services/rs/hotel/v3/"
+    end
+
     def parse_response(uri)
       JSON.parse(Net::HTTP.get_response(uri).body)
     end
+
+    def base_url(info)
+      if info[:booking]
+        URI.parse main_url(true)
+      else
+        URI.parse main_url(false)
+      end
+    end
   end
 end

data/lib/suitcase/hotel/hotel.rb

@@ -5,6 +5,14 @@ module Suitcase
     end
   end
 
+  class BedType
+    attr_accessor :id, :description
+
+    def initialize(info)
+      @id, @description = info[:id], info[:description]
+    end
+  end
+
   class Hotel
     extend Suitcase::Helpers
 
@@ -79,8 +87,9 @@ module Suitcase
     end
 
     def self.images(parsed)
-      return parsed["HotelInformationResponse"]["HotelImages"]["HotelImage"].map { |image_data| Suitcase::Image.new(image_data) } if parsed["HotelInformationResponse"]
-      return [Suitcase::Image.new("thumbnailURL" => "http://images.travelnow.com" + parsed["thumbNailUrl"])] if parsed["thumbNailUrl"]
+      return parsed["HotelInformationResponse"]["HotelImages"]["HotelImage"].map { |image_data| Suitcase::Image.new(image_data) } if parsed["HotelInformationResponse"] && parsed["HotelInformationResponse"]["HotelImages"] && parsed["HotelInformationResponse"]["HotelImages"]["HotelImage"]
+      return [Suitcase::Image.new("thumbnailURL" => "http://images.travelnow.com" + parsed["thumbNailUrl"])] unless parsed["thumbnailUrl"].nil? or parsed["thumbNailUrl"].empty?
+      return []
     end
 
     # Bleghh. so ugly. #needsfixing
@@ -112,6 +121,7 @@ module Suitcase
       end
       params["arrivalDate"] = info[:arrival]
       params["departureDate"] = info[:departure]
+      params["includeDetails"] = true
       params.delete(:arrival)
       params.delete(:departure)
       params["hotelId"] = @id
@@ -126,7 +136,7 @@ module Suitcase
         room_data[:room_type_code] = raw_data["roomTypeCode"]
         room_data[:room_type_description] = raw_data["roomTypeDescription"]
         room_data[:promo] = raw_data["RateInfo"]["@promo"].to_b
-        room_data[:price_breakdown] = raw_data["RateInfo"]["ChargeableRateInfo"]["NightlyRatesPerRoom"]["NightlyRate"].map { |raw| NightlyRate.new(raw) }
+        room_data[:price_breakdown] = raw_data["RateInfo"]["ChargeableRateInfo"]["NightlyRatesPerRoom"]["NightlyRate"].map { |raw| NightlyRate.new(raw) } 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[:nightly_rate_total] = raw_data["RateInfo"]["ChargeableRateInfo"]["@nightlyRateTotal"]
         room_data[:average_nightly_rate] = raw_data["RateInfo"]["ChargeableRateInfo"]["@averageRate"]
@@ -135,6 +145,8 @@ module Suitcase
         room_data[:rate_key] = rate_key
         room_data[:hotel_id] = hotel_id
         room_data[:supplier_type] = supplier_type
+        room_data[:rooms] = params[:rooms]
+        room_data[:bed_types] = [raw_data["BedTypes"]["BedType"]].flatten.map { |x| BedType.new(id: x["@id"], description: x["description"]) }
         Room.new(room_data)
       end
     end

data/lib/suitcase/hotel/reservation.rb

@@ -1,5 +1,9 @@
 module Suitcase
   class Reservation
+    attr_accessor :itinerary_id, :confirmation_numbers
 
+    def initialize(info)
+      @itinerary_id, @confirmation_numbers = info[:itinerary_id], [info[:confirmation_numbers]].flatten
+    end
   end
 end

data/lib/suitcase/hotel/room.rb

@@ -1,6 +1,6 @@
 module Suitcase
   class Room
-    attr_accessor :rate_key, :hotel_id, :supplier_type, :rate_code, :room_type_code, :supplier_type, :tax_rate, :non_refundable, :occupancy, :quoted_occupancy, :min_guest_age, :total, :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
+    attr_accessor :rate_key, :hotel_id, :supplier_type, :rate_code, :room_type_code, :supplier_type, :tax_rate, :non_refundable, :occupancy, :quoted_occupancy, :min_guest_age, :total, :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
     extend Suitcase::Helpers
 
     def initialize(info)
@@ -18,6 +18,7 @@ module Suitcase
       params["rateKey"] = @rate_key
       params["rateTypeCode"] = @room_type_code
       params["rateCode"] = @rate_code
+      params["roomTypeCode"] = @room_type_code
       params["chargeableRate"] = chargeable_rate      
       params["email"] = info[:email]
       params["firstName"] = info[:first_name]
@@ -28,26 +29,39 @@ module Suitcase
       params["faxPhone"] = info[:fax_phone] if info[:fax_phone]
       params["companyName"] = info[:company_name] if info[:company_name]
       params["emailIntineraryList"] = info[:additional_emails].join(",") if info[:additional_emails]
-      params["creditCardType"] = info[:payment_type].code
+      params["creditCardType"] = info[:payment_option].code
       params["creditCardNumber"] = info[:credit_card_number]
       params["creditCardIdentifier"] = info[:credit_card_verification_code]
       expiration_date = Date._parse(info[:credit_card_expiration_date])
-      params["creditCardExpirationMonth"] = expiration_date.strftime("%m")
-      params["creditCardExpirationYear"] = expiration_date.strftime("%Y")
+      params["creditCardExpirationMonth"] = (expiration_date[:mon].to_s.length == 1 ? "0" + expiration_date[:mon].to_s : expiration_date[:mon].to_s)
+      params["creditCardExpirationYear"] = expiration_date[:year].to_s
       params["address1"] = info[:address1]
-      params["address2"] = info[:address2]
-      params["address3"] = info[:address3]
+      params["address2"] = info[:address2] if info[:address2]
+      params["address3"] = info[:address3] if info[:address3]
       params["city"] = info[:city]
+      @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
+        params["room#{index}SmokingPreference"] = room[:smoking_preference] or "E"
+      end
       params["stateProvinceCode"] = info[:province]
       params["countryCode"] = info[:country]
       params["postalCode"] = info[:postal_code]
-      p url(:getReservation, params)
+      uri = Room.url :res, params, true, true, true
+      session = Patron::Session.new
+      session.base_url = "https://" + uri.host
+      res = session.post uri.request_uri, {}
+      parsed = JSON.parse res.body
+      Reservation.new(itinerary_id: parsed["HotelRoomReservationResponse"]["itineraryId"], confirmation_numbers: parsed["HotelRoomReservationResponse"]["confirmationNumbers"])
     end
 
     def chargeable_rate
       if @supplier_type == "E"
-        @total
-      else false
+        @total_price
+      else
         @max_nightly_rate
       end
     end

data/lib/suitcase/version.rb

@@ -1,3 +1,3 @@
 module Suitcase
-  VERSION = "1.1.9"
+  VERSION = "1.2.0.pre"
 end

data/spec/reservation_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Suitcase::Reservation do
+  before :all do
+    @reservation = Suitcase::Reservation.new({})
+  end
+
+  subject { @reservation }
+  it { should respond_to :itinerary_id }
+  it { should respond_to :confirmation_numbers }
+end

data/spec/rooms_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Suitcase::Room do
   before :all do
-    @room = Suitcase::Hotel.find(id: 123904).rooms(arrival: "6/23/2012", departure: "6/30/2012", rooms: [{ adults: 1, children: 0, children_ages: []}, { adults: 1, children: 0, children_ages: []}]).first
+    @room = Suitcase::Hotel.find(id: 123904).rooms(arrival: "6/23/2012", departure: "6/30/2012").first
   end
 
   subject { @room }
@@ -33,6 +33,7 @@ describe Suitcase::Room do
   it { should respond_to :rate_key }
   it { should respond_to :hotel_id }
   it { should respond_to :supplier_type }
+  it { should respond_to :bed_types }
 
   describe "#reserve!" do
     before :all do
@@ -40,10 +41,18 @@ describe Suitcase::Room do
                 first_name: "Walter",
                 last_name: "Nelson",
                 home_phone: "3831039402",
-                credit_card_type: "AX", # American Express
-                credit_card_number: "2384975019283750293874", # not even sure if the length is right
-                credit_card_identifier: "341", # CVV
-                credit_card_expiration_date: "11/2012" }
+                payment_option: Keys::SUITCASE_PAYMENT_OPTION, # Visa
+                credit_card_number: Keys::CREDIT_CARD_NUMBER_TESTING,
+                credit_card_verification_code: Keys::CREDIT_CARD_CVV_TESTING, # CVV
+                credit_card_expiration_date: Keys::CREDIT_CARD_EXPIRATION_DATE_TESTING,
+                address1: "travelnow", # for testing
+                address2: "Apt. 4A",
+                city: "Boston",
+                province: "MA",
+                country: "US",
+                postal_code: "02111" }
+      @room.rooms[0][:bed_type] = @room.bed_types[0]
+      @room.rooms[0][:smoking_preference] = "NS"
     end
 
     it "should respond to a Hash of arguments" do

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
 require File.dirname(__FILE__) + '/../lib/suitcase'
-require 'api_key'
+require 'keys'

data/suitcase.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "factory_girl"
   s.add_runtime_dependency "json"
+  s.add_runtime_dependency "patron"
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: suitcase
 version: !ruby/object:Gem::Version
-  version: 1.1.9
-  prerelease: 
+  version: 1.2.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Walter Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19048700 !ruby/object:Gem::Requirement
+  requirement: &16614460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19048700
+  version_requirements: *16614460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19047520 !ruby/object:Gem::Requirement
+  requirement: &16613580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19047520
+  version_requirements: *16613580
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &19063900 !ruby/object:Gem::Requirement
+  requirement: &16612360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19063900
+  version_requirements: *16612360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &19061720 !ruby/object:Gem::Requirement
+  requirement: &16611740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19061720
+  version_requirements: *16611740
+- !ruby/object:Gem::Dependency
+  name: patron
+  requirement: &16611300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *16611300
 description: Suitcase utilizes the EAN (Expedia.com) API for locating info about hotels,
   rental cars, and flights.
 email:
@@ -83,12 +94,12 @@ files:
 - lib/suitcase/hotel/reservation.rb
 - lib/suitcase/hotel/room.rb
 - lib/suitcase/version.rb
-- spec/api_key.rb
 - spec/caching_spec.rb
 - spec/helpers_spec.rb
 - spec/hotels_spec.rb
 - spec/images_spec.rb
 - spec/payment_options_spec.rb
+- spec/reservation_spec.rb
 - spec/rooms_spec.rb
 - spec/spec_helper.rb
 - suitcase.gemspec
@@ -106,28 +117,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 548987978234078689
+      hash: 3770284806370543423
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 548987978234078689
+      version: 1.3.1
 requirements: []
 rubyforge_project: suitcase
-rubygems_version: 1.8.13
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Locates available hotels, rental cars, and flights
 test_files:
-- spec/api_key.rb
 - spec/caching_spec.rb
 - spec/helpers_spec.rb
 - spec/hotels_spec.rb
 - spec/images_spec.rb
 - spec/payment_options_spec.rb
+- spec/reservation_spec.rb
 - spec/rooms_spec.rb
 - spec/spec_helper.rb