hotel_beds 0.3.2 → 0.4.0

data/lib/hotel_beds/version.rb

@@ -1,3 +1,3 @@
 module HotelBeds
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/features/flushing_the_basket_spec.rb

@@ -0,0 +1,63 @@
+require "hotel_beds"
+require "securerandom"
+
+RSpec.describe "ordering a hotel room" 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_operation = @client.perform_hotel_search({
+        check_in_date: @check_in_date,
+        check_out_date: @check_out_date,
+        rooms: [{ adult_count: 2 }],
+        destination_code: "SYD"
+      })
+      if @search_operation.errors.any?
+        raise StandardError, @search_operation.errors.full_messages.join("\n")
+      end
+      @search_response = @search_operation.response
+
+      hotel = @search_response.hotels.first
+      rooms = hotel.available_rooms.first
+
+      @basket_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.code,
+          destination_code: hotel.destination.code,
+          contract_name: hotel.contract.name,
+          contract_incoming_office_code: hotel.contract.incoming_office_code,
+          rooms: rooms
+        }
+      })
+      if @basket_operation.errors.any?
+        raise StandardError, @basket_operation.errors.full_messages.join("\n")
+      end
+      @basket_response = @basket_operation.response
+
+      @flush_operation = @client.flush_purchase({
+        purchase_token: @basket_response.purchase.token
+      })
+      if @flush_operation.errors.any?
+        raise StandardError, @flush_operation.errors.full_messages.join("\n")
+      end
+      @flush_operation = @flush_operation.response
+    end
+
+    let(:response) { @flush_operation }
+
+    subject { response }
+
+    it "should be a success" do
+      expect(subject).to be_success
+    end
+  end
+end

data/spec/features/ordering_a_hotel_room_spec.rb

@@ -0,0 +1,96 @@
+require "hotel_beds"
+require "securerandom"
+
+RSpec.describe "ordering a hotel room" 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_operation = @client.perform_hotel_search({
+        check_in_date: @check_in_date,
+        check_out_date: @check_out_date,
+        rooms: [{ adult_count: 2 }],
+        destination_code: "SYD"
+      })
+      if @search_operation.errors.any?
+        raise StandardError, @search_operation.errors.full_messages.join("\n")
+      end
+      @search_response = @search_operation.response
+
+      hotel = @search_response.hotels.first
+      rooms = hotel.available_rooms.first
+
+      @basket_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.code,
+          destination_code: hotel.destination.code,
+          contract_name: hotel.contract.name,
+          contract_incoming_office_code: hotel.contract.incoming_office_code,
+          rooms: rooms
+        }
+      })
+      if @basket_operation.errors.any?
+        raise StandardError, @basket_operation.errors.full_messages.join("\n")
+      end
+      @basket_response = @basket_operation.response
+
+      @agency_reference = SecureRandom.hex[0..15].upcase
+      @checkout_operation = @client.confirm_purchase({
+        purchase: {
+          agency_reference: @agency_reference,
+          token: @basket_response.purchase.token,
+          holder: {
+            id: "1",
+            type: :adult,
+            name: "David",
+            last_name: "Smith",
+            age: "43"
+          },
+          services: @basket_response.purchase.services.map { |service|
+            {
+              id: service.id,
+              type: service.type,
+              customers: [
+                { id: "1", type: :adult, name: "David", last_name: "Smith", age: "43" },
+                { id: "2", type: :adult, name: "Jane", last_name: "Smith", age: "40" }
+              ]
+            }
+          }
+        }
+      })
+      if @checkout_operation.errors.any?
+        raise StandardError, @checkout_operation.errors.full_messages.join("\n")
+      end
+      @checkout_response = @checkout_operation.response
+    end
+
+    let(:response) { @checkout_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
+
+      it "should have a agency reference" do
+        expect(subject.agency_reference).to eq(@agency_reference)
+      end
+    end
+  end
+end

data/spec/features/removing_a_basket_item_spec.rb

@@ -0,0 +1,74 @@
+require "hotel_beds"
+require "securerandom"
+
+RSpec.describe "ordering a hotel room" 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_operation = @client.perform_hotel_search({
+        check_in_date: @check_in_date,
+        check_out_date: @check_out_date,
+        rooms: [{ adult_count: 2 }],
+        destination_code: "SYD"
+      })
+      if @search_operation.errors.any?
+        raise StandardError, @search_operation.errors.full_messages.join("\n")
+      end
+      @search_response = @search_operation.response
+
+      hotel = @search_response.hotels.first
+      rooms = hotel.available_rooms.first
+
+      @basket_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.code,
+          destination_code: hotel.destination.code,
+          contract_name: hotel.contract.name,
+          contract_incoming_office_code: hotel.contract.incoming_office_code,
+          rooms: rooms
+        }
+      })
+      if @basket_operation.errors.any?
+        raise StandardError, @basket_operation.errors.full_messages.join("\n")
+      end
+      @basket_response = @basket_operation.response
+
+      @service_id = @basket_response.purchase.services.first.id
+      @remove_operation = @client.remove_service_from_basket({
+        purchase_token: @basket_response.purchase.token,
+        service_id: @service_id
+      })
+      if @remove_operation.errors.any?
+        raise StandardError, @remove_operation.errors.full_messages.join("\n")
+      end
+      @remove_operation = @remove_operation.response
+    end
+
+    let(:response) { @remove_operation }
+    let(:service_id) { @service_id }
+
+    subject { response }
+
+    it "should be a success" do
+      expect(subject).to be_success
+    end
+
+    describe "#purchase" do
+      subject { response.purchase }
+
+      it "should not have the service that was removed" do
+        expect(subject.services.map(&:id)).to_not include(service_id)
+      end
+    end
+  end
+end

data/spec/lib/hotel_beds/hotel_search/request_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe HotelBeds::HotelSearch::Request do
       language: "FRA",
       check_in_date: Date.today,
       check_out_date: Date.today + 2,
-      destination: "SYD",
+      destination_code: "SYD",
       rooms: [{
         adult_count: 2,
         child_count: 1,
@@ -19,15 +19,15 @@ RSpec.describe HotelBeds::HotelSearch::Request do
 
   describe "a valid instance" do
     subject { described_class.new(valid_attributes) }
-    
+
     it "should be valid" do
       expect(subject).to be_valid
     end
   end
-  
+
   describe "an instance missing rooms" do
     subject { described_class.new(valid_attributes.merge(rooms: [])) }
-    
+
     it "should not be valid" do
       expect(subject).to_not be_valid
     end

data/spec/lib/hotel_beds/{hotel_search/parser → parser}/room_grouper_spec.rb

@@ -1,8 +1,8 @@
-require "hotel_beds/hotel_search/parser/room_grouper"
+require "hotel_beds/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 }
+RSpec.describe HotelBeds::Parser::RoomGrouper do
+  subject { described_class.new(requested_rooms, response_rooms).groups }
 
   context "when asking for 3 rooms (2 x 2 adults & 1 x 1 adult, 1 child)" do
     let(:requested_rooms) do

data/spec/lib/hotel_beds/parser/service_spec.rb

@@ -0,0 +1,44 @@
+require "nokogiri"
+require "ostruct"
+require "hotel_beds/parser/service"
+
+RSpec.describe HotelBeds::Parser::Service do
+  let(:source) do
+    %Q(<HotelService SPUI="#{attrs[:id]}">
+      <Contract>
+        <Name>#{attrs[:contract_name]}</Name>
+        <IncomingOffice code="#{attrs[:contract_incoming_office_code]}" />
+      </Contract>
+
+      <DateFrom date="#{attrs[:check_in_date]}" />
+      <DateTo date="#{attrs[:check_out_date]}" />
+      <Currency code="#{attrs[:currency]}">Great British Pounds</Currency>
+      <TotalAmount>#{attrs[:amount]}</TotalAmount>
+    </HotelService>)
+  end
+
+  let(:attrs) do
+    {
+      id: "123",
+      contract_name: "Test",
+      contract_incoming_office_code: "Big Corp",
+      check_in_date: "20140505",
+      check_out_date: "20140506",
+      currency: "GBP",
+      amount: "123.45"
+    }
+  end
+
+  let(:parser) do
+    described_class.new(Nokogiri::XML(source).at_css("HotelService"))
+  end
+
+  describe "#to_model" do
+    subject { parser.to_model(model_class) }
+    let(:model_class) { OpenStruct }
+
+    it "should insert the data into the given class" do
+      expect(subject).to be_kind_of(model_class)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotel_beds
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan Townsend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -171,6 +171,10 @@ files:
 - Rakefile
 - hotel_beds.gemspec
 - lib/hotel_beds.rb
+- lib/hotel_beds/basket_remove/envelope.rb
+- lib/hotel_beds/basket_remove/operation.rb
+- lib/hotel_beds/basket_remove/request.rb
+- lib/hotel_beds/basket_remove/response.rb
 - lib/hotel_beds/client.rb
 - lib/hotel_beds/configuration.rb
 - lib/hotel_beds/connection.rb
@@ -180,31 +184,53 @@ files:
 - 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/model.rb
 - lib/hotel_beds/model/available_room.rb
 - lib/hotel_beds/model/cancellation_policy.rb
+- lib/hotel_beds/model/comment.rb
+- lib/hotel_beds/model/contract.rb
+- lib/hotel_beds/model/customer.rb
+- lib/hotel_beds/model/destination.rb
 - lib/hotel_beds/model/hotel.rb
+- lib/hotel_beds/model/price.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/parser.rb
+- lib/hotel_beds/parser/available_room.rb
+- lib/hotel_beds/parser/cancellation_policy.rb
+- lib/hotel_beds/parser/comment.rb
+- lib/hotel_beds/parser/contract.rb
+- lib/hotel_beds/parser/customer.rb
+- lib/hotel_beds/parser/destination.rb
+- lib/hotel_beds/parser/errors.rb
+- lib/hotel_beds/parser/hotel.rb
+- lib/hotel_beds/parser/price.rb
+- lib/hotel_beds/parser/purchase.rb
+- lib/hotel_beds/parser/room_grouper.rb
+- lib/hotel_beds/parser/service.rb
+- lib/hotel_beds/purchase_confirm/envelope.rb
+- lib/hotel_beds/purchase_confirm/operation.rb
+- lib/hotel_beds/purchase_confirm/request.rb
+- lib/hotel_beds/purchase_confirm/response.rb
+- lib/hotel_beds/purchase_flush/envelope.rb
+- lib/hotel_beds/purchase_flush/operation.rb
+- lib/hotel_beds/purchase_flush/request.rb
+- lib/hotel_beds/purchase_flush/response.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/features/flushing_the_basket_spec.rb
+- spec/features/ordering_a_hotel_room_spec.rb
+- spec/features/removing_a_basket_item_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/parser/room_grouper_spec.rb
+- spec/lib/hotel_beds/parser/service_spec.rb
 - spec/lib/hotel_beds/version_spec.rb
 - spec/spec_helper.rb
 homepage: https://www.hotelsindex.com/open-source
@@ -232,13 +258,14 @@ 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/features/flushing_the_basket_spec.rb
+- spec/features/ordering_a_hotel_room_spec.rb
+- spec/features/removing_a_basket_item_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/parser/room_grouper_spec.rb
+- spec/lib/hotel_beds/parser/service_spec.rb
 - spec/lib/hotel_beds/version_spec.rb
 - spec/spec_helper.rb

data/lib/hotel_beds/hotel_search/parser/errors.rb

@@ -1,49 +0,0 @@
-require "active_model/errors"
-
-module HotelBeds
-  module HotelSearch
-    module Parser
-      class Errors
-        def self.call(*args, &block)
-          new(*args, &block).call
-        end
-
-        attr_accessor :response, :body
-        private :response, :body
-
-        def initialize(response, body)
-          self.response = response
-          self.body = body
-          freeze
-        end
-
-        def call
-          ActiveModel::Errors.new(self).tap do |errors|
-            apply_response_errors(errors)
-            apply_body_errors(errors)
-          end.freeze
-        end
-
-        private
-        def apply_response_errors(errors)
-          if response.http_error?
-            errors.add(:base, "HTTP error")
-          elsif response.soap_fault?
-            errors.add(:base, "SOAP error")
-          elsif !response.success?
-            errors.add(:base, "Request failed")
-          end
-        end
-
-        def apply_body_errors(errors)
-          body.css("ErrorList Error").each do |error|
-            errors.add(:base, [
-              (sm = error.at_css("Message")) && sm.content,
-              (dm = error.at_css("DetailedMessage")) && dm.content
-            ].compact.join("\n"))
-          end
-        end
-      end
-    end
-  end
-end