suitcase 1.1.3 → 1.1.4

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+# require 'suitcase'
+
+task :install_nodoc => [:build] do
+  system "gem install pkg/suitcase-#{Suitcase::VERSION}.gem --no-ri --no-rdoc"
+end

data/lib/suitcase/{hotel.rb → hotel/hotel.rb}

@@ -1,35 +1,7 @@
 module Suitcase
-  class PaymentOption
-   attr_accessor :code, :name
-
-    def initialize(code, name)
-      @code = code
-      @name = name
-    end
-  end
-
-  class Room
-    attr_accessor :rate_key, :hotel_id, :supplier_type
-
-    def initialize(rate_key, hotel_id, supplier_type)
-      @rate_key = rate_key
-      @hotel_id = hotel_id
-      @supplier_type = supplier_type
-    end
-
-    def reserve!(info)
-      params = info
-      params["hotelId"] = @id
-      params["arrivalDate"] = info[:arrival]
-      params["departureDate"] = info[:departure]
-      params.delete(:arrival)
-      params.delete(:departure)
-      params["supplierType"] = supplier_type
-      params["rateKey"] = @rate_key
-      params["rateTypeCode"] = info[:room_type_code]
-      params["rateCode"] = info[:rate_code]
-      params.delete(:rate_code)
-      p Hotel.hit(Hotel.url(:res, true, true, params))
+  class EANException < Exception
+    def initialize
+      super("TravelNow.com cannot service this request")
     end
   end
 
@@ -43,6 +15,8 @@ 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
 
@@ -84,19 +58,17 @@ module Suitcase
       params["destinationString"] = params[:location]
       params.delete(:location)
       if params[:amenities]
-        amenities = ""
-        params[:amenities].each do |amenity|
-          amenities += AMENITIES[amenity].to_s + ","
-        end
-        if amenities =~ /^(.+),$/
-          amenities = $1
-        end
+        params[:amenities].inject("") { |old, new| old + AMENITIES[new].to_s + "," }
+        amenities =~ /^(.+),$/
+        amenities = $1
       end
       params["minRate"] = params[:min_rate] if params[:min_rate]
       params["maxRate"] = params[:max_rate] if params[:max_rate]
       params[:amenities] = amenities
       hotels = []
-      split(hit(url(:list, true, true, params))).each do |hotel_data|
+      raw = hit(url(:list, true, true, params))
+      handle_errors(JSON.parse raw)
+      split(raw).each do |hotel_data|
         hotels.push Hotel.new(parse_hotel_information(hotel_data.to_json))
       end
       hotels
@@ -108,8 +80,23 @@ module Suitcase
 
     def self.parse_hotel_information(json)
       parsed = JSON.parse json
+      handle_errors(parsed)
       summary = parsed["hotelId"] ? parsed : parsed["HotelInformationResponse"]["HotelSummary"]
-      { id: summary["hotelId"], name: summary["name"], address: summary["address1"], city: summary["city"], postal_code: summary["postalCode"], country_code: summary["countryCode"], rating: summary["hotelRating"], high_rate: summary["highRate"], low_rate: summary["lowRate"], latitude: summary["latitude"].to_f, longitude: summary["longitude"].to_f, image_urls: (parsed["HotelInformationResponse"]["HotelImages"]["HotelImage"].map { |x| x["url"] } unless !parsed["HotelInformationResponse"]["HotelImages"]["HotelImage"]) }
+      parsed_info = { id: summary["hotelId"], name: summary["name"], address: summary["address1"], city: summary["city"], postal_code: summary["postalCode"], country_code: summary["countryCode"], rating: summary["hotelRating"], high_rate: summary["highRate"], low_rate: summary["lowRate"], latitude: summary["latitude"].to_f, longitude: summary["longitude"].to_f }
+      if images(parsed)
+        parsed_info[:image_urls] = images(parsed)
+      end
+      parsed_info
+    end
+
+    def self.images(parsed)
+      p parsed
+      return nil
+    end
+
+    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
 
     def self.split(data)

data/lib/suitcase/hotel/payment_option.rb

@@ -0,0 +1,10 @@
+module Suitcase
+  class PaymentOption
+   attr_accessor :code, :name
+
+    def initialize(code, name)
+      @code = code
+      @name = name
+    end
+  end
+end

data/lib/suitcase/hotel/room.rb

@@ -0,0 +1,26 @@
+module Suitcase
+  class Room
+    attr_accessor :rate_key, :hotel_id, :supplier_type
+
+    def initialize(rate_key, hotel_id, supplier_type)
+      @rate_key = rate_key
+      @hotel_id = hotel_id
+      @supplier_type = supplier_type
+    end
+
+    def reserve!(info)
+      params = info
+      params["hotelId"] = @id
+      params["arrivalDate"] = info[:arrival]
+      params["departureDate"] = info[:departure]
+      params.delete(:arrival)
+      params.delete(:departure)
+      params["supplierType"] = supplier_type
+      params["rateKey"] = @rate_key
+      params["rateTypeCode"] = info[:room_type_code]
+      params["rateCode"] = info[:rate_code]
+      params.delete(:rate_code)
+      p Hotel.hit(Hotel.url(:res, true, true, params))
+    end
+  end
+end

data/lib/suitcase/version.rb

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

data/lib/suitcase.rb

@@ -1,4 +1,6 @@
 require 'json'
 require 'net/http'
 require 'suitcase/version'
-require 'suitcase/hotel'
+require 'suitcase/hotel/room'
+require 'suitcase/hotel/payment_option'
+require 'suitcase/hotel/hotel'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suitcase
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14206260 !ruby/object:Gem::Requirement
+  requirement: &19469920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14206260
+  version_requirements: *19469920
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &14205820 !ruby/object:Gem::Requirement
+  requirement: &19013180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14205820
+  version_requirements: *19013180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14205280 !ruby/object:Gem::Requirement
+  requirement: &19012500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14205280
+  version_requirements: *19012500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14204520 !ruby/object:Gem::Requirement
+  requirement: &19011800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14204520
+  version_requirements: *19011800
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &14203920 !ruby/object:Gem::Requirement
+  requirement: &19011140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14203920
+  version_requirements: *19011140
 description: Suitcase utilizes the EAN API for locating available hotels, rental cars,
   and flights.
 email:
@@ -83,7 +83,9 @@ files:
 - lib/suitcase.rb
 - lib/suitcase/airport_codes.rb
 - lib/suitcase/country_codes.rb
-- lib/suitcase/hotel.rb
+- lib/suitcase/hotel/hotel.rb
+- lib/suitcase/hotel/payment_option.rb
+- lib/suitcase/hotel/room.rb
 - lib/suitcase/version.rb
 - spec/api_key.rb
 - spec/data_helpers_spec.rb
@@ -104,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1114543209973713619
+      hash: -2225854137888015494
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1114543209973713619
+      hash: -2225854137888015494
 requirements: []
 rubyforge_project: suitcase
 rubygems_version: 1.8.10