gillbus 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9ec4d134411b18ab82dd204351755d9134dc460
-  data.tar.gz: 1c5e9497ad029d1e971b4d18b2ea5e0c5c4c0982
+  metadata.gz: 65defff51439efea9789ea6e456bdc01528377c0
+  data.tar.gz: 588b997611fcf1a1ce5d0baaa2d686f736cd0a5c
 SHA512:
-  metadata.gz: 3e49925f4ff7ee27596134884339f222a0f15519c6edd4fc3943a1986250599e90d7a3a4e3440ab826eeb980c76b748d57382105696344060119e13959370de1
-  data.tar.gz: d340113730b7092c07e3ab2d12b3fd42e7da88f0a40c2100a57540e385c0e87f75d3eff32ba592bfa5f7edda00200122b89823d2063ec207f116d680b95da917
+  metadata.gz: '08f4beb09430e0b53a2da5309dea506d71fbe6aba637de44e988068a6a88f7c0b50ae950de4e469cd694f86837bcf62b02f657ba59a4414a54120b2e004834ef'
+  data.tar.gz: 1f8601ed9bc4eb824fb174bc7b3f0529fb59848805c252a83827409577004df9f1325849e38ac618859e7ecc516245bb93c472f593fdacbbe5e1d90bd32b9ca8

data/lib/gillbus.rb

@@ -44,6 +44,7 @@ class Gillbus
   require 'gillbus/structs/trip_service'
   require 'gillbus/structs/trip_options'
   require 'gillbus/structs/point'
+  require 'gillbus/structs/tariff/return_cause'
   require 'gillbus/structs/tariff'
   require 'gillbus/structs/segment'
   require 'gillbus/structs/timetable_segment'

data/lib/gillbus/structs/tariff.rb

@@ -44,7 +44,7 @@ class Gillbus
     field :passenger_student_ticket
 
     # => "..."
-    field :return_cause, :string_with_possible_attributes
+    field :return_cause, [ReturnCause]
 
     # => "66.61"
     field :note
@@ -66,6 +66,5 @@ class Gillbus
         end
       end
     end
-
   end
 end

data/lib/gillbus/structs/tariff/return_cause.rb

@@ -0,0 +1,25 @@
+class Gillbus
+  class Tariff
+    class ReturnCause
+
+      extend Fields
+      include UpdateAttrs
+
+      field :lossless, :bool
+
+      field :cause, :string
+
+      def self.parse(doc)
+        instance = super
+        if doc.kind_of? Hash
+          instance.cause = doc['__content__']
+          instance.lossless = doc['lossless'] == 'true'
+        else
+          instance.cause = doc
+          instance.lossless = false
+        end
+        instance
+      end
+    end
+  end
+end

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = "0.15.3"
+  VERSION = "0.15.4"
 end

data/test/responses/searchTrips-prod.xml

@@ -54,8 +54,9 @@
             <PASSENGER_BIRTHDAY/>
             <PASSENGER_ISIC_NUMBER/>
             <PASSENGER_STUDENT_TICKET/>
-            <RETURN_CAUSE>cause 1</RETURN_CAUSE>
+            <RETURN_CAUSE lossless='true'>cause 1</RETURN_CAUSE>
             <RETURN_CAUSE id='asdasd'>cause 2</RETURN_CAUSE>
+            <RETURN_CAUSE>cause 3</RETURN_CAUSE>
         </TARIFF>
         <POINT>
             <NUMBER>0</NUMBER>

data/test/search_trips_test.rb

@@ -91,8 +91,9 @@ class SearchTripsResponseTest < Minitest::Test
     assert_equal true, response.trips.first.fake_time_in_road
     assert_equal false, response.trips[1].recommended
     assert_equal true, response.trips.first.recommended
-    assert_equal ['cause 1', 'cause 2'], response.trips.first.tariffs.first.return_cause
-    assert_equal ['cause 1'], response.trips[1].tariffs.first.return_cause
+    assert_equal ['cause 1', 'cause 2', 'cause 3'], response.trips.first.tariffs.first.return_cause.map(&:cause)
+    assert_equal [true, false, false], response.trips.first.tariffs.first.return_cause.map(&:lossless)
+    assert_equal ['cause 1'], response.trips[1].tariffs.first.return_cause.map(&:cause)
     assert_equal true, response.trips[1].tariffs.first.is_exclusive_price
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -190,6 +190,7 @@ files:
 - lib/gillbus/structs/seat.rb
 - lib/gillbus/structs/segment.rb
 - lib/gillbus/structs/tariff.rb
+- lib/gillbus/structs/tariff/return_cause.rb
 - lib/gillbus/structs/ticket.rb
 - lib/gillbus/structs/timetable_segment.rb
 - lib/gillbus/structs/timetable_trip.rb
@@ -311,3 +312,4 @@ test_files:
 - test/session_login_test.rb
 - test/test_helper.rb
 - test/tickets_booking_test.rb
+has_rdoc: