suitcase 1.6.3 → 1.6.5

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+Changelog
+=========
+
+1.6.3
+-----
+* Use chronic for proper reservation dates in the test suite.
+* Allow access to the raw response on all Hotel and Room objects with the `raw` attribute.

data/lib/suitcase/hotel/bed_type.rb

@@ -0,0 +1,21 @@
+module Suitcase
+  class Hotel
+    # Public: A BedType represents a bed configuration for a Room.
+    class BedType
+      # Internal: The ID of the BedType.
+      attr_accessor :id
+
+      # Internal: The description of the BedType.
+      attr_accessor :description
+
+      # Internal: Create a new BedType.
+      #
+      # info  - A Hash from the parsed API response with the following keys:
+      #         :id           - The ID of the BedType.
+      #         :description  3- The description of the BedType.
+      def initialize(info)
+        @id, @description = info[:id], info[:description]
+      end
+    end
+  end
+end

data/lib/suitcase/hotel/ean_exception.rb

@@ -0,0 +1,35 @@
+module Suitcase
+  class Hotel
+    # Public: An Exception to be raised from all EAN API-related errors.
+    class EANException < Exception
+      # Internal: Setter for the recovery information.
+      attr_writer :recovery
+
+      # Public: Getter for the recovery information.
+      attr_reader :recovery
+
+      # Internal: Setter for the error type.
+      attr_writer :type
+
+      # Public: Getter for the error type..
+      attr_reader :type
+
+      # Internal: Create a new EAN exception.
+      #
+      # message - The String error message returned by the API.
+      # type    - The Symbol type of the error.
+      def initialize(message, type = nil)
+        @type = type
+        super(message)
+      end
+
+      # Public: Check if the error is recoverable. If it is, recovery information
+      #         is in the attribute recovery.
+      #
+      # Returns a Boolean based on whether the error is recoverable.
+      def recoverable?
+        @recovery.is_a?(Hash)
+      end
+    end
+  end
+end

data/lib/suitcase/hotel/room.rb

@@ -9,7 +9,7 @@ module Suitcase
                     :room_type_description, :price_breakdown, :total_price,
                     :average_nightly_rate, :promo, :arrival, :departure, :rooms,
                     :bed_types, :cancellation_policy, :non_refundable,
-                    :deposit_required, :raw
+                    :deposit_required, :surcharges, :raw
 
       extend Helpers
 

data/lib/suitcase/hotel/surcharge.rb

@@ -0,0 +1,22 @@
+module Suitcase
+  class Hotel
+    # Public: A Surcharge represents a single surcharge on a Room.
+    class Surcharge
+      # Internal: Create a new Surcharge.
+      #
+      # info - A Hash of parsed info from Surcharge.parse.
+      def initialize(info)
+        @amount, @type = info[:amount], info[:type]
+      end
+
+      # Internal: Parse a Surcharge from the room response.
+      #
+      # info - A Hash of the parsed JSON relevant to the surhcarge.
+      #
+      # Returns a Surcharge representing the info.
+      def self.parse(info)
+        new(amount: info["@amount"], type: info["@type"])
+      end
+    end
+  end
+end

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

@@ -1,54 +1,18 @@
-module Suitcase
-  # Public: An Exception to be raised from all EAN API-related errors.
-  class EANException < Exception
-    # Internal: Setter for the recovery information.
-    attr_writer :recovery
-
-    # Public: Getter for the recovery information.
-    attr_reader :recovery
-
-    # Internal: Setter for the error type.
-    attr_writer :type
-
-    # Public: Getter for the error type..
-    attr_reader :type
-
-    # Internal: Create a new EAN exception.
-    #
-    # message - The String error message returned by the API.
-    # type    - The Symbol type of the error.
-    def initialize(message, type = nil)
-      @type = type
-      super(message)
-    end
-
-    # Public: Check if the error is recoverable. If it is, recovery information
-    #         is in the attribute recovery.
-    #
-    # Returns a Boolean based on whether the error is recoverable.
-    def recoverable?
-      @recovery.is_a?(Hash)
-    end
-  end
-
-  # Public: A BedType represents a bed configuration for a Room.
-  class BedType
-    # Internal: The ID of the BedType.
-    attr_accessor :id
-
-    # Internal: The description of the BedType.
-    attr_accessor :description
-
-    # Internal: Create a new BedType.
-    #
-    # info  - A Hash from the parsed API response with the following keys:
-    #         :id           - The ID of the BedType.
-    #         :description  3- The description of the BedType.
-    def initialize(info)
-      @id, @description = info[:id], info[:description]
-    end
-  end
+require "suitcase/hotel/amenity"
+require "suitcase/hotel/session"
+require "suitcase/hotel/bed_type"
+require "suitcase/hotel/cache"
+require "suitcase/hotel/ean_exception"
+require "suitcase/hotel/helpers"
+require "suitcase/hotel/image"
+require "suitcase/hotel/location"
+require "suitcase/hotel/nightly_rate"
+require "suitcase/hotel/payment_option"
+require "suitcase/hotel/reservation"
+require "suitcase/hotel/room"
+require "suitcase/hotel/surcharge"
 
+module Suitcase
   # Public: A Class representing a single Hotel. It provides methods for
   #         all Hotel EAN-related queries in the gem.
   class Hotel
@@ -385,7 +349,10 @@ module Suitcase
         room_data[:hotel_id] = hotel_id
         room_data[:supplier_type] = supplier_type
         room_data[:rooms] = params[:rooms]
-        binding.pry
+        room_data[:surcharges] = raw_data["RateInfo"]["ChargeableRateInfo"] &&
+          raw_data["RateInfo"]["ChargeableRateInfo"]["Surcharges"] &&
+          [raw_data["RateInfo"]["ChargeableRateInfo"]["Surcharges"]["Surcharge"]].
+          flatten.map { |s| Surcharge.parse(s) }
         room_data[:bed_types] = [raw_data["BedTypes"]["BedType"]].flatten.map do |x|
           BedType.new(id: x["@id"], description: x["description"])
         end if raw_data["BedTypes"] && raw_data["BedTypes"]["BedType"]

data/lib/suitcase/version.rb

@@ -1,3 +1,3 @@
 module Suitcase
-  VERSION = "1.6.3"
+  VERSION = "1.6.5"
 end

data/lib/suitcase.rb

@@ -11,16 +11,6 @@ require "suitcase/core_ext/string"
 
 require "suitcase/configuration"
 
-require "suitcase/hotel/session"
-require "suitcase/hotel/helpers"
-require "suitcase/hotel/cache"
-require "suitcase/hotel/location"
-require "suitcase/hotel/amenity"
-require "suitcase/hotel/reservation"
-require "suitcase/hotel/nightly_rate"
-require "suitcase/hotel/room"
-require "suitcase/hotel/payment_option"
-require "suitcase/hotel/hotel"
-require "suitcase/hotel/image"
+require "suitcase/hotel"
 
 require "suitcase/car_rental"

data/test/hotels/caching_test.rb

@@ -13,7 +13,7 @@ describe Suitcase do
     Suitcase::Hotel.find(location: "Boston, US")
     
     # Query 3
-    room = hotel.rooms(arrival: "6/23/2012", departure: "6/30/2012").first
+    room = hotel.rooms(arrival: Keys::RESERVATION_START_TIME, departure: Keys::RESERVATION_END_TIME).first
     
     # Query 4
     Suitcase::Hotel::PaymentOption.find currency_code: "USD"
@@ -29,14 +29,14 @@ describe Suitcase do
   it "retrieves from the cache if it's there" do
     hotel = Suitcase::Hotel.find(id: 123904)
     Suitcase::Hotel.find(location: "Boston, US")
-    hotel.rooms(arrival: "6/23/2012", departure: "6/30/2012")
+    hotel.rooms(arrival: Keys::RESERVATION_START_TIME, departure: Keys::RESERVATION_END_TIME)
     Suitcase::Hotel::PaymentOption.find currency_code: "USD"
     
     # Disable API access
     Net::HTTP.expects(:get_response).never
     hotel = Suitcase::Hotel.find(id: 123904)
     Suitcase::Hotel.find(location: "Boston, US")
-    hotel.rooms(arrival: "6/23/2012", departure: "6/30/2012")
+    hotel.rooms(arrival: Keys::RESERVATION_START_TIME, departure: Keys::RESERVATION_END_TIME)
     Suitcase::Hotel::PaymentOption.find currency_code: "USD"
   end
 end

data/test/hotels/ean_exception_test.rb

@@ -1,8 +1,8 @@
 require "minitest_helper"
 
-describe Suitcase::EANException do
+describe Suitcase::Hotel::EANException do
   before :each do
-    @exception = Suitcase::EANException.new(nil)
+    @exception = Suitcase::Hotel::EANException.new(nil)
   end
 
   it "has an accessor recovery" do

data/test/hotels/helpers_test.rb

@@ -35,7 +35,7 @@ describe Suitcase::Hotel::Helpers do
         response = FakeResponse.new(code: 403, body: "<h1>An error occurred.</h1>")
         Net::HTTP.stubs(:get_response).returns(response)
         Dummy.parse_response(URI.parse("http://fake.response.will.be.used"))
-      end.must_raise Suitcase::EANException
+      end.must_raise Suitcase::Hotel::EANException
     end
   end
 

data/test/hotels/hotel_test.rb

@@ -47,7 +47,7 @@ describe Suitcase::Hotel do
     it "sets a recovery attribute on the raised error when the location is not specific enough" do
       begin
         Suitcase::Hotel.find(location: "Mexico")
-      rescue Suitcase::EANException => e
+      rescue Suitcase::Hotel::EANException => e
         e.recoverable?.must_equal(true) if e.type == :multiple_locations
       end
     end
@@ -55,7 +55,7 @@ describe Suitcase::Hotel do
     it "sets the error type when the location is not specific enough" do
       begin
         Suitcase::Hotel.find(location: "Mexico")
-      rescue Suitcase::EANException => e
+      rescue Suitcase::Hotel::EANException => e
         e.type.must_equal(:multiple_locations)
         e.recovery.must_be_kind_of(Hash)
         e.recovery[:alternate_locations].must_be_kind_of(Array)
@@ -107,7 +107,6 @@ describe Suitcase::Hotel do
       @rooms.each do |r|
         r.deposit_required.wont_be_nil
       end
-      binding.pry
     end
   end
 end

data/test/hotels/room_test.rb

@@ -2,7 +2,7 @@ require "minitest_helper"
 
 describe Suitcase::Hotel::Room do
   before :each do
-    @room = Suitcase::Hotel.find(id: 123904).rooms(arrival: "6/23/2012", departure: "6/30/2012").first
+    @room = Suitcase::Hotel.find(id: 123904).rooms(arrival: Keys::RESERVATION_START_TIME, departure: Keys::RESERVATION_END_TIME).first
   end
 
   %w(arrival departure rate_code room_type_code supplier_type tax_rate
@@ -19,7 +19,7 @@ describe Suitcase::Hotel::Room do
 
   describe "#reserve!" do
     before :each do
-      @info = { email: "walter.john.nelson@gmail.com",
+      @info = { email: Keys::SENDING_EMAIL,
                 first_name: "Walter",
                 last_name: "Nelson",
                 home_phone: "3831039402",

data/test/keys.rb

@@ -23,6 +23,8 @@ module Keys
   CREDIT_CARD_CVV_TESTING = "123"
   CREDIT_CARD_EXPIRATION_DATE_TESTING = "2014/03/01"
 
+  SENDING_EMAIL = "testemail@gmail.com"
+
   VALID_RESERVATION_INFO = {
     email: "testemail@gmail.com",
     first_name: "Test Booking",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suitcase
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -148,6 +148,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -159,10 +160,12 @@ files:
 - lib/suitcase/codes.rb
 - lib/suitcase/configuration.rb
 - lib/suitcase/core_ext/string.rb
+- lib/suitcase/hotel.rb
 - lib/suitcase/hotel/amenity.rb
+- lib/suitcase/hotel/bed_type.rb
 - lib/suitcase/hotel/cache.rb
+- lib/suitcase/hotel/ean_exception.rb
 - lib/suitcase/hotel/helpers.rb
-- lib/suitcase/hotel/hotel.rb
 - lib/suitcase/hotel/image.rb
 - lib/suitcase/hotel/location.rb
 - lib/suitcase/hotel/nightly_rate.rb
@@ -170,6 +173,7 @@ files:
 - lib/suitcase/hotel/reservation.rb
 - lib/suitcase/hotel/room.rb
 - lib/suitcase/hotel/session.rb
+- lib/suitcase/hotel/surcharge.rb
 - lib/suitcase/version.rb
 - suitcase.gemspec
 - test/car_rentals/car_rental_test.rb