suitcase 1.1.6 → 1.1.7

data/lib/suitcase/helpers.rb

@@ -0,0 +1,15 @@
+module Suitcase
+  module Helpers
+    def url(method, params, include_key=true, include_cid=true, secure=false, as_form=false)
+      params["apiKey"] = Suitcase::Hotel::API_KEY if include_key
+      params["cid"] = Suitcase::Hotel::API_KEY if include_cid
+      url = "http#{secure ? "s" : ""}://api.ean.com/ean-services/rs/hotel/v3/#{method.to_s}#{as_form ? "" : "?"}"
+      url += params.map { |key, value| "#{key}=#{value}"}.join("&")
+      URI.parse(URI.escape(url))
+    end
+
+    def parse_response(uri)
+      JSON.parse(Net::HTTP.get_response(uri).body)
+    end
+  end
+end

data/lib/suitcase/hotel/hotel.rb

@@ -6,6 +6,8 @@ module Suitcase
   end
 
   class Hotel
+    extend Suitcase::Helpers
+
     AMENITIES = { pool: 1,
                   fitness_center: 2,
                   restaurant: 3,
@@ -24,19 +26,6 @@ module Suitcase
       end
     end
 
-    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|
-        url += k.to_s + "=" + v.to_s + "&"
-      end
-      if url =~ /^(.+)&$/
-        url = $1
-      end
-      URI.parse URI.escape(url)
-    end
-
     def self.find(info)
       if info[:id]
         find_by_id(info[:id])
@@ -46,7 +35,10 @@ module Suitcase
     end
 
     def self.find_by_id(id)
-      Hotel.new(parse_hotel_information(hit(url(:info, true, true, { hotelId: id }))))
+      url = url(:info, { hotelId: id })
+      raw = parse_response(url)
+      hotel_data = parse_information(raw)
+      Hotel.new(hotel_data)
     end
 
     def self.find_by_info(info)
@@ -64,24 +56,15 @@ module Suitcase
       params["maxRate"] = params[:max_rate] if params[:max_rate]
       params[:amenities] = amenities
       hotels = []
-      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))
+      parsed = parse_response(url(:list, params))
+      handle_errors(parsed)
+      split(parsed).each do |hotel_data|
+        hotels.push Hotel.new(parse_information(hotel_data))
       end
       hotels
     end
 
-    def self.hit(url)
-      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
+    def self.parse_information(parsed)
       handle_errors(parsed)
       summary = parsed["hotelId"] ? parsed : parsed["HotelInformationResponse"]["HotelSummary"]
       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 }
@@ -107,8 +90,7 @@ module Suitcase
       raise EANException.new(message) if message
    end
 
-    def self.split(data)
-      parsed = JSON.parse(data)
+    def self.split(parsed)
       hotels = parsed["HotelListResponse"]["HotelList"]
       hotels["HotelSummary"]
     end
@@ -123,7 +105,7 @@ module Suitcase
       params.delete(:arrival)
       params.delete(:departure)
       params["hotelId"] = @id
-      parsed = JSON.parse(Hotel.hit(Hotel.url(:avail, true, true, params)))
+      parsed = Hotel.parse_response(Hotel.url(:avail, params))
       Hotel.handle_errors(parsed)
       hotel_id = parsed["HotelRoomAvailabilityResponse"]["hotelId"]
       rate_key = parsed["HotelRoomAvailabilityResponse"]["rateKey"]
@@ -133,7 +115,7 @@ module Suitcase
 
     def payment_options
       options = []
-      types_raw = JSON.parse Hotel.hit(Hotel.url(:paymentInfo, true, true, {}))
+      types_raw = JSON.parse Hotel.hit(url(:paymentInfo, true, true, {}))
       types_raw["HotelPaymentResponse"].each do |raw|
         types = raw[0] != "PaymentType" ? [] : raw[1]
         types.each do |type|

data/lib/suitcase/version.rb

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

data/lib/suitcase.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'net/http'
 require 'suitcase/version'
+require 'suitcase/helpers'
 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.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-26 00:00:00.000000000 Z
+date: 2011-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15869360 !ruby/object:Gem::Requirement
+  requirement: &13140540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15869360
+  version_requirements: *13140540
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &15868940 !ruby/object:Gem::Requirement
+  requirement: &13140060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15868940
+  version_requirements: *13140060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15868520 !ruby/object:Gem::Requirement
+  requirement: &13139260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15868520
+  version_requirements: *13139260
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &15867980 !ruby/object:Gem::Requirement
+  requirement: &13138520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15867980
+  version_requirements: *13138520
 description: Suitcase utilizes the EAN (Expedia.com) API for locating info about hotels,
   rental cars, and flights.
 email:
@@ -72,6 +72,7 @@ files:
 - lib/suitcase.rb
 - lib/suitcase/airport_codes.rb
 - lib/suitcase/country_codes.rb
+- lib/suitcase/helpers.rb
 - lib/suitcase/hotel/hotel.rb
 - lib/suitcase/hotel/payment_option.rb
 - lib/suitcase/hotel/room.rb
@@ -95,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2512264335440945833
+      hash: -3208530258623277301
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2512264335440945833
+      hash: -3208530258623277301
 requirements: []
 rubyforge_project: suitcase
 rubygems_version: 1.8.10