hotel_beds 0.2.1 → 0.3.0

data/lib/hotel_beds/model.rb

@@ -5,7 +5,6 @@ module HotelBeds
   module Model
     def self.included(base)
       base.class_eval do
-        include Comparable
         include Virtus.model
         include ActiveModel::Validations
       end

data/lib/hotel_beds/model/available_room.rb

@@ -1,24 +1,22 @@
-require "hotel_beds/model"
+require "hotel_beds/model/room"
+require "hotel_beds/model/cancellation_policy"
 
 module HotelBeds
   module Model
-    class AvailableRoom
-      include HotelBeds::Model
-
+    class AvailableRoom < Room
       # attributes
       attribute :id, Integer
-      attribute :adult_count, Integer
-      attribute :child_count, Integer
+      attribute :room_count, Integer
       attribute :description, String
       attribute :board, String
+      attribute :board_code, String
+      attribute :room_type_code, String
+      attribute :room_type_characteristic, String
       attribute :price, BigDecimal
       attribute :number_available, Integer
       attribute :rates, Hash[Date => BigDecimal]
-
-      # compare based on id
-      def <=>(other)
-        id == other.id && !id.nil?
-      end
+      attribute :cancellation_policies, Array[CancellationPolicy],
+        default: Array.new
     end
   end
 end

data/lib/hotel_beds/model/cancellation_policy.rb

@@ -0,0 +1,14 @@
+require "hotel_beds/model"
+
+module HotelBeds
+  module Model
+    class CancellationPolicy
+      include HotelBeds::Model
+
+      # attributes
+      attribute :amount, BigDecimal
+      attribute :from, Time
+      attribute :to, Date
+    end
+  end
+end

data/lib/hotel_beds/model/hotel.rb

@@ -8,12 +8,16 @@ module HotelBeds
 
       # attributes
       attribute :id, Integer
+      attribute :availability_token, String
       attribute :name, String
       attribute :images, Array[String]
       attribute :stars, Integer
       attribute :longitude, BigDecimal
       attribute :latitude, BigDecimal
       attribute :results, Array[SearchResult]
+      attribute :destination_code, String
+      attribute :contract_name, String
+      attribute :contract_incoming_office_code, String
     end
   end
 end

data/lib/hotel_beds/model/purchase.rb

@@ -0,0 +1,16 @@
+require "hotel_beds/model"
+require "hotel_beds/model/service"
+
+module HotelBeds
+  module Model
+    class Purchase
+      include HotelBeds::Model
+
+      # attributes
+      attribute :id, String
+      attribute :services, Array[Service]
+      attribute :currency, String
+      attribute :amount, BigDecimal
+    end
+  end
+end

data/lib/hotel_beds/model/requested_room.rb

@@ -0,0 +1,7 @@
+require "hotel_beds/model/room"
+
+module HotelBeds
+  module Model
+    class RequestedRoom < Room; end
+  end
+end

data/lib/hotel_beds/model/room.rb

@@ -0,0 +1,31 @@
+require "hotel_beds/model"
+require_relative "room"
+
+module HotelBeds
+  module Model
+    class Room
+      include HotelBeds::Model
+
+      # attributes
+      attribute :adult_count, Integer, default: 0
+      attribute :child_count, Integer, default: 0
+      attribute :child_ages, Array[Integer], default: Array.new
+
+      # validation
+      validates :adult_count, :child_count, numericality: {
+        greater_than_or_equal_to: 0,
+        less_than_or_equal_to: 4,
+        only_integer: true,
+      }
+      validate do |room|
+        unless child_ages.compact.size == child_count
+          room.errors.add(:child_ages, "must match quantity of children")
+        end
+      end
+
+      def group_key
+        { adult_count: adult_count, child_count: child_count }
+      end
+    end
+  end
+end

data/lib/hotel_beds/model/search_result.rb

@@ -10,11 +10,6 @@ module HotelBeds
       attribute :rooms, Array[AvailableRoom]
       attribute :currency, String
 
-      # results are purely based upon their combination of rooms
-      def <=>(other)
-        rooms.map(&:id).sort == other.rooms.map(&:id).sort
-      end
-
       # returns the total price of all the rooms collectively
       def price
         rooms.map(&:price).inject(BigDecimal.new("0.0"), :+)

data/lib/hotel_beds/model/service.rb

@@ -0,0 +1,18 @@
+require "hotel_beds/model"
+
+module HotelBeds
+  module Model
+    class Service
+      include HotelBeds::Model
+
+      # attributes
+      attribute :id, String
+      attribute :contract_name, String
+      attribute :contract_incoming_office_code, String
+      attribute :check_in_date, Date
+      attribute :check_out_date, Date
+      attribute :currency, String
+      attribute :amount, BigDecimal
+    end
+  end
+end

data/lib/hotel_beds/version.rb

@@ -1,3 +1,3 @@
 module HotelBeds
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/features/adding_a_hotel_to_basket_spec.rb

@@ -0,0 +1,58 @@
+require "hotel_beds"
+
+RSpec.describe "adding a hotel to the basket" do
+  describe "#response" do
+    before(:all) do
+      @client = HotelBeds::Client.new({
+        endpoint: :test,
+        username: ENV.fetch("HOTEL_BEDS_USERNAME"),
+        password: ENV.fetch("HOTEL_BEDS_PASSWORD"),
+        proxy: ENV.fetch("HOTEL_BEDS_PROXY", nil)
+      })
+      @check_in_date = Date.today + 28 + rand(10)
+      @check_out_date = @check_in_date + rand(3) + rand(2) + 1
+      @search_response = @client.perform_hotel_search({
+        check_in_date: @check_in_date,
+        check_out_date: @check_out_date,
+        rooms: [{ adult_count: 2 }],
+        destination: "SYD"
+      }).response
+
+      hotel = @search_response.hotels.first
+      result = hotel.results.first
+
+      @operation = @client.add_hotel_room_to_basket({
+        service: {
+          check_in_date: @check_in_date,
+          check_out_date: @check_out_date,
+          availability_token: hotel.availability_token,
+          hotel_code: hotel.id,
+          destination_code: hotel.destination_code,
+          contract_name: hotel.contract_name,
+          contract_incoming_office_code: hotel.contract_incoming_office_code,
+          rooms: result.rooms
+        }
+      })
+      if @operation.errors.any?
+        raise StandardError, @operation.errors.full_messages.join("\n")
+      end
+      @response = @operation.response
+    end
+
+    let(:response) { @response }
+
+    subject { response }
+
+    it "should be a success" do
+      expect(subject).to be_success
+    end
+
+    describe "#purchase" do
+      subject { response.purchase }
+
+      it "should have a service" do
+        expect(subject.services).to_not be_empty
+      end
+    end
+  end
+end

data/spec/features/hotel_search_spec.rb

@@ -40,19 +40,41 @@ RSpec.describe "performing a hotel search" do
         expect(subject.first).to be_kind_of(HotelBeds::Model::Hotel)
       end
 
-      it "should parse the rates correctly" do
-        room = subject.first.results.first.rooms.first
-        expect(room.price).to eq(room.rates.values.inject(:+))
+      it "should only have one room per result" do
+        room_counts = subject.map { |h| h.results.map { |r| r.rooms.size } }
+        expect(room_counts.to_a.flatten.uniq).to eq([1])
       end
 
-      it "should have the same number of rates as nights requested" do
-        room = subject.first.results.first.rooms.first
-        expect(room.rates.size).to eq(check_out_date - check_in_date)
+      it "should have an availability token" do
+        subject.each do |hotel|
+          expect(hotel.availability_token).to be_present
+        end
       end
 
-      it "should only have one room per result" do
-        room_counts = subject.map { |h| h.results.map { |r| r.rooms.size } }
-        expect(room_counts.to_a.flatten.uniq).to eq([1])
+      it "should have a contract name" do
+        subject.each do |hotel|
+          expect(hotel.contract_name).to be_present
+        end
+      end
+
+      it "should have a contract incoming office code" do
+        subject.each do |hotel|
+          expect(hotel.contract_incoming_office_code).to be_present
+        end
+      end
+
+      describe "#results" do
+        describe "#rooms" do
+          subject { response.hotels.first.results.first.rooms.first }
+
+          it "should parse the rates correctly" do
+            expect(subject.price).to eq(subject.rates.values.inject(:+))
+          end
+
+          it "should have the same number of rates as nights requested" do
+            expect(subject.rates.size).to eq(check_out_date - check_in_date)
+          end
+        end
       end
     end
 

data/spec/lib/hotel_beds/hotel_search/parser/room_grouper_spec.rb

@@ -0,0 +1,53 @@
+require "hotel_beds/hotel_search/parser/room_grouper"
+require "hotel_beds/model/available_room"
+
+RSpec.describe HotelBeds::HotelSearch::Parser::RoomGrouper do
+  subject { described_class.new(requested_rooms, response_rooms).results }
+
+  context "when asking for 3 rooms (2 x 2 adults & 1 x 1 adult, 1 child)" do
+    let(:requested_rooms) do
+      [
+        double(:requested_room, adult_count: 2, child_count: 0, child_ages: []),
+        double(:requested_room, adult_count: 2, child_count: 0, child_ages: []),
+        double(:requested_room, adult_count: 1, child_count: 1, child_ages: [rand(17)])
+      ]
+    end
+
+    let(:response_rooms) do
+      [
+        HotelBeds::Model::AvailableRoom.new(id: "room_1", adult_count: 2, child_count: 0, number_available: 1, room_count: 2),
+        HotelBeds::Model::AvailableRoom.new(id: "room_2", adult_count: 2, child_count: 0, number_available: 1, room_count: 2),
+        HotelBeds::Model::AvailableRoom.new(id: "room_3", adult_count: 1, child_count: 1, number_available: 2, room_count: 1),
+        HotelBeds::Model::AvailableRoom.new(id: "room_4", adult_count: 1, child_count: 1, number_available: 1, room_count: 1),
+        HotelBeds::Model::AvailableRoom.new(id: "room_5", adult_count: 2, child_count: 0, number_available: 2, room_count: 2)
+      ]
+    end
+
+    it "should return 6 results" do
+      expect(subject.size).to eq(6)
+    end
+
+    it "should return results containing all three rooms" do
+      subject.each do |rooms|
+        expect(rooms.size).to eq(3)
+      end
+    end
+  end
+
+  context "when asking for 1 rooms (1 adult, 1 child)" do
+    let(:requested_rooms) do
+      [double(:requested_room, adult_count: 1, child_count: 1, child_ages: [rand(17)])]
+    end
+
+    let(:response_rooms) do
+      [
+        HotelBeds::Model::AvailableRoom.new(id: "room_1", room_count: 1, adult_count: 1, child_count: 1, number_available: 2),
+        HotelBeds::Model::AvailableRoom.new(id: "room_2", room_count: 1, adult_count: 1, child_count: 1, number_available: 1)
+      ]
+    end
+
+    it "should return 2 results" do
+      expect(subject.size).to eq(2)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,3 +5,11 @@ if ENV["CODECLIMATE_REPO_TOKEN"]
   require "codeclimate-test-reporter"
   CodeClimate::TestReporter.start
 end
+
+RSpec.configure do |config|
+  config.disable_monkey_patching!
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_doubled_constant_names = true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotel_beds
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -174,23 +174,37 @@ files:
 - lib/hotel_beds/client.rb
 - lib/hotel_beds/configuration.rb
 - lib/hotel_beds/connection.rb
+- lib/hotel_beds/hotel_basket_add/envelope.rb
+- lib/hotel_beds/hotel_basket_add/operation.rb
+- lib/hotel_beds/hotel_basket_add/request.rb
+- lib/hotel_beds/hotel_basket_add/response.rb
 - lib/hotel_beds/hotel_search/envelope.rb
 - lib/hotel_beds/hotel_search/operation.rb
+- lib/hotel_beds/hotel_search/parser/errors.rb
+- lib/hotel_beds/hotel_search/parser/hotel.rb
+- lib/hotel_beds/hotel_search/parser/price.rb
+- lib/hotel_beds/hotel_search/parser/room.rb
+- lib/hotel_beds/hotel_search/parser/room_grouper.rb
 - lib/hotel_beds/hotel_search/request.rb
 - lib/hotel_beds/hotel_search/response.rb
-- lib/hotel_beds/hotel_search/room_grouper.rb
 - lib/hotel_beds/model.rb
 - lib/hotel_beds/model/available_room.rb
+- lib/hotel_beds/model/cancellation_policy.rb
 - lib/hotel_beds/model/hotel.rb
+- lib/hotel_beds/model/purchase.rb
+- lib/hotel_beds/model/requested_room.rb
+- lib/hotel_beds/model/room.rb
 - lib/hotel_beds/model/search_result.rb
+- lib/hotel_beds/model/service.rb
 - lib/hotel_beds/version.rb
+- spec/features/adding_a_hotel_to_basket_spec.rb
 - spec/features/grouped_hotel_search_spec.rb
 - spec/features/hotel_search_spec.rb
 - spec/lib/hotel_beds/client_spec.rb
 - spec/lib/hotel_beds/configuration_spec.rb
 - spec/lib/hotel_beds/connection_spec.rb
+- spec/lib/hotel_beds/hotel_search/parser/room_grouper_spec.rb
 - spec/lib/hotel_beds/hotel_search/request_spec.rb
-- spec/lib/hotel_beds/hotel_search/room_grouper_spec.rb
 - spec/lib/hotel_beds/version_spec.rb
 - spec/spec_helper.rb
 homepage: https://www.hotelsindex.com/open-source
@@ -218,12 +232,13 @@ signing_key:
 specification_version: 4
 summary: Interfaces with the HotelBeds SOAP API to book hotel rooms
 test_files:
+- spec/features/adding_a_hotel_to_basket_spec.rb
 - spec/features/grouped_hotel_search_spec.rb
 - spec/features/hotel_search_spec.rb
 - spec/lib/hotel_beds/client_spec.rb
 - spec/lib/hotel_beds/configuration_spec.rb
 - spec/lib/hotel_beds/connection_spec.rb
+- spec/lib/hotel_beds/hotel_search/parser/room_grouper_spec.rb
 - spec/lib/hotel_beds/hotel_search/request_spec.rb
-- spec/lib/hotel_beds/hotel_search/room_grouper_spec.rb
 - spec/lib/hotel_beds/version_spec.rb
 - spec/spec_helper.rb

data/lib/hotel_beds/hotel_search/room_grouper.rb

@@ -1,64 +0,0 @@
-require "hotel_beds/model/search_result"
-
-# see INTERNALS.md for comment symbols
-module HotelBeds
-  module HotelSearch
-    class RoomGrouper < Struct.new(:requested_rooms, :response_rooms)
-      def results
-        if requested_rooms.size == 1
-          response_rooms.map { |room| [room] }
-        else
-          combined_available_rooms
-        end
-      end
-
-      private
-      # returns an array of room combinations for all rooms
-      def combined_available_rooms
-        room_groups = combine_available_rooms_by_occupants.values
-        head, *rest = room_groups
-        head.product(*rest).map { |rooms| rooms.flatten.sort_by(&:id) }.uniq
-      end
-
-      # returns a hash of OK => RSRG
-      def combine_available_rooms_by_occupants
-        group_requested_room_count_by_occupants.to_a.inject(Hash.new) do |result, (key, count)|
-          result[key] = group_rooms_by_occupants.fetch(key).combination(count).to_a
-          result
-        end
-      rescue KeyError => e
-        Hash.new
-      end
-
-      # returns a hash of OK => RC
-      def group_requested_room_count_by_occupants
-        requested_rooms.inject(Hash.new) do |result, room|
-          key = occupant_key(room)
-          result[key] ||= 0
-          result[key] += 1
-          result
-        end
-      end
-
-      # returns a hash of OK => AR
-      def group_rooms_by_occupants
-        @frozen_rooms ||= response_rooms.inject(Hash.new) do |result, room|
-          key = occupant_key(room)
-          result[key] ||= Array.new
-          1.upto([room.number_available, 5].min) do |i|
-            result[key].push(room)
-          end
-          result
-        end.freeze
-      end
-
-      # returns an OK for a given room
-      def occupant_key(room)
-        {
-          adult_count: room.adult_count,
-          child_count: room.child_count
-        }
-      end
-    end
-  end
-end