gillbus 0.20.8 → 0.20.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8361c79694f78a6bf0e69712d72128d8ece89e53677eab24b5534b5662e096b
-  data.tar.gz: 4e0efe0e59ffd350698ded2cc7a6fbd70ec097703e6ff84f69a56ed0bfb0766f
+  metadata.gz: 161f8a17f94402b8ca20cd20a4db0c512f6dc127d8335c2ac2af83e55a3d515a
+  data.tar.gz: 572967b18f23751e5c0932e16943a838d4f0ef1630aae9f08a281d9a2b693f20
 SHA512:
-  metadata.gz: fb84cdcebde50aa95fc7a0d181c9e3ae93817921d0630e09a296b7995acc25cb3646f76801f8b81da31db792178bd21fbeb67695c1dd12b3cd4c79f075362879
-  data.tar.gz: 4e4b7b34efd3975617d71e788dc885b901ab1a320551364f818826169b5e552bae95d1fc125cda57ace11e8e55365cc1a3272f1b670da8ccb7aab4f42e6aa296
+  metadata.gz: bcba1738e7f4bb40644d0f9fe191367241910e7e69d3e330d6a831f24aa92c95b4e6c9993c34b0b43cd0f28b7abb2de679194d3bfba242e3773d5e6e163e7b3a
+  data.tar.gz: b0a62ce474a083e012e28c8ded9c2ade5d941a9f7e1b34277801cc54047d38e63158b0e2a3815c8a2148c387fd75e452cfbfd0e9de19f62f4ca20715f26a233a

data/lib/gillbus.rb

@@ -87,7 +87,7 @@ class Gillbus
   require 'gillbus/structs/item'
   require 'gillbus/structs/carrier'
   require 'gillbus/structs/nearby_cities_trip'
-  require 'gillbus/structs/baggage'
+  require 'gillbus/structs/luggage'
 
   require 'gillbus/parse_error'
   require 'gillbus/base_request'

data/lib/gillbus/get_required_fields.rb

@@ -16,7 +16,7 @@ class Gillbus
 
     class Response < BaseResponse
       field :dictionary, :bool_dict
-      field :baggage, Baggage
+      field :luggage, Luggage, key: 'BAGGAGE'
 
       parser do
         def bool_dict(val)

data/lib/gillbus/structs/luggage.rb

@@ -0,0 +1,19 @@
+class Gillbus
+  class Luggage
+    extend Fields
+
+    # => "0"
+    field :segment_number, :int
+
+    # => "true"
+    field :is_buy, :bool
+
+    # => "50.5"
+    field :luggage_tariff, :decimal, key: 'BAGGAGE_TARIFF'
+
+    # => "2"
+    field :luggage_limit, :int, key: 'BAGGAGE_LIMIT'
+
+    field :segments, [Luggage], key: 'SEGMENT'
+  end
+end

data/lib/gillbus/structs/ticket.rb

@@ -283,7 +283,7 @@ class Gillbus
 
     field :is_online_refund, :bool
 
-    field :is_baggage, :bool
+    field :is_luggage, :bool, key: 'IS_BAGGAGE'
 
     parser do
       def ticket_status(value)

data/lib/gillbus/tickets_booking.rb

@@ -150,22 +150,22 @@ class Gillbus
         # passenger0baggageCount... passengerNbaggageCount (не обязательный)
         # На рейс без сегментов
         # Количество мест багажа для пассажира с порядковым номером 0...N.
-        attr_accessor :baggage
+        attr_accessor :luggage
 
         # passenger0segment0baggageCount... passengerNsegmentMbaggageCount
         # На рейс с сегментами
         # Количество мест багажа для пассажира 0...N на сегмент 0...M
-        attr_accessor :segments_baggage
+        attr_accessor :segments_luggage
 
         attr_accessor :insurance_id
         attr_accessor :insurance_cost
 
         def params(prefix = '')
           # [0, 1] => {'segment0baggageCount' => 0, 'segment1baggageCount' => 1}
-          prepared_segments_baggage =
-            if segments_baggage
-              segments_baggage.map.with_index do |baggage_count, index|
-                ["segment#{index}baggageCount".to_sym, baggage_count]
+          prepared_segments_luggage =
+            if segments_luggage
+              segments_luggage.map.with_index do |luggage_count, index|
+                ["segment#{index}baggageCount".to_sym, luggage_count]
               end.to_h
             else
               {}
@@ -186,8 +186,8 @@ class Gillbus
             discountValue: discount.to_f.to_s,
             insuranceId: insurance_id,
             insurance: insurance_cost,
-            baggageCount: baggage&.first, # baggage используется для односегментных
-            **prepared_segments_baggage,
+            baggageCount: luggage&.first, # luggage используется для односегментных
+            **prepared_segments_luggage,
           ).map { |k, v| [:"#{prefix}#{k}", v] }.to_h
         end
 

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = '0.20.8'.freeze
+  VERSION = '0.20.9'.freeze
 end

data/test/get_required_fields_test.rb

@@ -1,25 +1,25 @@
 require 'test_helper'
 
 class GetRequiredFieldsTest < Minitest::Test
-  def get_required_fields_without_baggage
-    response_xml = File.read('test/responses/getRequiredFieldsWithoutBaggage.xml')
+  def get_required_fields_without_luggage
+    response_xml = File.read('test/responses/getRequiredFieldsWithoutLuggage.xml')
     Gillbus::GetRequiredFields::Response.parse_string(response_xml)
   end
 
-  def get_required_fields_with_one_baggage
-    response_xml = File.read('test/responses/getRequiredFieldsWithOneBaggage.xml')
+  def get_required_fields_with_one_luggage
+    response_xml = File.read('test/responses/getRequiredFieldsWithOneLuggage.xml')
     Gillbus::GetRequiredFields::Response.parse_string(response_xml)
   end
 
-  def get_required_fields_with_two_baggage_segments
-    response_xml = File.read('test/responses/getRequiredFieldsWithTwoBaggageSegments.xml')
+  def get_required_fields_with_two_luggage_segments
+    response_xml = File.read('test/responses/getRequiredFieldsWithTwoLuggageSegments.xml')
     Gillbus::GetRequiredFields::Response.parse_string(response_xml)
   end
 
-  def test_required_fields_without_baggage
-    result = get_required_fields_without_baggage
+  def test_required_fields_without_luggage
+    result = get_required_fields_without_luggage
 
-    assert_nil result.baggage
+    assert_nil result.luggage
 
     dictionary = result.dictionary
     assert_equal false, dictionary[:student_ticket]
@@ -41,37 +41,37 @@ class GetRequiredFieldsTest < Minitest::Test
     assert_equal true, dictionary[:only_latin_symbols]
   end
 
-  def test_required_fields_with_one_baggage
-    result = get_required_fields_with_one_baggage
-    baggage = result.baggage
+  def test_required_fields_with_one_luggage
+    result = get_required_fields_with_one_luggage
+    luggage = result.luggage
 
-    assert_equal true, baggage.is_buy
-    assert_equal 50.5, baggage.baggage_tariff
+    assert_equal true, luggage.is_buy
+    assert_equal 50.5, luggage.luggage_tariff
 
-    assert_equal [], baggage.segments
-    assert_nil baggage.segment_number
+    assert_equal [], luggage.segments
+    assert_nil luggage.segment_number
   end
 
-  def test_required_fields_with_two_baggage_segments
-    result = get_required_fields_with_two_baggage_segments
-    baggage = result.baggage
+  def test_required_fields_with_two_luggage_segments
+    result = get_required_fields_with_two_luggage_segments
+    luggage = result.luggage
 
-    assert_nil baggage.is_buy
-    assert_nil baggage.baggage_tariff
-    assert_nil baggage.baggage_limit
+    assert_nil luggage.is_buy
+    assert_nil luggage.luggage_tariff
+    assert_nil luggage.luggage_limit
 
-    assert_equal 2, baggage.segments.count
-    first_baggage_segment = baggage.segments[0]
-    second_baggage_segment = baggage.segments[1]
+    assert_equal 2, luggage.segments.count
+    first_luggage_segment = luggage.segments[0]
+    second_luggage_segment = luggage.segments[1]
 
-    assert_equal 0, first_baggage_segment.segment_number
-    assert_equal true, first_baggage_segment.is_buy
-    assert_equal 70.7, first_baggage_segment.baggage_tariff
-    assert_equal 2, first_baggage_segment.baggage_limit
+    assert_equal 0, first_luggage_segment.segment_number
+    assert_equal true, first_luggage_segment.is_buy
+    assert_equal 70.7, first_luggage_segment.luggage_tariff
+    assert_equal 2, first_luggage_segment.luggage_limit
 
-    assert_equal 1, second_baggage_segment.segment_number
-    assert_equal false, second_baggage_segment.is_buy
-    assert_nil second_baggage_segment.baggage_tariff
-    assert_nil second_baggage_segment.baggage_limit
+    assert_equal 1, second_luggage_segment.segment_number
+    assert_equal false, second_luggage_segment.is_buy
+    assert_nil second_luggage_segment.luggage_tariff
+    assert_nil second_luggage_segment.luggage_limit
   end
 end

data/test/tickets_booking_test.rb

@@ -13,7 +13,7 @@ class TicketsBookingTest < Minitest::Test
     assert_equal(Money.new(110_00, 'UAH'), tickets_booking.tickets.first.total_amount)
   end
 
-  def test_params_generation_with_no_baggage
+  def test_params_generation_with_no_luggage
     request = Gillbus::TicketsBooking::Request.new(
       passengers: [
         { },
@@ -27,14 +27,14 @@ class TicketsBookingTest < Minitest::Test
     assert_equal expected_params, request.params
   end
 
-  def test_params_generation_with_baggage_with_one_segment
+  def test_params_generation_with_luggage_with_one_segment
     request = Gillbus::TicketsBooking::Request.new(
       passengers: [
         {
-          baggage: [1],
+          luggage: [1],
         },
         {
-          baggage: [2],
+          luggage: [2],
         }
       ],
     )
@@ -51,10 +51,10 @@ class TicketsBookingTest < Minitest::Test
     request = Gillbus::TicketsBooking::Request.new(
       passengers: [
         {
-          segments_baggage: [0, 1],
+          segments_luggage: [0, 1],
         },
         {
-          segments_baggage: [1, 0],
+          segments_luggage: [1, 0],
         }
       ],
     )
@@ -69,10 +69,10 @@ class TicketsBookingTest < Minitest::Test
     assert_equal expected_params, request.params
   end
 
-  def test_parse_is_baggage_field
+  def test_parse_is_luggage_field
     response = tickets_booking
     ticket = response.tickets.first
 
-    assert_equal true, ticket.is_baggage
+    assert_equal true, ticket.is_luggage
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.20.8
+  version: 0.20.9
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -201,11 +201,11 @@ files:
 - lib/gillbus/search_nearby_trips.rb
 - lib/gillbus/search_trips.rb
 - lib/gillbus/session_login.rb
-- lib/gillbus/structs/baggage.rb
 - lib/gillbus/structs/bus_photo.rb
 - lib/gillbus/structs/carrier.rb
 - lib/gillbus/structs/commission.rb
 - lib/gillbus/structs/item.rb
+- lib/gillbus/structs/luggage.rb
 - lib/gillbus/structs/nearby_cities_trip.rb
 - lib/gillbus/structs/passenger_discount.rb
 - lib/gillbus/structs/point.rb
@@ -257,9 +257,9 @@ files:
 - test/responses/getCities.xml
 - test/responses/getCountries.xml
 - test/responses/getOrderTicket.xml
-- test/responses/getRequiredFieldsWithOneBaggage.xml
-- test/responses/getRequiredFieldsWithTwoBaggageSegments.xml
-- test/responses/getRequiredFieldsWithoutBaggage.xml
+- test/responses/getRequiredFieldsWithOneLuggage.xml
+- test/responses/getRequiredFieldsWithTwoLuggageSegments.xml
+- test/responses/getRequiredFieldsWithoutLuggage.xml
 - test/responses/getTimeTable.xml
 - test/responses/getTripSeats-back-seats.xml
 - test/responses/getTripSeats-one-empty-segment.xml
@@ -345,9 +345,9 @@ test_files:
 - test/responses/getCities.xml
 - test/responses/getCountries.xml
 - test/responses/getOrderTicket.xml
-- test/responses/getRequiredFieldsWithOneBaggage.xml
-- test/responses/getRequiredFieldsWithTwoBaggageSegments.xml
-- test/responses/getRequiredFieldsWithoutBaggage.xml
+- test/responses/getRequiredFieldsWithOneLuggage.xml
+- test/responses/getRequiredFieldsWithTwoLuggageSegments.xml
+- test/responses/getRequiredFieldsWithoutLuggage.xml
 - test/responses/getTimeTable.xml
 - test/responses/getTripSeats-back-seats.xml
 - test/responses/getTripSeats-one-empty-segment.xml

data/lib/gillbus/structs/baggage.rb

@@ -1,19 +0,0 @@
-class Gillbus
-  class Baggage
-    extend Fields
-
-    # => "0"
-    field :segment_number, :int
-
-    # => "true"
-    field :is_buy, :bool
-
-    # => "50.5"
-    field :baggage_tariff, :decimal
-
-    # => "2"
-    field :baggage_limit, :int
-
-    field :segments, [Baggage], key: 'SEGMENT'
-  end
-end