gillbus 0.17.6 → 0.22.9

data/test/responses/ticketsBooking.xml

@@ -71,5 +71,6 @@
         <VAT>3.33</VAT>
         <CURRENCY>UAH</CURRENCY>
     </COMMISSION>
+    <IS_BAGGAGE>true</IS_BAGGAGE>
 </TICKET>
 </DATA>

data/test/search_nearby_trips_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class SearchNearbyTripsRequestTest < Minitest::Test
+  def get_trips_with_nearby_cities
+    Gillbus::SearchTripNearbyCities::Response.parse_string(File.read('test/responses/searchTripsNearby.xml'))
+  end
+
+  def test_trips_with_nearby_cities
+    response = get_trips_with_nearby_cities
+    assert response.completed
+    trip = response.trips.first
+    assert_equal 'Москва', trip.start_city_name
+    assert_equal 'Ярославль', trip.end_city_name
+    assert_equal '465.5 RUB'.to_money, trip.total_cost
+    assert_equal '"ОднаКасса" ООО', trip.carrier_name
+    assert_equal '09:00', trip.start_time
+  end
+end

data/test/search_trips_test.rb

@@ -6,6 +6,7 @@ class SearchTripsRequestTest < Minitest::Test
       start_date_search: Date.new(2013, 2, 4),
       selected_modes: [:avia, :connections],
       round_trip: true,
+      limit_segment_trip_show: 3,
       passengers: [
         {
           birthday: Date.parse('1990-01-01'),
@@ -28,6 +29,7 @@ class SearchTripsRequestTest < Minitest::Test
       startDateSearch: '04.02.2013',
       selectedModes: '3;8',
       roundTrip: '1',
+      limitSegmentTripShow: 3,
       passenger0birthday: '01.01.1990',
       passenger0studentTicket: 'STUDENTTICKET#1',
       passenger0studentYear: 1,
@@ -53,6 +55,10 @@ class SearchTripsResponseTest < Minitest::Test
     Gillbus::SearchTrips::Response.parse_string(File.read('test/responses/searchTrips-prod.xml'))
   end
 
+  def get_successful_search_trips_with_new_options_format
+    Gillbus::SearchTrips::Response.parse_string(File.read('test/responses/searchTrips-new-options-format.xml'))
+  end
+
   def get_successful_search_trips_with_bad_data
     Gillbus::SearchTrips::Response.parse_string(File.read('test/responses/searchTrips-prod-invalid.xml'))
   end
@@ -65,6 +71,14 @@ class SearchTripsResponseTest < Minitest::Test
     Gillbus::SearchTrips::Response.parse_string(File.read('test/responses/searchTrips-insurance.xml'))
   end
 
+  def get_trips_with_round_trip_offers
+    Gillbus::SearchTrips::Response.parse_string(File.read('test/responses/searchTrips-round-trip-offers.xml'))
+  end
+
+  def get_trips_with_full_carriers_info
+    Gillbus::SearchTrips::Response.parse_string(File.read('test/responses/searchTrips-full-carriers-info.xml'))
+  end
+
   def test_empty_completed
     response = get_empty_search_trips
     assert response.completed
@@ -84,6 +98,7 @@ class SearchTripsResponseTest < Minitest::Test
 
   def test_fields_parsing
     response = get_successful_search_trips
+    assert_equal '3451212695530327295', response.trips.first.id
     assert_equal Date.new(2014, 8, 23), response.trips.first.start_date
     assert_equal Money.new(1410_00, 'RUB'), response.trips.first.total_cost
     assert_equal Money.new(1410_00, 'RUB'), response.trips.first.tariffs.first.cost
@@ -97,6 +112,8 @@ class SearchTripsResponseTest < Minitest::Test
     assert_equal ['cause 1'], response.trips[1].tariffs.first.return_cause.map(&:cause)
     assert_equal true, response.trips[1].tariffs.first.is_exclusive_price
     assert_equal 'http://example.com/123', response.trips.first.redirect_url
+    assert_equal 0, response.trips.first.bus_floors_number
+    assert_equal 2, response.trips.last.bus_floors_number
   end
 
   def test_start_at_parsing
@@ -149,6 +166,60 @@ class SearchTripsResponseTest < Minitest::Test
       'Трансфер',
       'Cкидка при покупке раунд-трипа',
     ]
+    titckets_options = [
+      'ЭЛЕКТРОННЫЙ БИЛЕТ. Печать билета не требуется!',
+    ]
+    titckets_options_ids = [7]
+
+    assert_equal services.values, options.services.map(&:name)
+    assert_equal services.keys, options.services.map(&:id)
+    assert_equal luggage_options, options.luggage
+    assert_equal seating_options, options.seating
+    assert_equal technical_stops, options.technical_stops
+    assert_equal critical_info, options.critical_info
+    assert_equal resource_options, options.resource_options
+    assert_equal other_options, options.other
+    assert_equal titckets_options, options.tickets.map(&:text)
+    assert_equal titckets_options_ids, options.tickets.map(&:id)
+    assert options.advertising
+    assert options.busfor_recommend
+  end
+
+  def test_new_options_format
+    response = get_successful_search_trips_with_new_options_format
+    options = response.trips.first.options
+
+    services = {
+      1 => 'Кофе',
+      15 => 'Wi-Fi',
+    }
+    luggage_options = [
+      'В стоимость входит провоз 2 единиц багажа свыше 80 кг.',
+      'Ручная кладь 20см x 40см x 30см входит в стоимость билета.',
+      'Превышение по багажу оплачивается в размере 1% от стоимости тарифа.',
+    ]
+    seating_options = [
+      'Свободная рассадка.',
+    ]
+    technical_stops = [
+      'Технические остановки осуществляются каждые 2-3 часа.',
+    ]
+    critical_info = [
+      "Внимание! Ознакомьтесь со списком стран, въезд в которые ограничен в связи с коронавирусом >> https://busfor.com/ru/blog/covid-19-updates",
+      "в связи с дорожными условиями, возможно отклонение в расписании движения в пределах 1час30.",
+    ]
+    resource_options = [
+      'Посадка начинается за 10 мин.',
+    ]
+    other_options = [
+      'Переправа',
+      'Трансфер',
+      'Cкидка при покупке раунд-трипа',
+    ]
+    titckets_options = [
+      'ЭЛЕКТРОННЫЙ БИЛЕТ. Печать билета не требуется!',
+    ]
+    titckets_options_ids = [7]
 
     assert_equal services.values, options.services.map(&:name)
     assert_equal services.keys, options.services.map(&:id)
@@ -158,6 +229,8 @@ class SearchTripsResponseTest < Minitest::Test
     assert_equal critical_info, options.critical_info
     assert_equal resource_options, options.resource_options
     assert_equal other_options, options.other
+    assert_equal titckets_options, options.tickets.map(&:text)
+    assert_equal titckets_options_ids, options.tickets.map(&:id)
     assert options.advertising
     assert options.busfor_recommend
   end
@@ -234,4 +307,24 @@ class SearchTripsResponseTest < Minitest::Test
     assert_equal 1, tariff.insurance_id
     assert_equal '100000 RUB'.to_money, tariff.insurance_sum
   end
+
+  def test_trips_with_round_trip_offers
+    response = get_trips_with_round_trip_offers
+
+    assert response.completed
+    assert_equal 1, response.back_trips.count
+    assert_equal 3, response.trips.count
+    assert_equal response.back_trips.first.id, response.trips.first.id
+  end
+
+  def test_trips_with_full_carriers_info
+    response = get_trips_with_full_carriers_info
+    trip = response.trips.first
+
+    assert_equal "RU \"Еременчук Е.А.\" ИП", trip.carrier_legal_name
+    assert_equal "260802027265", trip.carrier_inn
+    assert_equal "г СНТ Лилия, Московская, Наро-фоминский", trip.carrier_address_fact
+    assert_equal "г СНТ Лилия, Московская, Наро-фоминский", trip.carrier_address_leg
+    assert_equal "316265100057314", trip.carrier_egrul_egis
+  end
 end

data/test/tickets_booking_test.rb

@@ -12,4 +12,67 @@ class TicketsBookingTest < Minitest::Test
   def test_total
     assert_equal(Money.new(110_00, 'UAH'), tickets_booking.tickets.first.total_amount)
   end
+
+  def test_params_generation_with_no_luggage
+    request = Gillbus::TicketsBooking::Request.new(
+      passengers: [
+        { },
+        { },
+      ],
+    )
+    expected_params = {
+      passenger0discountValue: '0.0',
+      passenger1discountValue: '0.0',
+    }
+    assert_equal expected_params, request.params
+  end
+
+  def test_params_generation_with_luggage_with_one_segment
+    request = Gillbus::TicketsBooking::Request.new(
+      passengers: [
+        {
+          luggage: [1],
+        },
+        {
+          luggage: [2],
+        }
+      ],
+    )
+    expected_params = {
+      passenger0discountValue: '0.0',
+      passenger0baggageCount: 1,
+      passenger1discountValue: '0.0',
+      passenger1baggageCount: 2,
+    }
+    assert_equal expected_params, request.params
+  end
+
+  def test_params_generation_with_baggage_with_two_segments
+    request = Gillbus::TicketsBooking::Request.new(
+      passengers: [
+        {
+          segments_luggage: [0, 1],
+        },
+        {
+          segments_luggage: [1, 0],
+        }
+      ],
+    )
+    expected_params = {
+      passenger0discountValue: '0.0',
+      passenger0segment0baggageCount: 0,
+      passenger0segment1baggageCount: 1,
+      passenger1discountValue: '0.0',
+      passenger1segment0baggageCount: 1,
+      passenger1segment1baggageCount: 0,
+    }
+    assert_equal expected_params, request.params
+  end
+
+  def test_parse_is_luggage_field
+    response = tickets_booking
+    ticket = response.tickets.first
+
+    assert_equal true, ticket.is_luggage
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.17.6
+  version: 0.22.9
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
 - Kirill Platonov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,19 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_xml
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.51.0
-description: 
+description:
 email:
 - aronaxis@gmail.com
 - mail@kirillplatonov.com
@@ -178,6 +178,7 @@ files:
 - lib/gillbus/find_order.rb
 - lib/gillbus/get_all_cities.rb
 - lib/gillbus/get_bus_image.rb
+- lib/gillbus/get_carriers.rb
 - lib/gillbus/get_cities.rb
 - lib/gillbus/get_countries.rb
 - lib/gillbus/get_dates_new.rb
@@ -196,11 +197,16 @@ files:
 - lib/gillbus/parse_error.rb
 - lib/gillbus/reserve_tickets.rb
 - lib/gillbus/return_position.rb
+- lib/gillbus/return_position_forced.rb
+- lib/gillbus/search_nearby_trips.rb
 - lib/gillbus/search_trips.rb
 - lib/gillbus/session_login.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
 - lib/gillbus/structs/return_cause.rb
@@ -209,6 +215,7 @@ files:
 - lib/gillbus/structs/tariff.rb
 - lib/gillbus/structs/tariff/return_cause.rb
 - lib/gillbus/structs/ticket.rb
+- lib/gillbus/structs/tickets_option.rb
 - lib/gillbus/structs/timetable_segment.rb
 - lib/gillbus/structs/timetable_trip.rb
 - lib/gillbus/structs/trip.rb
@@ -233,10 +240,13 @@ files:
 - test/get_countries_test.rb
 - test/get_dates_new_test.rb
 - test/get_order_ticket_test.rb
+- test/get_required_fields_test.rb
 - test/get_time_table_test.rb
 - test/get_trip_seats_test.rb
 - test/get_trip_segments_test.rb
 - test/lock_seats_test.rb
+- test/parse_trip_options_test.rb
+- test/parse_trip_test.rb
 - test/reserve_tickets_test.rb
 - test/responses/bookingDifferentCurrencies.xml
 - test/responses/buyBooking.xml
@@ -248,27 +258,39 @@ files:
 - test/responses/getCities.xml
 - test/responses/getCountries.xml
 - test/responses/getOrderTicket.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
 - test/responses/getTripSeats-segments.xml
+- test/responses/getTripSeats-two-floors.xml
 - test/responses/getTripSeats.xml
 - test/responses/getTripSegments.xml
+- test/responses/legacy_trip.yml
+- test/responses/legacy_trip_2.yml
 - test/responses/lockSeats.xml
 - test/responses/reserveTickets.xml
 - test/responses/reserveTickets.yml
 - test/responses/returnPositionFailure.xml
 - test/responses/returnPositionSuccess.xml
 - test/responses/searchTrips-empty.xml
+- test/responses/searchTrips-full-carriers-info.xml
 - test/responses/searchTrips-insurance.xml
+- test/responses/searchTrips-new-options-format.xml
 - test/responses/searchTrips-prod-invalid.xml
 - test/responses/searchTrips-prod.xml
+- test/responses/searchTrips-round-trip-offers.xml
 - test/responses/searchTrips-segments-roundtrip.xml
 - test/responses/searchTrips-segments.xml
+- test/responses/searchTripsNearby.xml
 - test/responses/sessionLogin.xml
 - test/responses/ticketsBooking.xml
 - test/responses/ticketsBookingAllCommissions.xml
 - test/responses/very_empty.xml
 - test/return_position_test.rb
+- test/search_nearby_trips_test.rb
 - test/search_trips_test.rb
 - test/session_login_test.rb
 - test/test_helper.rb
@@ -277,7 +299,7 @@ homepage: http://gillbus.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -292,9 +314,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Driver for Gillbus IDS API
 test_files:
@@ -309,10 +330,13 @@ test_files:
 - test/get_countries_test.rb
 - test/get_dates_new_test.rb
 - test/get_order_ticket_test.rb
+- test/get_required_fields_test.rb
 - test/get_time_table_test.rb
 - test/get_trip_seats_test.rb
 - test/get_trip_segments_test.rb
 - test/lock_seats_test.rb
+- test/parse_trip_options_test.rb
+- test/parse_trip_test.rb
 - test/reserve_tickets_test.rb
 - test/responses/bookingDifferentCurrencies.xml
 - test/responses/buyBooking.xml
@@ -324,27 +348,39 @@ test_files:
 - test/responses/getCities.xml
 - test/responses/getCountries.xml
 - test/responses/getOrderTicket.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
 - test/responses/getTripSeats-segments.xml
+- test/responses/getTripSeats-two-floors.xml
 - test/responses/getTripSeats.xml
 - test/responses/getTripSegments.xml
+- test/responses/legacy_trip.yml
+- test/responses/legacy_trip_2.yml
 - test/responses/lockSeats.xml
 - test/responses/reserveTickets.xml
 - test/responses/reserveTickets.yml
 - test/responses/returnPositionFailure.xml
 - test/responses/returnPositionSuccess.xml
 - test/responses/searchTrips-empty.xml
+- test/responses/searchTrips-full-carriers-info.xml
 - test/responses/searchTrips-insurance.xml
+- test/responses/searchTrips-new-options-format.xml
 - test/responses/searchTrips-prod-invalid.xml
 - test/responses/searchTrips-prod.xml
+- test/responses/searchTrips-round-trip-offers.xml
 - test/responses/searchTrips-segments-roundtrip.xml
 - test/responses/searchTrips-segments.xml
+- test/responses/searchTripsNearby.xml
 - test/responses/sessionLogin.xml
 - test/responses/ticketsBooking.xml
 - test/responses/ticketsBookingAllCommissions.xml
 - test/responses/very_empty.xml
 - test/return_position_test.rb
+- test/search_nearby_trips_test.rb
 - test/search_trips_test.rb
 - test/session_login_test.rb
 - test/test_helper.rb