gillbus 0.18.14 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a7314c8cf6fe9167342a9fa5afa2a79f3c9d9d4
-  data.tar.gz: 41d2a8dcf95cbc8826e6e67d1718cc612b287b8e
+  metadata.gz: 48a23c8133793e9abcc37a872de7d32807c4b8b7
+  data.tar.gz: 411679015803b8c36d9a4a4c529b3a006910feef
 SHA512:
-  metadata.gz: 044121e759ccbcd4d07a6ae1af71dc63fbea7b5c811e2bed2742c00e6cbef5f075c2f9c6949340dd10925711c63fd3a0b9b2dc54779f213c6ff5dbc615deb521
-  data.tar.gz: f656e036e42f486ed88cf5a1e690860c6b7eb163325a9f2d7be0360f1f8c6ec2876a5467658ea9b20d1f71d0c616c349ef0a1ba88079eb131d369f814ed6a7bb
+  metadata.gz: 91ed219a443d7e9e4c4b4be9fab6824988c4477dd3b86225ee4ee88daaf6c209aa76d284d08a98194a37afc75619109148433196f98a397f1e406f94dcaf4d08
+  data.tar.gz: 55b828d21194d0d877d410174bba84464ff25684e034cac91663e8a3594dfa03dad02a3541506b021cdb48ac0b2a434060cfd476953d69ade3a3154b48cab495

data/lib/gillbus.rb

@@ -67,6 +67,7 @@ class Gillbus
   require 'gillbus/helpers/parser'
 
   require 'gillbus/structs/trip_service'
+  require 'gillbus/structs/tickets_option'
   require 'gillbus/structs/trip_options'
   require 'gillbus/structs/point'
   require 'gillbus/structs/tariff/return_cause'

data/lib/gillbus/structs/tickets_option.rb

@@ -0,0 +1,29 @@
+class Gillbus
+  class TicketsOption
+    extend Fields
+    include UpdateAttrs
+
+    # идентификатор опции
+    field :id, :int, key: 'ID'
+
+    # текст опции
+    field :text, :string, key: :__content__
+
+    def self.parse(doc, instance: nil, parent: nil, options: {})
+      instance = new
+      if doc.is_a?(String)
+        instance.text = doc
+      elsif doc.is_a?(Array)
+        raise ArgumentError, "Unable to parse TicketsOption: #{doc.inspect}" unless doc.size == 2
+        instance.id = doc.first.fetch('ID').to_i
+        instance.text = doc.last
+      elsif doc.is_a?(Hash) #legacy data made with MultiXML
+        instance.id = doc.fetch('ID')
+        instance.text = doc.fetch('__content__')
+      else
+        raise ArgumentError, "Unable to parse TicketsOption: #{doc.inspect}"
+      end
+      instance
+    end
+  end
+end

data/lib/gillbus/structs/trip_options.rb

@@ -30,6 +30,10 @@ class Gillbus
     # признак рекомендованого рейса, передается как <PROMO><ITEM>BUSFOR_RECOMMEND</ITEM></PROMO>
     field :busfor_recommend, :recommend_bool, root: 'PROMO', key: 'ITEM'
 
+    # опции, связанные с билетами
+    # элемент с ID="7" означает электронный билет
+    field :tickets, [TicketsOption], root: 'TICKETS', key: 'TICKET'
+
     parser do # better not to let flag value out of this gem
       def adertising_bool(vals)
         vals.include?('ADVERTISING')

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = '0.18.14'.freeze
+  VERSION = '0.19.0'.freeze
 end

data/test/error_test.rb

@@ -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 malformed_response.error_message.include?("Malformed response: invalid format")
   end
 
   def test_malformed_2_errorness

data/test/responses/searchTrips-prod.xml

@@ -134,6 +134,9 @@
                 <ITEM>BUSFOR_RECOMMEND</ITEM>
                 <ITEM>ADVERTISING</ITEM>
             </PROMO>
+            <TICKETS>
+                <TICKET ID="7">ЭЛЕКТРОННЫЙ БИЛЕТ. Печать билета не требуется!</TICKET>
+            </TICKETS>
         </OPTIONS>
     </TRIP>
     <TRIP>

data/test/search_trips_test.rb

@@ -150,6 +150,10 @@ 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)
@@ -159,6 +163,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.18.14
+  version: 0.19.0
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -214,6 +214,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