suitcase 1.2.12 → 1.3.0

data/.gitignore

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

data/README.md

@@ -6,30 +6,73 @@ Ruby library that utilizes the EAN (Expedia.com) API for locating available hote
 Installation
 ------------
 
-Install the gem: `gem install suitcase`. Or, to get the latest bleeding edge add this to your project's Gemfile: `gem 'suitcase', :git => "http://github.com/thoughtfusion/suitcase.git"`.
+Suitcase is a Ruby gem, meaning it can be installed via a simple `gem install suitcase`. It can also be added to a project's `Gemfile` with the following line: `gem 'suitcase'` (or `gem 'suitcase', git: "git://github.com/thoughtfusion/suitcase.git", branch: "development"` for the latest updates).
 
 Usage
 -----
 
+### Hotels
+
 First, configure the library:
 
-      Suitcase::Configuration.hotel_api_key = "..." # set the Hotel API key from developer.ean.com
-      Suitcase::Configuration.cid = "..." # set the CID from developer.ean.com
-      Suitcase::Configuration.cache = Hash.new # set the caching mechanism (see below)
+```ruby
+Suitcase.configure do |config|
+  config.hotel_api_key = "..." # set the Hotel API key from developer.ean.com
+  config.hotel_cid = "..." # set the CID from developer.ean.com
+  config.cache = Hash.new # set the caching mechanism (see below)
+end
+```
 
-Find nearby hotels:
+Full example:
+```ruby
+# Find Hotels in Boston
+hotels = Suitcase::Hotel.find(location: "Boston, MA")
+# Pick a specific hotel
+hotel = hotels[1]
+# Get the rooms for a specific date
+rooms = hotel.rooms(arrival: "7/1/2013", departure: "7/8/2013", rooms: [{ adults: 1, children_ages: [2, 3] }, { adults: 1, children_ages: [4] }])
+# Find a payment option that is compatible with USD
+payment_option = Suitcase::PaymentOption.find(currency_code: "USD")
+# Pick a specific room
+room = rooms.first
+# Set the bed type on each of the rooms to be ordered
+room.rooms.each { |r| r[:bed_type] = room.bed_types.first }
+# Reserve the room, with the reservation_hash described on 'User flow'
+room.reserve!(reservation_hash)
+```
 
-      hotels = Suitcase::Hotel.find(:location => 'Boston, MA', :results => 10) # Returns 10 closest hotels to Boston, MA
-      room = hotels.first.rooms(arrival: "2/19/2012", departure: "2/26/2012", rooms: [{ children: 1, ages: [8] }, { children: 1, ages: [12] }] # Check the availability of two rooms at that hotel with 1 child in each room of ages 8 and 9
-      room.reserve!(info) # See wiki page "User flow" for options
+#### Caching requests
 
-### Caching
+You can setup a cache to store all API requests that do not contain secure information (i.e. anything but booking requests). A cache needs to be able store deeply nested Hashes and have a method called [] to access them. An example of setting the cache is given above. Check the `examples/hash_adapter.rb` for a trivial example of the required methods. A Redis adapter should be coming soon.
 
-#### Requests
 
-You can setup a cache to store all API requests that do not contain secure information (i.e. anything but booking requests). A cache needs to be able store deeply nested Hashes and have a method called [] to access them. An example of setting the cache is given above. Check the `examples/hash_adapter.rb` for a trivial example of the required methods. A Redis adapter should be coming soon.
+### Car rentals
+
+Add the required configuration options:
+
+```ruby
+# Or add to your existing configure block
+Suitcase.configure do |config|
+  config.hotwire_api_key = "..." # set the Hotwire API key
+  config.hotwire_linkshare_id = "..." # optionally set the Hotwire linkshare ID
+end
+```
 
+Example usage:
+
+```ruby
+# Find all rental cars from the specified dates/times at LAX
+rentals = Suitcase::CarRental.find(destination: "LAX", start_date: "7/14/2012", end_date: "7/21/2012", pickup_time: "6:30", dropoff_time: "11:30")
+# => [#<Suitcase::CarRental ...>, ...]
+```
 
 Contributing
 ------------
+
+### Running the specs
+
+To set up for the specs, you need to edit the file `spec/keys.rb` with the proper information. Currently, testing reservations is unsupported. You can run the specs with the default rake task by running `rake` from the command line.
+
+### Pull requests/issues
+
 Please submit any useful pull requests through GitHub. If you find any bugs, please report them with the issue tracker! Thanks.

data/examples/redis_adapter.rb

@@ -0,0 +1,29 @@
+class RedisAdapter
+  def initialize
+    uri = URI.parse(ENV["REDIS_URI"])
+    @redis = Redis.new(:host => uri.host, 
+                       :port => uri.port, 
+                       :password => uri.password)
+  end
+
+  def [](key)
+    stored = @redis.hgetall("ean_cache:#{key}")
+    stored.inject({}) {|mem, (k, v)|
+      mem[JSON.parse(k)] = JSON.parse(v)
+      mem
+    }
+  end
+
+  def []=(key, value)
+    value.each_pair do |params, response|
+      @redis.hset("ean_cache:#{key}", params.to_json, response.to_json)
+    end
+  end
+
+  def keys
+    @redis.keys("ean_cache:*").collect {|key|
+      key.match(/ean_cache:(.*)/)[1] rescue nil
+    }.compact!
+  end
+end
+

data/lib/suitcase/cache.rb

@@ -11,12 +11,16 @@ module Suitcase
         params.delete(param)
       end
       params.delete("currencyCode") unless action == :paymentInfo
+
+      string_params = keys_to_strings(params)
+
       @store[action] ||= {}
-      @store[action][params] = response
+      @store[action] = @store[action].merge(string_params => response)
     end
 
     def get_query(action, params)
-      @store[action] ? @store[action][params] : nil
+      string_params = keys_to_strings(params)
+      @store[action] ? @store[action][string_params] : nil
     end
 
     def keys
@@ -24,11 +28,22 @@ module Suitcase
     end
 
     def cached?(action, params)
-      @store[action] && @store[action][params]
+      string_params = keys_to_strings(params)
+      @store[action] && @store[action][string_params]
     end
 
     def undefine_query(action, params)
-      @store[action].delete(params) if @store[action]
+      string_params = keys_to_strings(params)
+      @store[action].delete(string_params) if @store[action]
+    end
+
+    private
+
+    def keys_to_strings(hash)
+      hash.inject({}) {|memo, (k, v)| 
+        memo[k.to_s] = v
+        memo
+      }
     end
   end
 end

data/lib/suitcase/car_rental.rb

@@ -0,0 +1,51 @@
+module Suitcase
+  class CarRental
+    attr_accessor :seating, :type_name, :type_code, :possible_features, :possible_models
+
+    def initialize(data)
+      @seating = data["CarTypeSeating"]
+      @type_name = data["CarTypeName"]
+      @type_code = data["CarTypeCode"]
+      @possible_features = data["PossibleFeatures"].split(", ")
+      @possible_models = data["PossibleModels"].split(", ")
+    end
+
+    class << self
+      def find(info)
+        parsed = parse_json(build_url(info))
+        parse_errors(parsed)
+        parsed["MetaData"]["CarMetaData"]["CarTypes"].map { |data| CarRental.new(data) }
+      end
+
+      def build_url(info)
+        base_url = "http://api.hotwire.com/v1/search/car"
+        info["apikey"] = Configuration.hotwire_api_key
+        info["format"] = "JSON"
+        if Configuration.use_hotwire_linkshare_id?
+          info["linkshareid"] = Configuration.hotwire_linkshare_id
+        end
+        info["dest"] = info.delete(:destination)
+        info["startdate"] = info.delete(:start_date)
+        info["enddate"] = info.delete(:end_date)
+        info["pickuptime"] = info.delete(:pickup_time)
+        info["dropofftime"] = info.delete(:dropoff_time)
+        base_url += "?" + parameterize(info)
+        URI.parse(URI.escape(base_url))
+      end
+
+      def parameterize(info)
+        info.map { |key, value| "#{key}=#{value}" }.join("&")
+      end
+
+      def parse_json(uri)
+        response = Net::HTTP.get_response(uri)
+        raise "Data not valid." if response.code != "200"
+        JSON.parse(response.body)
+      end
+
+      def parse_errors(parsed)
+        parsed["Errors"].each { |e| raise e } if parsed["Errors"] && !parsed["Errors"].empty?
+      end
+    end
+  end
+end

data/lib/suitcase/configuration.rb

@@ -1,4 +1,8 @@
 module Suitcase
+  def self.configure(&block)
+    block.call(Configuration)
+  end
+
   class Configuration
     def self.cache=(store)
       @@cache = Suitcase::Cache.new(store)
@@ -27,5 +31,41 @@ module Suitcase
     def self.hotel_cid
       @@hotel_cid if defined? @@hotel_cid
     end
+
+    def self.hotel_shared_secret=(secret)
+      @@hotel_shared_secret = secret
+    end
+
+    def self.hotel_shared_secret
+      @@hotel_shared_secret if defined? @@hotel_shared_secret
+    end
+
+    def self.use_signature_auth=(choice)
+      @@use_signature_authentication = choice
+    end
+
+    def self.use_signature_auth?
+      defined? @@use_signature_auth
+    end
+
+    def self.hotwire_api_key=(api_key)
+      @@hotwire_api_key = api_key
+    end
+
+    def self.hotwire_api_key
+      @@hotwire_api_key if defined? @@hotwire_api_key
+    end
+
+    def self.hotwire_linkshare_id=(id)
+      @@hotwire_linkshare_id = id
+    end
+
+    def self.hotwire_linkshare_id
+      @@hotwire_linkshare_id if use_hotwire_lnikshare_id?
+    end
+
+    def self.use_hotwire_linkshare_id?
+      defined? @@hotwire_linkshare_id
+    end
   end
 end

data/lib/suitcase/hotel/helpers.rb

@@ -0,0 +1,131 @@
+module Suitcase
+  # Internal: Various methods for doing things that many files need to in the
+  #           library.
+  #
+  # Examples
+  #
+  #   parameterize(something: "else", another: "thing")
+  #   # => "something=else&another=thing"
+  module Helpers
+    # Internal: Defaults for the builder options to Helpers#url.
+    URL_DEFAULTS = {
+      include_key: true,
+      include_cid: true,
+      secure: false,
+      as_form: false,
+      session: Session.new
+    }
+
+    # Internal: Parameterize a Hash.
+    #
+    # hash  - The Hash to be parameterized.
+    #
+    # Examples
+    #
+    #   parameterize(something: "else", another: "thing")
+    #   # => "something=else&another=thing"
+    #
+    # Returns a parameterized String.
+    def parameterize(hash)
+      hash.map { |key, value| "#{key}=#{value}" }.join "&"
+    end
+
+    # Internal: Build an API URL.
+    #
+    # builder - A Hash with the following required keys:
+    #           :method       - The API method to be put in the URL.
+    #           :params       - The params to be put in the URL.
+    #           And the following optional ones:
+    #           :include_key  - Whether to include the API key or not.
+    #           :include_cid  - Whether to include the API cid or not.
+    #           :secure       - Whether or not for the request to be sent over
+    #                           HTTPS.
+    #           :as_form      - Whether or not to include the parameters in the
+    #                           URL.
+    #           :session      - The Session associated with the request.
+    #
+    # Examples
+    #
+    #   url(secure: true, as_form: true, method: "myMethod", params: {})
+    #   # => #<URI::HTTPS URL:https://book.api.ean.com/.../rs/hotel/v3/myMethod>
+    def url(builder)
+      builder = URL_DEFAULTS.merge(builder)
+      builder[:session] ||= URL_DEFAULTS[:session]
+      method, params = builder[:method], builder[:params]
+      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]))
+      url += parameterize(params) unless builder[:as_form]
+      URI.parse(URI.escape(url))
+    end
+
+    # Internal: Get the root URL for the Hotels API.
+    #
+    # secure - Whether or not the URL should be HTTPS or not.
+    #
+    # Returns the URL.
+    def main_url(secure)
+      url = "http#{secure ? "s" : ""}://#{secure ? "book." : ""}"
+      url += "api.ean.com/ean-services/rs/hotel/v3/"
+      url
+    end
+
+    # Internal: Parse the JSON response at the given URL.
+    #
+    # uri - The URI to parse the JSON from.
+    #
+    # Returns the parsed JSON.
+    def parse_response(uri)
+      JSON.parse(Net::HTTP.get_response(uri).body)
+    end
+
+    # Internal: Get the base URL based on a Hash of info.
+    #
+    # info  - A Hash with only one required key:
+    #         :booking - Whether or not it is a booking request.
+    #
+    # Returns the base URL.
+    def base_url(info)
+      main_url(info[:booking])
+    end
+
+    # Internal: Build a Hash of params from a Session.
+    #
+    # session - The Session to generate params from.
+    #
+    # Returns the Hash of params.
+    def build_session_params(session)
+      session_info = {}
+      session_info["customerSessionId"] = session.id if session.id
+      session_info["customerIpAddress"] = session.ip_address if session.ip_address
+      session_info["locale"] = session.locale if session.locale
+      session_info["currencyCode"] = session.currency_code if session.currency_code
+      session_info["customerUserAgent"] = session.user_agent if session.user_agent
+      session_info
+    end
+
+    # Internal: Update the Session's ID with the parsed JSON.
+    #
+    # parsed  - The parsed JSON to fetch the ID from.
+    # session - The Session to update.
+    #
+    # Returns nothing.
+    def update_session(parsed, session)
+      session ||= Suitcase::Session.new
+      session.id = parsed[parsed.keys.first]["customerSessionId"] if parsed[parsed.keys.first]
+    end
+
+    # Internal: Generate a digital signature to authenticate with.
+    #
+    # Returns the generated signature.
+    def generate_signature
+      Digest::MD5.hexdigest(Configuration.hotel_api_key + 
+                            Configuration.hotel_shared_secret + 
+                            Time.now.to_i.to_s)
+    end
+  end
+end

data/lib/suitcase/hotel/hotel.rb

@@ -145,6 +145,7 @@ module Suitcase
       parsed_info[:location_description] = summary["locationDescription"]
       parsed_info[:number_of_rooms] = parsed["HotelInformationResponse"]["HotelDetails"]["numberOfRooms"] if parsed["HotelInformationResponse"]
       parsed_info[:number_of_floors] = parsed["HotelInformationResponse"]["HotelDetails"]["numberOfFloors"] if parsed["HotelInformationResponse"]
+      parsed_info[:short_description] = summary["shortDescription"]
       parsed_info
     end
 

data/lib/suitcase/version.rb

@@ -1,3 +1,3 @@
 module Suitcase
-  VERSION = "1.2.12"
+  VERSION = "1.3.0"
 end

data/lib/suitcase.rb

@@ -1,15 +1,19 @@
 require 'patron'
 require 'json'
 require 'net/http'
+require 'digest/md5'
 require 'date/format'
 require 'time'
-require 'suitcase/session'
-require 'suitcase/core_ext/string'
+
 require 'suitcase/version'
+
+require 'suitcase/core_ext/string'
+
+require 'suitcase/session'
 require 'suitcase/configuration'
-# require 'suitcase/session_cache'
 require 'suitcase/cache'
-require 'suitcase/helpers'
+
+require 'suitcase/hotel/helpers'
 require 'suitcase/hotel/location'
 require 'suitcase/hotel/amenity'
 require 'suitcase/hotel/reservation'
@@ -18,3 +22,5 @@ require 'suitcase/hotel/room'
 require 'suitcase/hotel/payment_option'
 require 'suitcase/hotel/hotel'
 require 'suitcase/hotel/image'
+
+require 'suitcase/car_rental'

data/spec/car_rental_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Suitcase::CarRental do
+  before :each do
+    @rentals = Suitcase::CarRental.find(destination: "Seattle", start_date: "07/04/2012", end_date: "07/11/2012", pickup_time: "07:30", dropoff_time: "07:30")
+  end
+
+  describe '.find' do 
+    it 'returns an Array of CarRentals' do
+      @rentals.class.should eq Array
+      @rentals.first.class.should eq Suitcase::CarRental
+    end
+  end
+
+  subject { @rentals.first }
+
+  [:seating, :type_name, :type_code, :possible_features, :possible_models].each do |method|
+    it { should respond_to method }
+  end
+end

data/spec/helpers_spec.rb

@@ -5,10 +5,22 @@ describe Suitcase::Helpers do
     class Dummy; extend Suitcase::Helpers; end
   end
 
-  it "#url should return a URI with the correct base URL" do
-    returned = Dummy.url(:method => "action", :params => {})
-    returned.should be_a(URI)
-    returned.host.should match(/api.ean.com/)
+  describe "#url" do
+    it "should return a URI with the correct base URL" do
+      returned = Dummy.url(:method => "action", :params => {})
+      returned.should be_a(URI)
+      returned.host.should match(/api.ean.com/)
+    end
+
+    context "when using digital signature authentication" do
+      it "should add a 'sig' parameter" do
+        Suitcase::Configuration.stub(:use_signature_auth?) { true }
+        Dummy.stub(:generate_signature) { "test" }
+
+        returned = Dummy.url(:method => "action", :params => {})
+        returned.query.should match(/sig=test/)
+      end
+    end
   end
 
   it "#parse_response should raise an exception when passed an invalid URI" do
@@ -16,4 +28,13 @@ describe Suitcase::Helpers do
       Dummy.parse_response(URI.parse "http://google.com")
     end.should raise_error
   end
+
+  it "#generate_signature should return the encrypted api key, shared secret, and timestamp" do
+    Suitcase::Configuration.stub(:hotel_api_key) { "abc" }
+    Suitcase::Configuration.stub(:hotel_shared_secret) { "123" }
+    Time.stub(:now) { "10" }
+
+    returned = Dummy.generate_signature
+    returned.should == Digest::MD5.hexdigest("abc12310")
+  end
 end

data/spec/keys.rb

@@ -0,0 +1,36 @@
+# Suitcase::Configuration.hotel_api_key = "your_api_key_here"
+# Suitcase::Configuration.hotel_cid = "your_cid_here"
+# Suitcase::Configuration.hotel_shared_secret = "your_shared_secret_here"
+# Suitcase::Configuration.use_signature_auth = true
+
+# Or configure with a block:
+
+Suitcase.configure do |config|
+  config.hotel_api_key = "your_api_key_here"
+  config.hotel_cid = "your_cid_here"
+  # config.hotel_shared_secret = "none"
+  # config.use_signature_auth = false
+end
+
+module Keys
+  SUITCASE_PAYMENT_OPTION = Suitcase::PaymentOption.find(currency_code: "USD")[0]
+  CREDIT_CARD_NUMBER_TESTING = "1234123412341234"
+  CREDIT_CARD_CVV_TESTING = "123"
+  CREDIT_CARD_EXPIRATION_DATE_TESTING = "3/14"
+
+  VALID_RESERVATION_INFO = {
+    email: "testemail@gmail.com",
+    first_name: "Test",
+    last_name: "User",
+    home_phone: "1231231234",
+    payment_option: SUITCASE_PAYMENT_OPTION,
+    credit_card_number: CREDIT_CARD_NUMBER_TESTING, 
+    credit_card_verification_code: "123",
+    credit_card_expiration_date: CREDIT_CARD_EXPIRATION_DATE_TESTING,
+    address1: "1 Some Place",
+    city: "Boston",
+    province: "MA",
+    country: "US",
+    postal_code: "01234",
+  }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suitcase
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10689360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10689360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10688280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10688280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &10703800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10703800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &10702920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10702920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10702140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10702140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &10701540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10701540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby library that utilizes the EAN (Expedia.com) API for locating available
   hotels (and maybe rental cars and flights someday, too).
 email:
@@ -92,14 +122,16 @@ files:
 - README.md
 - Rakefile
 - examples/hash_adapter.rb
+- examples/redis_adapter.rb
 - lib/suitcase.rb
 - lib/suitcase/airport_codes.rb
 - lib/suitcase/cache.rb
+- lib/suitcase/car_rental.rb
 - lib/suitcase/configuration.rb
 - lib/suitcase/core_ext/string.rb
 - lib/suitcase/country_codes.rb
-- lib/suitcase/helpers.rb
 - lib/suitcase/hotel/amenity.rb
+- lib/suitcase/hotel/helpers.rb
 - lib/suitcase/hotel/hotel.rb
 - lib/suitcase/hotel/image.rb
 - lib/suitcase/hotel/location.rb
@@ -110,10 +142,12 @@ files:
 - lib/suitcase/session.rb
 - lib/suitcase/version.rb
 - spec/caching_spec.rb
+- spec/car_rental_spec.rb
 - spec/helpers_spec.rb
 - spec/hotel_location_spec.rb
 - spec/hotels_spec.rb
 - spec/images_spec.rb
+- spec/keys.rb
 - spec/payment_options_spec.rb
 - spec/reservation_spec.rb
 - spec/rooms_spec.rb
@@ -132,30 +166,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1832860835282660065
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1832860835282660065
 requirements: []
 rubyforge_project: suitcase
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Locates available hotels with the Expedia API
 test_files:
 - spec/caching_spec.rb
+- spec/car_rental_spec.rb
 - spec/helpers_spec.rb
 - spec/hotel_location_spec.rb
 - spec/hotels_spec.rb
 - spec/images_spec.rb
+- spec/keys.rb
 - spec/payment_options_spec.rb
 - spec/reservation_spec.rb
 - spec/rooms_spec.rb

data/lib/suitcase/helpers.rb

@@ -1,44 +0,0 @@
-module Suitcase
-  module Helpers
-    def url(builder)
-      builder[:include_key] ||= true
-      builder[:include_cid] ||= true
-      builder[:secure] ||= false
-      builder[:as_form] ||= false
-      builder[:session] ||= Suitcase::Session.new
-      method, params, include_key, include_cid = builder[:method], builder[:params], builder[:include_key], builder[:include_cid]
-      params["apiKey"] = Configuration.hotel_api_key if include_key
-      params["cid"] = (Configuration.hotel_cid ||= 55505) if include_cid
-      url = main_url(builder[:secure]) + method.to_s + (builder[:as_form] ? "" : "?")
-      session_info = {}
-      session_info["customerSessionId"] = builder[:session].id if builder[:session].id
-      session_info["customerIpAddress"] = builder[:session].ip_address if builder[:session].ip_address
-      session_info["locale"] = builder[:session].locale if builder[:session].locale
-      session_info["currencyCode"] = builder[:session].currency_code if builder[:session].currency_code
-      session_info["customerUserAgent"] = builder[:session].user_agent if builder[:session].user_agent
-      url += params.merge(session_info).map { |key, value| "#{key}=#{value}"}.join("&") unless builder[:as_form]
-      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
-
-    def update_session(parsed, session)
-      session ||= Suitcase::Session.new
-      session.id = parsed[parsed.keys.first]["customerSessionId"] if parsed[parsed.keys.first]
-    end
-  end
-end