suitcase 1.1.7 → 1.1.8

data/.gitignore

@@ -2,5 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
-lib/suitcase/hotel/api_key.rb
-lib/suitcase/air/api_key.rb
+spec/api_key.rb

data/.rspec

@@ -0,0 +1 @@
+--fail-fast -c --format d

data/README.md

@@ -21,8 +21,8 @@ First, include the module in your code:
 Find nearby hotels:
 
       Hotel::API_KEY = "your_api_key_here"
-      hotel = Hotel.find(:location => 'Boston, MA', :results => 10) # Returns 10 closest hotels to Boston, MA
-      room = hotel.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
+      hotels = 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) # Not yet implemented
 Contributing
 ------------

data/Rakefile

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

data/lib/suitcase.rb

@@ -1,7 +1,10 @@
 require 'json'
 require 'net/http'
+require 'suitcase/core_ext/string'
 require 'suitcase/version'
 require 'suitcase/helpers'
+require 'suitcase/hotel/nightly_rate'
 require 'suitcase/hotel/room'
 require 'suitcase/hotel/payment_option'
 require 'suitcase/hotel/hotel'
+require 'suitcase/hotel/image'

data/lib/suitcase/core_ext/string.rb

@@ -0,0 +1,13 @@
+class String
+  def underscore
+    self.gsub(/::/, '/').
+    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+    gsub(/([a-z\d])([A-Z])/,'\1_\2').
+    tr("-", "_").
+    downcase
+  end
+
+  def to_b
+    self == "true"
+  end
+end

data/lib/suitcase/hotel/hotel.rb

@@ -18,7 +18,7 @@ module Suitcase
                   wheelchair_accessible: 8,
                   kitchen: 9 }
 
-    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
+    attr_accessor :id, :name, :address, :city, :min_rate, :max_rate, :amenities, :country_code, :high_rate, :low_rate, :longitude, :latitude, :rating, :postal_code, :supplier_type, :images
 
     def initialize(info)
       info.each do |k, v|
@@ -68,14 +68,13 @@ module Suitcase
       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 }
-      if images(parsed)
-        parsed_info[:image_urls] = images(parsed)
-      end
+      parsed_info[:images] = images(parsed) if images(parsed)
       parsed_info
     end
 
     def self.images(parsed)
-      return nil
+      return parsed["HotelInformationResponse"]["HotelImages"]["HotelImage"].map { |image_data| Suitcase::Image.new(image_data) } if parsed["HotelInformationResponse"]
+      return Suitcase::Image.new(url: parsed["thumbNailUrl"]) if parsed["thumbNailUrl"]
     end
 
     # Bleghh. so ugly. #needsfixing
@@ -110,7 +109,19 @@ module Suitcase
       hotel_id = parsed["HotelRoomAvailabilityResponse"]["hotelId"]
       rate_key = parsed["HotelRoomAvailabilityResponse"]["rateKey"]
       supplier_type = parsed["HotelRoomAvailabilityResponse"]["HotelRoomResponse"][0]["supplierType"]
-      Room.new(rate_key, hotel_id, supplier_type)
+      rooms = parsed["HotelRoomAvailabilityResponse"]["HotelRoomResponse"].map do |raw_data|
+        room_data = {}
+        room_data[:rate_code] = raw_data["rateCode"]
+        room_data[:room_type_code] = raw_data["roomTypeCode"]
+        room_data[:room_type_description] = raw_data["roomTypeDescription"]
+        room_data[:promo] = raw_data["RateInfo"]["@promo"].to_b
+        room_data[:price_breakdown] = raw_data["RateInfo"]["ChargeableRateInfo"]["NightlyRatesPerRoom"]["NightlyRate"].map { |raw| NightlyRate.new(raw) }
+        room_data[:total_price] = raw_data["RateInfo"]["ChargeableRateInfo"]["@total"]
+        room_data[:nightly_rate_total] = raw_data["RateInfo"]["ChargeableRateInfo"]["@nightlyRateTotal"]
+        room_data[:average_nightly_rate] = raw_data["RateInfo"]["ChargeableRateInfo"]["@averageRate"]
+        Room.new(room_data)
+      end
+      RoomGroup.new(rate_key, hotel_id, supplier_type, rooms)
     end
 
     def payment_options

data/lib/suitcase/hotel/image.rb

@@ -0,0 +1,19 @@
+module Suitcase
+  class Image
+    attr_accessor :id, :url, :caption, :width, :height, :thumbnail_url, :name
+
+    def initialize(data)
+      @id = data["hotelImageId"]
+      @name = data["name"]
+      @caption = data["caption"]
+      @url = data["url"]
+      @thumbnail_url = data["thumbnailURL"]
+      @width = data["width"]
+      @height = data["height"]
+    end
+
+    def size
+      width.to_s + "x" + height.to_s
+    end
+  end
+end

data/lib/suitcase/hotel/nightly_rate.rb

@@ -0,0 +1,11 @@
+module Suitcase
+  class NightlyRate
+    attr_accessor :promo, :rate, :base_rate
+
+    def initialize(info)
+      promo = info["@promo"]
+      promo = info["@rate"]
+      promo = info["@baseRate"]
+    end
+  end
+end

data/lib/suitcase/hotel/room.rb

@@ -1,11 +1,12 @@
 module Suitcase
-  class Room
-    attr_accessor :rate_key, :hotel_id, :supplier_type
+  class RoomGroup
+    attr_accessor :rate_key, :hotel_id, :supplier_type, :rooms
 
-    def initialize(rate_key, hotel_id, supplier_type)
+    def initialize(rate_key, hotel_id, supplier_type, rooms)
       @rate_key = rate_key
       @hotel_id = hotel_id
       @supplier_type = supplier_type
+      @rooms = rooms
     end
 
     def reserve!(info)
@@ -23,4 +24,14 @@ module Suitcase
       p Hotel.shove(Hotel.url(:res, true, true, {}, :post, true), params)
     end
   end
+
+  class Room
+    attr_accessor :rate_code, :room_type_code, :supplier_type, :tax_rate, :non_refundable, :occupancy, :quoted_occupancy, :min_guest_age, :total, :surcharge_total, :nightly_rate_total, :average_base_rate, :average_rate, :max_nightly_rate, :currency_code, :value_adds, :room_type_description, :price_breakdown, :total_price, :average_nightly_rate, :promo
+
+    def initialize(info)
+      info.each do |k, v|
+        instance_variable_set("@" + k.to_s, v)
+      end
+    end
+  end
 end

data/lib/suitcase/version.rb

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

data/spec/api_key.rb

@@ -1 +1 @@
-HOTEL_API_KEY = "88m3ugkarmfzcq3z4syayymt"
+Suitcase::Hotel::API_KEY = "t3d74e8t58k2nh55gyph3cje"

data/spec/helpers_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Suitcase::Helpers do
+  before :each do
+    class Dummy; extend Suitcase::Helpers; end
+  end
+
+  it "#url should return a URI with the correct base URL" do
+    returned = Dummy.url(:action, {})
+    returned.should be_a(URI)
+    returned.host.should match(/api.ean.com/)
+  end
+
+  it "#parse_response should raise an exception when passed an invalid URI" do
+    lambda do
+      Dummy.parse_response(URI.parse "http://google.com")
+    end.should raise_error
+  end
+end

data/spec/hotels_spec.rb

@@ -1,7 +1,55 @@
 require 'spec_helper'
 
 describe Suitcase::Hotel do
-  it "::find should return an Array if no ID is passed" do
-    Suitcase::Hotel.find(destination: "Boston, US").should be_a(Array)
+  it "::find should locate a single Hotel if an id argument is passed" do
+    @hotel.should be_a(Suitcase::Hotel)
+  end
+
+  it "::find should locate an Array of Hotels if an id argument is not passed" do
+    hotels = Suitcase::Hotel.find(location: "London, UK")
+    hotels.should be_an(Array)
+    hotels.first.should be_a(Suitcase::Hotel)
+  end
+
+  before :all do
+    @hotel = Suitcase::Hotel.find(id: 123904)
+  end
+
+  subject { @hotel }
+
+  it { should respond_to :id }
+  it { should respond_to :name }
+  it { should respond_to :address }
+  it { should respond_to :city }
+  it { should respond_to :min_rate }
+  it { should respond_to :max_rate }
+  it { should respond_to :amenities }
+  it { should respond_to :country_code }
+  it { should respond_to :high_rate }
+  it { should respond_to :low_rate }
+  it { should respond_to :longitude }
+  it { should respond_to :latitude }
+  it { should respond_to :rating }
+  it { should respond_to :postal_code }
+  it { should respond_to :images }
+
+  it "#images should return an Array of Suitcase::Image's" do
+    images = @hotel.images
+    images.should be_an(Array)
+    lambda do
+      images.map { |image| URI.parse image.url }
+    end.should_not raise_error
+  end
+
+  describe "#rooms" do
+    before :all do
+      @info = { arrival: "6/23/2012", departure: "6/30/2012" }
+    end
+
+    subject do
+      @hotel.rooms(@info)
+    end
+
+    it { should be_an(Suitcase::RoomGroup) }
   end
 end

data/spec/images_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Suitcase::Image do
+  before :all do
+    @image = Suitcase::Hotel.find(id: 123904).images.first
+  end
+
+  subject { @image }
+
+  it { should respond_to :url }
+  it { should respond_to :id }
+  it { should respond_to :caption }
+  it { should respond_to :height }
+  it { should respond_to :width }
+  it { should respond_to :thumbnail_url }
+  it { should respond_to :name } 
+
+  it "#url should return a valid URL" do
+    lambda do
+      URI.parse @image.url
+    end.should_not raise_error
+  end
+end

data/spec/rooms_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Suitcase::Room do
+  before :all do
+    @room = Suitcase::Hotel.find(id: 123904).rooms(arrival: "6/23/2012", departure: "6/30/2012")
+  end
+
+  subject { @room }
+  it { should respond_to :reserve! }
+  it "#reserve! should take a Hash of options" do
+    
+  end
+end
+
+describe Suitcase::RoomGroup do
+  before :all do
+    @room_group = Suitcase::Hotel.find(id: 123904).rooms(arrival: "6/23/2012", departure: "6/30/2012")
+  end
+
+  subject { @room_group }
+
+  it { should respond_to :rooms }
+  it "#rooms should return an Array" do
+    @room_group.rooms.should be_an(Array)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suitcase
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000 Z
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13140540 !ruby/object:Gem::Requirement
+  requirement: &20405620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13140540
+  version_requirements: *20405620
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &13140060 !ruby/object:Gem::Requirement
+  requirement: &20419480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13140060
+  version_requirements: *20419480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13139260 !ruby/object:Gem::Requirement
+  requirement: &19989440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13139260
+  version_requirements: *19989440
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &13138520 !ruby/object:Gem::Requirement
+  requirement: &19987780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13138520
+  version_requirements: *19987780
 description: Suitcase utilizes the EAN (Expedia.com) API for locating info about hotels,
   rental cars, and flights.
 email:
@@ -64,6 +64,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
@@ -71,15 +72,20 @@ files:
 - features/step_definitions/hotels_steps.rb
 - lib/suitcase.rb
 - lib/suitcase/airport_codes.rb
+- lib/suitcase/core_ext/string.rb
 - lib/suitcase/country_codes.rb
 - lib/suitcase/helpers.rb
 - lib/suitcase/hotel/hotel.rb
+- lib/suitcase/hotel/image.rb
+- lib/suitcase/hotel/nightly_rate.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
+- spec/helpers_spec.rb
 - spec/hotels_spec.rb
+- spec/images_spec.rb
+- spec/rooms_spec.rb
 - spec/spec_helper.rb
 - suitcase.gemspec
 homepage: http://github.com/thoughtfusion/suitcase
@@ -96,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3208530258623277301
+      hash: 3790949770335453178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,10 +111,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3208530258623277301
+      hash: 3790949770335453178
 requirements: []
 rubyforge_project: suitcase
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Locates available hotels, rental cars, and flights
@@ -116,6 +122,8 @@ test_files:
 - features/hotels.feature
 - features/step_definitions/hotels_steps.rb
 - spec/api_key.rb
-- spec/data_helpers_spec.rb
+- spec/helpers_spec.rb
 - spec/hotels_spec.rb
+- spec/images_spec.rb
+- spec/rooms_spec.rb
 - spec/spec_helper.rb

data/spec/data_helpers_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe Suitcase::DataHelpers do
-  before :each do
-    class Hotel
-      API_KEY = HOTEL_API_KEY
-      extend Suitcase::DataHelpers
-    end
-  end
-
-  it "#url should return a valid url" do
-    URI.parse(Hotel.url(:hotel, :list, true, { location: "London, UK" })).should be_a(URI)
-  end
-end