RubyGems - gillbus - Versions diffs - 0.18.9 → 0.18.10 - Mend

gillbus 0.18.9 → 0.18.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/lib/gillbus/base_response.rb +5 -1
data/lib/gillbus/version.rb +1 -1
data/test/error_test.rb +1 -1
data/test/responses/legacy_trip.yml +120 -0
metadata +4 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eda1c50bb296e10fba122d5d8bdf2826d3ebfae0
-  data.tar.gz: 78a4aeb65635ac55a9306b4f2afa6c7ee3b5881f
+  metadata.gz: edf0f3b1165bb7dc21dc075e495b6e55b36e258c
+  data.tar.gz: 9b7db48a310875a95a63eba6571af8df9e0697ff
 SHA512:
-  metadata.gz: 427db725d935c985579bb9624e96c11e503b275647e4bed884b066c917a3108c867c3f9a928adc7c4076437c2ee7f4209686596274e456eb3f15b29d49d79f94
-  data.tar.gz: 21bfe3a3ce7bda67b27946652e81b92490fbfc47c9e6c10712763941296a7b6eb5bd3b880b2212310fd268b8054c1c9a91a480f3c31ef37113bd55871401bdcb
+  metadata.gz: 382b6e505597994c30a27442559cf476b44d68c2c49e79cc568a4af4962002040e06427a148cee3f6d11ef24c627464d072aa865abab41f71a675b2bba7fc479
+  data.tar.gz: f3a880e2903f05ff53eb6ff3c2cce6f35cd3b6cc912cd74cc7bd61eeb76905fe0a85e5a7285981fe098ad44bf209d3593e0d248a9930178625d87555edbf4a05

data/lib/gillbus/base_response.rb CHANGED Viewed

@@ -13,11 +13,15 @@ class Gillbus
     attr_accessor :external_error_message
     attr_accessor :request_time
+    attr_accessor :raw_xml # make accessible for logging and debuging
     def error?
       !error_code.nil?
     end
     def self.parse(data, instance: new, options: {})
+      instance.raw_xml = options[:raw_xml] if options[:raw_xml]
       # ugly
       if data['MESSAGE']
         instance.error_code = data['MESSAGE']['CODE'].to_i
@@ -36,7 +40,7 @@ class Gillbus
       # <DATA/> is a valid response
       return ParseError.new(xml_string, 'DATA attribute missing') unless xml.key?('DATA')
       data = xml['DATA'] || {}
-      parse(data, instance: new, options: options)
+      parse(data, instance: new, options: options.merge(raw_xml: xml_string))
     rescue Ox::ParseError, ArgumentError => e
       ParseError.new(xml_string, e.message)
     end

data/lib/gillbus/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = '0.18.9'.freeze
+  VERSION = '0.18.10'.freeze
 end

data/test/error_test.rb CHANGED Viewed

@@ -22,7 +22,7 @@ class ErrorTest < Minitest::Test
   def test_malformed_errorness
     assert malformed_response.error?
-    assert_equal "Malformed response: invalid format, expected < at line 1, column 1 [parse.c:146]\n", malformed_response.error_message
+    assert_equal "Malformed response: invalid format, expected < at line 1, column 1 [parse.c:147]\n", malformed_response.error_message
   end
   def test_malformed_2_errorness

data/test/responses/legacy_trip.yml ADDED Viewed

@@ -0,0 +1,120 @@
+---
+ID: '386911730793662069'
+RES_ID: '0'
+NUMBER: TEST - Москва-Брянск
+START_CITY_NAME: Москва
+END_CITY_NAME: Брянск
+START_TIMEZONE:
+END_TIMEZONE:
+START_DATE: 29.12.2017
+END_DATE: 29.12.2017
+START_TIME: '07:00'
+END_TIME: '13:30'
+BUS_MODEL: SCANIA C
+BUS_CLASS:
+BUS_ID:
+BUS_FLOORS_NUMBER: '1'
+PLATFORM:
+TRIP_SEATS_MAP: 'true'
+SHOW_PICKUP_DROPOFF: 'false'
+BRANDED: 'false'
+HAS_TRANSFER: 'false'
+PLACES_COUNT: '51'
+FREE_PLACES_COUNT: '20'
+FREE_BUSY_PLACES: 20/51
+CARRIER_ID: 39E2022747F26FA1E0530300F00A8A55
+CARRIER_NAME: '"Региональные Автобусные Маршруты" ООО'
+TIME_IN_ROAD: '06:30'
+FAKE_TIME_IN_ROAD: 'false'
+STATION_BEGIN_ID: 34C0A393C480628CE0530300F00AE18E
+STATION_BEGIN_NAME: Киевский вокзал
+STATION_BEGIN_ADDRESS: пл. Киевского Вокзала, д. 1
+STATION_END_ID: 357C66C2E3907C1CE0530300F00A3A4E
+STATION_END_NAME: Брянск, ж/д вокзал
+STATION_END_ADDRESS: ул. Речная д. 1
+RESERVATION_ENABLED: 'true'
+SALE_ENABLED: 'true'
+RETURN_ENABLED: 'false'
+TIME_FOR_CANCEL: '40'
+TRIP_FULL_SALE: 'false'
+CAN_DISCOUNT: 'true'
+INTERNATIONAL: 'false'
+JOIN_BOOK_BUY: 'true'
+TRIP_MODE: '1'
+CUSTOM_STATUS: '0'
+SPECIAL_CONDITIONS:
+REDIRECT_URL:
+IMAGE_URL: 'null'
+START_POINT_TYPE: 'null'
+VEHICLE_DESCRIPTION: 'null'
+VEHICLE_FEATURES: 'null'
+TOTAL_COST: '550.0'
+CURRENCY: RUB
+CURRENCY_CODE: '643'
+TARIFF:
+  SHORT_NAME: Y
+  FULL_NAME: Базовый тариф
+  START_DATE:
+  END_DATE:
+  DESCRIPTION: 'Базовый тариф стоимости проезда одного пассажиров в одном направлении
+'
+  TIME_TO_BUY_RESERVED: '2'
+  TIME_TO_STOP_BOOKING: '2'
+  TIME_TO_PAY_RESERVATION: 06.12.2017 18:25:39
+  COST: '550'
+  INSURANCE_COST: '0'
+  INSURANCE_ID:
+  INSURANCE_SUM: '0'
+  INSURANCE_CUR:
+  AFTER_DISPATCH_NO_RETURN: 'true'
+  PASSENGER_BIRTHDAY:
+  PASSENGER_ISIC_NUMBER:
+  PASSENGER_STUDENT_TICKET:
+  NOTE:
+  RETURN_CAUSE:
+  - lossless: 'true'
+    __content__: Без потерь,  более чем за 2 ч., до отправления рейса. Возвращается
+      100% стоимости тарифа. Ориентировочная сумма возврата 550
+  - 'Добровольно,  менее чем за 2 ч., до отправления рейса. Удерживается при возврате:
+    15% тарифа. Ориентировочная сумма возврата 425'
+  - 'Возврат маршрутной квитанции в случае опоздания к отправлению (стоимость не возвращается).
+    Удерживается при возврате: 100% тарифа. Ориентировочная сумма возврата 0'
+  - Возврат маршрутной квитанции по отмене отправления т/с, задержки отправления т/с
+    более чем на час и непредставления пассажиру указанного в билете места. СРОК ОБРАЩЕНИЯ
+    для возврата билета 24 часа с времени отправления. . Возвращается 100% стоимости
+    билета. Ориентировочная сумма возврата 550
+  PROMOTE: 'false'
+  IS_EXCLUSIVE_PRICE: 'false'
+POINT:
+- NUMBER: '0'
+  GEOGRAPHY_NAME: Москва
+  NAME: Киевский вокзал
+  ADDRESS: пл. Киевского Вокзала, д. 1
+  TIMEZONE:
+  ARRIVAL_DATE: 29.12.2017
+  ARRIVAL_TIME:
+  DISPATCH_DATE: 29.12.2017
+  DISPATCH_TIME: '07:00'
+  CHECK_POINT: 'false'
+  DISTANCE: '0'
+  TRANSFER_POINT: 'false'
+  PLATFORM:
+  BUSMODEL:
+  AGREED: 'true'
+- NUMBER: '1'
+  GEOGRAPHY_NAME: Брянск
+  NAME: Остановка Брянск
+  ADDRESS: улица Речная; дом 1
+  TIMEZONE:
+  ARRIVAL_DATE: 29.12.2017
+  ARRIVAL_TIME: '13:30'
+  DISPATCH_DATE: 29.12.2017
+  DISPATCH_TIME:
+  CHECK_POINT: 'false'
+  DISTANCE: '390'
+  TRANSFER_POINT: 'false'
+  PLATFORM:
+  BUSMODEL:
+  AGREED: 'true'
+EXTRA_CHARGE: '0.0'

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.18.9
+  version: 0.18.10
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -258,6 +258,7 @@ files:
 - test/responses/getTripSeats-segments.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
@@ -337,6 +338,7 @@ test_files:
 - test/responses/getTripSeats-segments.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