suitcase 1.6.7 → 1.7.0

data/lib/suitcase/hotel.rb

@@ -251,34 +251,6 @@ module Suitcase
       images || []
     end
 
-    # Internal: Raise the errors returned from the response.
-    #
-    # info - The parsed JSON to get the errors from.
-    #
-    # Returns nothing.
-    def self.handle_errors(info)
-      key = info.keys.first
-      if info[key] && info[key]["EanWsError"]
-        message = info[key]["EanWsError"]["presentationMessage"]
-        exception = EANException.new(message)
-        if message =~ /Multiple locations/ && (info = info[key]["LocationInfos"])
-          exception.type = :multiple_locations
-          exception.recovery = {
-            alternate_locations: info["LocationInfo"].map do |info|
-              Location.new(
-                destination_id: info["destinationId"],
-                type: info["type"],
-                city: info["city"],
-                province: info["stateProvinceCode"]
-              )
-            end
-          }
-        end
-
-        raise exception
-      end
-    end
-
     # Internal: Split an Array of multiple Hotels.
     #
     # parsed - The parsed JSON of the Hotels.

data/lib/suitcase/hotel/helpers.rb

@@ -58,7 +58,7 @@ module Suitcase
         params["apiKey"] = Configuration.hotel_api_key if builder[:include_key]
         params["cid"] = (Configuration.hotel_cid ||= 55505) if builder[:include_cid]
         params["sig"] = generate_signature if Configuration.use_signature_auth?
-        
+
         url = main_url(builder[:secure]) + method.to_s + (builder[:as_form] ? "" : "?")
 
         params.merge!(build_session_params(builder[:session]))
@@ -111,13 +111,43 @@ module Suitcase
             e = EANException.new("An unknown error occured: #{response.body}.")
             e.type = :unknown
           end
-        
+
           raise e
         end
 
         JSON.parse(Net::HTTP.get_response(uri).body)
       end
 
+      # Internal: Raise the errors returned from the response.
+      #
+      # info - The parsed JSON to get the errors from.
+      #
+      # Returns nothing.
+      def handle_errors(info)
+        key = info.keys.first
+        if info[key] && info[key]["EanWsError"]
+          message = info[key]["EanWsError"]["presentationMessage"]
+          exception = EANException.new(message)
+          if message =~ /Multiple locations/ && (info = info[key]["LocationInfos"])
+            exception.type = :multiple_locations
+            exception.recovery = {
+              alternate_locations: info["LocationInfo"].map do |info|
+              Location.new(
+                destination_id: info["destinationId"],
+                type: info["type"],
+                city: info["city"],
+                province: info["stateProvinceCode"]
+              )
+              end
+            }
+          elsif message =~ /Data in this request could not be validated/
+            exception.type = :invalid_data
+          end
+
+          raise exception
+        end
+      end
+
       # Internal: Get the base URL based on a Hash of info.
       #
       # info  - A Hash with only one required key:

data/lib/suitcase/hotel/room.rb

@@ -10,9 +10,10 @@ module Suitcase
                     :average_nightly_rate, :promo, :arrival, :departure, :rooms,
                     :bed_types, :cancellation_policy, :non_refundable,
                     :guarantee_required, :deposit_required, :surcharges,
-                    :rate_description, :raw
+                    :rate_description, :raw, :rate_change, :guarantee_only
 
       extend Helpers
+      include Helpers
 
       # Internal: Create a new Room from within a Room search query.
       #
@@ -50,12 +51,18 @@ module Suitcase
         params["extension"] = info[:work_phone_extension] if info[:work_phone_extension]
         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]
+        if info[:additional_emails]
+          params["emailIntineraryList"] = info[:additional_emails].join(",")
+        end
         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[:mon].to_s.length == 1 ? "0" + expiration_date[:mon].to_s : expiration_date[:mon].to_s)
+        params["creditCardExpirationMonth"] = if expiration_date[:mon] < 10
+                                                "0" + expiration_date[:mon].to_s
+                                              else
+                                                expiration_date[:mon].to_s
+                                              end
         params["creditCardExpirationYear"] = expiration_date[:year].to_s
         params["address1"] = info[:address1]
         params["address2"] = info[:address2] if info[:address2]
@@ -73,7 +80,13 @@ module Suitcase
         params["countryCode"] = info[:country]
         params["postalCode"] = info[:postal_code]
 
-        uri = Room.url :method => "res", :params => params, :include_key => true, :include_cid => true, :secure => true
+        uri = Room.url(
+          method: "res",
+          params: params,
+          include_key: true,
+          include_cid: true,
+          secure: true
+        )
         session = Patron::Session.new
         session.timeout = 30000
         session.base_url = "https://" + uri.host
@@ -81,7 +94,8 @@ module Suitcase
         parsed = JSON.parse res.body
 
         reservation_res = parsed["HotelRoomReservationResponse"]
-        surcharges = if @supplier_type == "E"
+        handle_errors(parsed)
+        surcharges = if @supplier_type == "E" && reservation_res["RateInfo"]["ChargeableRateInfo"]["Surcharges"]
           [reservation_res["RateInfo"]["ChargeableRateInfo"]["Surcharges"]["Surcharge"]].
             flatten.map { |s| Surcharge.parse(s) }
         else

data/lib/suitcase/hotel/surcharge.rb

@@ -2,6 +2,7 @@ module Suitcase
   class Hotel
     # Public: A Surcharge represents a single surcharge on a Room.
     class Surcharge
+      attr_accessor :amount, :type
       # Internal: Create a new Surcharge.
       #
       # info - A Hash of parsed info from Surcharge.parse.

data/lib/suitcase/version.rb

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

data/test/hotels/room_test.rb

@@ -41,5 +41,10 @@ describe Suitcase::Hotel::Room do
       reservation = @room.reserve!(@info)
       reservation.must_be_kind_of(Suitcase::Hotel::Reservation)
     end
+
+    it "raises errors on invalid info" do
+      lambda { @room.reserve!(@info.merge(credit_card_number: "")) }.must_raise Suitcase::Hotel::EANException
+    end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suitcase
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1258883948376164129
+      hash: -43637358386494450
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1258883948376164129
+      hash: -43637358386494450
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24