gillbus 0.18.6 → 0.18.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1699eb5ff3908c54ba839df8d767d6a17ae0766c
-  data.tar.gz: f12d971f95d3a0abee3a4732dceedaf69c966f7b
+  metadata.gz: 9b5254d67655669e73b597bb31908f098ef5809d
+  data.tar.gz: 6d6fb0a7f94fb778abf7b7e1bbbc19257cbd45e6
 SHA512:
-  metadata.gz: e9e65bb084aad8a42b2f660c4fc32faba44d9743ea2bf971ff1824ea18fa56e08d2343c46c5a52a0e4ab271016077cd8d115458d35e9f4821ca5ab5ad18e88b5
-  data.tar.gz: 95d2330c94a6a1ba407a98ebe98cf6f03b5000476ce97ad8006eed4dd9a574a52934a288a8d68ab378b8b808bffd801718e746fb54961c06a978e8239db1f0c5
+  metadata.gz: b668d5237ca23a6e8eb407615355d16d49f841f8024e4e98673b30aa479857a1c5e9ec32fff0270a91b7c37d271fe03832b19eb3f69acc320aad2aeecc4b3e09
+  data.tar.gz: 8c496874341822e74fa4091db0b6973c3197757cf08978a8550b65203f992997b0418f4a3041a4d25c03a6e76eb78b4a7078e6fbdfd57277edd61ebec03afda8

data/lib/gillbus/search_trips.rb

@@ -91,6 +91,9 @@ class Gillbus
 
       attr_accessor :insurance_id
 
+      # extendedSearch	number	Признак отображения в результате поиска соседних городов
+      attr_accessor :extended_search
+
       def params
         compact(
           selectedModes:       modes(selected_modes),
@@ -107,6 +110,7 @@ class Gillbus
           onlyBranded:         bool(only_branded),
           tripOptions:         bool(trip_options),
           insuranceId:         insurance_id,
+          extendedSearch:      extended_search,
           **passengers_data,
         )
       end
@@ -132,6 +136,7 @@ class Gillbus
     class Response < BaseResponse
       field :completed, :bool
       field :trips, [Trip], key: 'TRIP'
+      field :nearby_trips, [NearbyTrip], key: 'TRIP', root: 'NEARBY_CITIES'
     end
   end
 end

data/lib/gillbus/structs/nearby_trip.rb

@@ -0,0 +1,58 @@
+# результаты поиска по соседним городам, берется из кеша и содержит меньше данных, чем поездка из выдачи
+class Gillbus
+  class NearbyTrip
+    extend Fields
+    include UpdateAttrs
+
+    # => "Москва"
+    field :start_city_name
+
+    # => "A7CD147C07E7CD1BE040A8C0630328EC"
+    field :start_city_guid
+
+    # => "Europe/Moscow"
+    field :start_timezone
+
+    # => 20
+    field :distance_to_start
+
+    # => "Смоленск"
+    field :end_city_name
+
+    # => "DD253CDEE7D1555EE040B8596052093F"
+    field :end_city_guid
+
+    # => "Europe/Moscow"
+    field :end_timezone
+
+    # => "22:50"
+    field :start_time, :time # XXX
+
+    # => "08:00"
+    field :end_time, :time # XXX
+
+    # => ""Автофлот Автоколонна-1601" ООО"
+    field :carrier_name # XXX
+
+    # => "RU "Автофлот Автоколонна-1601" ООО"
+    field :carrier_legal_name # XXX
+
+    # => "390"
+    field :time_in_road
+
+    # => "1100"
+    field :total_cost, :money
+
+    # => "RUB"
+    field :currency
+
+    parser do
+      def money(val)
+        Monetize.parse(val, doc['CURRENCY'])
+      end
+    end
+
+    # to hold unserialized data
+    attr_accessor :data
+  end
+end

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = '0.18.6'.freeze
+  VERSION = '0.18.7'.freeze
 end

data/lib/gillbus.rb

@@ -66,6 +66,7 @@ class Gillbus
   require 'gillbus/structs/seat'
   require 'gillbus/structs/item'
   require 'gillbus/structs/carrier'
+  require 'gillbus/structs/nearby_trip'
 
   require 'gillbus/parse_error'
   require 'gillbus/base_request'

data/test/responses/searchTrips-nearby.xml

@@ -0,0 +1,41 @@
+<DATA>
+    <COMPLETED>true</COMPLETED>
+    <NEARBY_CITIES>
+        <TRIP>
+            <START_CITY_NAME>Москва</START_CITY_NAME>
+            <START_CITY_GUID>A7CD147C07E7CD1BE040A8C0630328EC</START_CITY_GUID>
+            <START_TIMEZONE>Europe/Moscow</START_TIMEZONE>
+            <DISTANCE_TO_START>20</DISTANCE_TO_START>
+            <END_CITY_NAME>Санкт-Петербург</END_CITY_NAME>
+            <END_CITY_GUID>CA975BC2ACDBCF7FE040B859C14327B3</END_CITY_GUID>
+            <END_TIMEZONE>Europe/Moscow</END_TIMEZONE>
+            <DISTANCE_TO_END>0</DISTANCE_TO_END>
+            <START_TIME>21:30</START_TIME>
+            <END_TIME>08:45</END_TIME>
+            <CARRIER_NAME>"Авто-Транс-Ком" ООО </CARRIER_NAME>
+            <CARRIER_LEGAL_NAME>RU "Авто-Транс-Ком" ООО </CARRIER_LEGAL_NAME>
+            <TIME_IN_ROAD>675</TIME_IN_ROAD>
+            <TOTAL_COST>1200</TOTAL_COST>
+            <CURRENCY>RUB</CURRENCY>
+            <CURRENCY_CODE>643</CURRENCY_CODE>
+        </TRIP>
+        <TRIP>
+            <START_CITY_NAME>Москва</START_CITY_NAME>
+            <START_CITY_GUID>A7CD147C07E7CD1BE040A8C0630328EC</START_CITY_GUID>
+            <START_TIMEZONE>Europe/Moscow</START_TIMEZONE>
+            <DISTANCE_TO_START>20</DISTANCE_TO_START>
+            <END_CITY_NAME>Санкт-Петербург</END_CITY_NAME>
+            <END_CITY_GUID>CA975BC2ACDBCF7FE040B859C14327B3</END_CITY_GUID>
+            <END_TIMEZONE>Europe/Moscow</END_TIMEZONE>
+            <DISTANCE_TO_END>0</DISTANCE_TO_END>
+            <START_TIME>21:30</START_TIME>
+            <END_TIME>09:00</END_TIME>
+            <CARRIER_NAME>"Автофлот Автоколонна-1601" ООО</CARRIER_NAME>
+            <CARRIER_LEGAL_NAME>RU "Автофлот Автоколонна-1601" ООО</CARRIER_LEGAL_NAME>
+            <TIME_IN_ROAD>690</TIME_IN_ROAD>
+            <TOTAL_COST>1000</TOTAL_COST>
+            <CURRENCY>RUB</CURRENCY>
+            <CURRENCY_CODE>643</CURRENCY_CODE>
+        </TRIP>
+    </NEARBY_CITIES>
+</DATA>

data/test/search_trips_test.rb

@@ -65,6 +65,10 @@ class SearchTripsResponseTest < Minitest::Test
     Gillbus::SearchTrips::Response.parse_string(File.read('test/responses/searchTrips-insurance.xml'))
   end
 
+  def get_trips_with_nearby_cities
+    Gillbus::SearchTrips::Response.parse_string(File.read('test/responses/searchTrips-nearby.xml'))
+  end
+
   def test_empty_completed
     response = get_empty_search_trips
     assert response.completed
@@ -235,4 +239,15 @@ class SearchTripsResponseTest < Minitest::Test
     assert_equal 1, tariff.insurance_id
     assert_equal '100000 RUB'.to_money, tariff.insurance_sum
   end
+
+  def test_trips_with_nearby_cities
+    response = get_trips_with_nearby_cities
+    assert response.completed
+    trip = response.nearby_trips.first
+    assert_equal 'Москва', trip.start_city_name
+    assert_equal 'Санкт-Петербург', trip.end_city_name
+    assert_equal '1200 RUB'.to_money, trip.total_cost
+    assert_equal '"Авто-Транс-Ком" ООО ', trip.carrier_name
+    assert_equal '21:30', trip.start_time
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.18.6
+  version: 0.18.7
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -204,6 +204,7 @@ files:
 - lib/gillbus/structs/carrier.rb
 - lib/gillbus/structs/commission.rb
 - lib/gillbus/structs/item.rb
+- lib/gillbus/structs/nearby_trip.rb
 - lib/gillbus/structs/passenger_discount.rb
 - lib/gillbus/structs/point.rb
 - lib/gillbus/structs/return_cause.rb
@@ -265,6 +266,7 @@ files:
 - test/responses/returnPositionSuccess.xml
 - test/responses/searchTrips-empty.xml
 - test/responses/searchTrips-insurance.xml
+- test/responses/searchTrips-nearby.xml
 - test/responses/searchTrips-prod-invalid.xml
 - test/responses/searchTrips-prod.xml
 - test/responses/searchTrips-segments-roundtrip.xml
@@ -343,6 +345,7 @@ test_files:
 - test/responses/returnPositionSuccess.xml
 - test/responses/searchTrips-empty.xml
 - test/responses/searchTrips-insurance.xml
+- test/responses/searchTrips-nearby.xml
 - test/responses/searchTrips-prod-invalid.xml
 - test/responses/searchTrips-prod.xml
 - test/responses/searchTrips-segments-roundtrip.xml