suitcase 1.1.4 → 1.1.6

data/Gemfile

@@ -1,4 +1,3 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in suitcase.gemspec
 gemspec

data/lib/suitcase/hotel/hotel.rb

@@ -1,7 +1,7 @@
 module Suitcase
   class EANException < Exception
-    def initialize
-      super("TravelNow.com cannot service this request")
+    def initialize(message)
+      super(message)
     end
   end
 
@@ -15,8 +15,6 @@ module Suitcase
                   pets: 7,
                   wheelchair_accessible: 8,
                   kitchen: 9 }
-    EXCEPTIONS = { -1 => EANException
-                  }
 
     attr_accessor :id, :name, :address, :city, :min_rate, :max_rate, :amenities, :country_code, :high_rate, :low_rate, :longitude, :latitude, :rating, :postal_code, :supplier_type, :image_urls
 
@@ -26,8 +24,8 @@ module Suitcase
       end
     end
 
-    def self.url(action, include_key, include_cid, params)
-      url = "http://api.ean.com/ean-services/rs/hotel/v3/" + action.to_s + "?"
+    def self.url(action, include_key, include_cid, params, method=:get, secure=false)
+      url = "http#{secure ? "s" : "" }://api.ean.com/ean-services/rs/hotel/v3/" + action.to_s + "?"
       include_key ? params["apiKey"] = Suitcase::Hotel::API_KEY : nil
       include_cid ? params["cid"] = "55505" : nil
       params.each do |k, v|
@@ -78,6 +76,10 @@ module Suitcase
       Net::HTTP.get_response(url).body
     end
 
+    def self.shove(url, params)
+      Net::HTTP.post_form(url, params).body
+    end
+
     def self.parse_hotel_information(json)
       parsed = JSON.parse json
       handle_errors(parsed)
@@ -90,14 +92,20 @@ module Suitcase
     end
 
     def self.images(parsed)
-      p parsed
       return nil
     end
 
+    # Bleghh. so ugly. #needsfixing
     def self.handle_errors(info)
-      raise EXCEPTIONS[info["HotelListResponse"]["EanWsError"]["exceptionConditionId"]] if info["HotelListResponse"] && info["HotelListResponse"]["EanWsError"]
-      raise EXCEPTIONS[info["HotelInformationResponse"]["EanWsError"]["exceptionConditionId"]] if info["HotelInformationResponse"] && info["HotelInformationResponse"]["EanWsError"]
-    end
+      if info["HotelRoomAvailabilityResponse"] && info["HotelRoomAvailabilityResponse"]["EanWsError"]
+        message = info["HotelRoomAvailabilityResponse"]["EanWsError"]["presentationMessage"]
+      elsif info["HotelListResponse"] && info["HotelListResponse"]["EanWsError"]
+        message = info["HotelListResponse"]["EanWsError"]["presentationMessage"]
+      elsif info["HotelInformationResponse"] && info["HotelInformationResponse"]["EanWsError"]
+        message = info["HotelInformationResponse"]["EanWsError"]["presentationMessage"]
+      end
+      raise EANException.new(message) if message
+   end
 
     def self.split(data)
       parsed = JSON.parse(data)
@@ -106,7 +114,7 @@ module Suitcase
     end
 
     def rooms(info)
-      params = info
+      params = { rooms: [{children: 0, ages: []}] }.merge(info)
       params[:rooms].each_with_index do |room, n|
         params["room#{n+1}"] = (room[:children] == 0 ? "" : room[:children].to_s + ",").to_s + room[:ages].join(",").to_s
       end
@@ -116,6 +124,7 @@ module Suitcase
       params.delete(:departure)
       params["hotelId"] = @id
       parsed = JSON.parse(Hotel.hit(Hotel.url(:avail, true, true, params)))
+      Hotel.handle_errors(parsed)
       hotel_id = parsed["HotelRoomAvailabilityResponse"]["hotelId"]
       rate_key = parsed["HotelRoomAvailabilityResponse"]["rateKey"]
       supplier_type = parsed["HotelRoomAvailabilityResponse"]["HotelRoomResponse"][0]["supplierType"]
@@ -126,7 +135,6 @@ module Suitcase
       options = []
       types_raw = JSON.parse Hotel.hit(Hotel.url(:paymentInfo, true, true, {}))
       types_raw["HotelPaymentResponse"].each do |raw|
-        p raw
         types = raw[0] != "PaymentType" ? [] : raw[1]
         types.each do |type|
           options.push PaymentOption.new(type["code"], type["name"])

data/lib/suitcase/hotel/room.rb

@@ -20,7 +20,7 @@ module Suitcase
       params["rateTypeCode"] = info[:room_type_code]
       params["rateCode"] = info[:rate_code]
       params.delete(:rate_code)
-      p Hotel.hit(Hotel.url(:res, true, true, params))
+      p Hotel.shove(Hotel.url(:res, true, true, {}, :post, true), params)
     end
   end
 end

data/lib/suitcase/version.rb

@@ -1,3 +1,3 @@
 module Suitcase
-  VERSION = "1.1.4"
+  VERSION = "1.1.6"
 end

data/suitcase.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   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 API for locating 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.rubyforge_project = "suitcase"
 
@@ -22,5 +22,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "cucumber"
   s.add_development_dependency "rake"
   s.add_runtime_dependency "json"
-  s.add_runtime_dependency "nokogiri"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suitcase
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-24 00:00:00.000000000 Z
+date: 2011-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19469920 !ruby/object:Gem::Requirement
+  requirement: &15869360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19469920
+  version_requirements: *15869360
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &19013180 !ruby/object:Gem::Requirement
+  requirement: &15868940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19013180
+  version_requirements: *15868940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19012500 !ruby/object:Gem::Requirement
+  requirement: &15868520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19012500
+  version_requirements: *15868520
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &19011800 !ruby/object:Gem::Requirement
+  requirement: &15867980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,20 +54,9 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19011800
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &19011140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *19011140
-description: Suitcase utilizes the EAN API for locating available hotels, rental cars,
-  and flights.
+  version_requirements: *15867980
+description: Suitcase utilizes the EAN (Expedia.com) API for locating info about hotels,
+  rental cars, and flights.
 email:
 - walter.john.nelson@gmail.com
 executables: []
@@ -106,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2225854137888015494
+      hash: 2512264335440945833
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2225854137888015494
+      hash: 2512264335440945833
 requirements: []
 rubyforge_project: suitcase
 rubygems_version: 1.8.10