hotel_beds 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5048cf0a8d957dca8fe68b51795053d73fb6b710
-  data.tar.gz: 2179c960f5ac433275cea5f79b948555edbec331
+  metadata.gz: cf57f2506ec0688c5053d16cce8650d6482ad457
+  data.tar.gz: 2443235be43ea5872b2cc8592298bb7a680328e4
 SHA512:
-  metadata.gz: 8ee7a4b8ea7890aaf4bd1c0421c2170828ae72e04babd58f55d4ef7fb43e059c782da9968acba6481070be532368c0b850c28caaaf163923cb8e44a85b76259f
-  data.tar.gz: fb550b1d74573d78ef0a7a8fcf412deeafa6f58928e7fbb370415e446516df558d8ec88b8d291f408194345a46aff329e8ca98e09483ca04bfd98585526363b1
+  metadata.gz: 958490e3fb55593abbee5b656d880fa7b20ae91109922a9bb59c298b0c4951ac4c36cd17d7bd695d15dd125df04974704d54f1a36913fa8c775871812cb6bc2a
+  data.tar.gz: 1677a0f5131a6f20bb3c52338a58078dc76271c51e2ffca668a02dc9e3ec8facee3a8ba1f0908c16291e219062b3152854865d2e29cf925b3e55089810521cc8

data/lib/hotel_beds/model/{service.rb → hotel_service.rb}

@@ -1,16 +1,13 @@
-require "hotel_beds/model"
+require "hotel_beds/model/hotel"
 require "hotel_beds/model/contract"
 
 module HotelBeds
   module Model
-    class Service
-      include HotelBeds::Model
-
+    class HotelService < Hotel
       # attributes
       attribute :id, String
       attribute :type, String
       attribute :status, String
-      attribute :contract, HotelBeds::Model::Contract
       attribute :date_from, Date
       attribute :date_to, Date
       attribute :currency, String

data/lib/hotel_beds/model/purchase.rb

@@ -1,5 +1,5 @@
 require "hotel_beds/model"
-require "hotel_beds/model/service"
+require "hotel_beds/model/hotel_service"
 require "hotel_beds/model/customer"
 
 module HotelBeds
@@ -14,7 +14,7 @@ module HotelBeds
       attribute :status, String
       attribute :currency, String
       attribute :amount, BigDecimal
-      attribute :services, Array[HotelBeds::Model::Service]
+      attribute :services, Array[HotelBeds::Model::HotelService]
       attribute :holder, HotelBeds::Model::Customer
     end
   end

data/lib/hotel_beds/parser.rb

@@ -21,12 +21,13 @@ module HotelBeds
         end
 
         def retrieve(doc)
+          return nil if doc.nil?
           if custom
             custom.yield(doc)
           elsif multiple
             doc.css(selector).map(&method(:read_element))
           elsif selector
-            (element = doc.at_css(selector)) && read_element(element) or nil
+            (element = doc.at_css(selector)) && element && read_element(element) or nil
           else
             read_element(doc)
           end

data/lib/hotel_beds/parser/{service.rb → hotel_service.rb}

@@ -1,11 +1,9 @@
-require "hotel_beds/parser"
+require "hotel_beds/parser/hotel"
 require "hotel_beds/parser/contract"
 
 module HotelBeds
   module Parser
-    class Service
-      include HotelBeds::Parser
-
+    class HotelService < Hotel
       # attributes
       attribute :id, attr: "SPUI"
       attribute :type, attr: "xsi:type"
@@ -14,8 +12,6 @@ module HotelBeds
       attribute :date_to, selector: "DateTo", attr: "date"
       attribute :currency, selector: "Currency", attr: "code"
       attribute :amount, selector: "TotalAmount"
-      attribute :contract, selector: "Contract",
-        parser: HotelBeds::Parser::Contract
     end
   end
 end

data/lib/hotel_beds/parser/purchase.rb

@@ -1,5 +1,5 @@
 require "hotel_beds/parser"
-require "hotel_beds/parser/service"
+require "hotel_beds/parser/hotel_service"
 require "hotel_beds/parser/customer"
 
 module HotelBeds
@@ -16,7 +16,7 @@ module HotelBeds
       attribute :amount, selector: "TotalPrice"
       attribute :services,
         selector: "ServiceList > Service", multiple: true,
-        parser: HotelBeds::Parser::Service
+        parser: HotelBeds::Parser::HotelService
       attribute :holder, selector: "Holder",
         parser: HotelBeds::Parser::Customer
     end

data/lib/hotel_beds/version.rb

@@ -1,3 +1,3 @@
 module HotelBeds
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/lib/hotel_beds/parser/{service_spec.rb → hotel_service_spec.rb}

@@ -1,10 +1,10 @@
 require "nokogiri"
 require "ostruct"
-require "hotel_beds/parser/service"
+require "hotel_beds/parser/hotel_service"
 
-RSpec.describe HotelBeds::Parser::Service do
+RSpec.describe HotelBeds::Parser::HotelService do
   let(:source) do
-    %Q(<HotelService SPUI="#{attrs[:id]}">
+    %Q(<Service xsi:type="#{attrs[:type]}" SPUI="#{attrs[:id]}">
       <Contract>
         <Name>#{attrs[:contract_name]}</Name>
         <IncomingOffice code="#{attrs[:contract_incoming_office_code]}" />
@@ -14,12 +14,13 @@ RSpec.describe HotelBeds::Parser::Service do
       <DateTo date="#{attrs[:check_out_date]}" />
       <Currency code="#{attrs[:currency]}">Great British Pounds</Currency>
       <TotalAmount>#{attrs[:amount]}</TotalAmount>
-    </HotelService>)
+    </Service>)
   end
 
   let(:attrs) do
     {
       id: "123",
+      type: "ServiceHotel",
       contract_name: "Test",
       contract_incoming_office_code: "Big Corp",
       check_in_date: "20140505",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotel_beds
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryan Townsend
@@ -200,12 +200,12 @@ files:
 - lib/hotel_beds/model/customer.rb
 - lib/hotel_beds/model/destination.rb
 - lib/hotel_beds/model/hotel.rb
+- lib/hotel_beds/model/hotel_service.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
@@ -215,10 +215,10 @@ files:
 - lib/hotel_beds/parser/destination.rb
 - lib/hotel_beds/parser/errors.rb
 - lib/hotel_beds/parser/hotel.rb
+- lib/hotel_beds/parser/hotel_service.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
@@ -236,8 +236,8 @@ files:
 - spec/lib/hotel_beds/connection_spec.rb
 - spec/lib/hotel_beds/hotel_search/request_spec.rb
 - spec/lib/hotel_beds/model_spec.rb
+- spec/lib/hotel_beds/parser/hotel_service_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
@@ -273,7 +273,7 @@ test_files:
 - spec/lib/hotel_beds/connection_spec.rb
 - spec/lib/hotel_beds/hotel_search/request_spec.rb
 - spec/lib/hotel_beds/model_spec.rb
+- spec/lib/hotel_beds/parser/hotel_service_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