gillbus 0.17.3 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c24e75a394d31f69936e9a3822a2a839232d171d
-  data.tar.gz: 2e1c151cf0a63632fce3d4a3b333cfdbf6fff2c6
+  metadata.gz: 140d94b1fc16018b2810e3abc6a1fd9bc5bf7393
+  data.tar.gz: b9a87718c0a4e543115763efebb8daf51acbe8aa
 SHA512:
-  metadata.gz: 2732ce3dad4378648cec1f3e3152958c47452a6e2ea32fb01b73e1e14e4a62ad498dc2d40b737110434e936fc54203789c877c3ae5a4606448612b66a4272a3a
-  data.tar.gz: b24023751a614b3dc092ceba07b09b3c236e98f24ded2b941953eb7dd71ad4ee7bfe01d0c9b589bac5a13afd5dbe66b50f27c363b175ce900fb5b816237b9eca
+  metadata.gz: 271db72a1c6aa69dd9954e6b7d2b64bbdfddc9c8e98bd1f9e3c4efc75e0d07cb872d4bd0e5f716e8f4aee0b5feee1f0ac93329343c2050e594217c9667d43977
+  data.tar.gz: 9488294ff67f001ab47e310ce363409d826850f9d02776a0df332921693696e18d5d1cc75cfd1d778c2a07cbe5f4edc594bac07012690ab73ed66ca12d25697d

data/lib/gillbus/helpers/parser.rb

@@ -18,15 +18,13 @@ class Gillbus
 
     def parse
       fields.each do |name:, key:, type:, root:|
-        raw_value =
-          if key.is_a?(Regexp)
-            doc.select { |k| k =~ key }
-          elsif root
-            doc[root] && doc[root][key]
+        value =
+          if type == :datetime_combined
+            datetime_combined(key)
           else
-            doc[key]
+            raw_value = fetch_value(key: key, root: root)
+            make_one_or_many(type, raw_value)
           end
-        value = make_one_or_many(type, raw_value)
         instance.send "#{name}=", value unless value.nil?
       end
       instance
@@ -34,6 +32,16 @@ class Gillbus
 
     private
 
+    def fetch_value(key:, root:)
+      if key.is_a?(Regexp)
+        doc.select { |k| k =~ key }
+      elsif root
+        doc[root] && doc[root][key]
+      else
+        doc[key]
+      end
+    end
+
     def make_one_or_many(type, val)
       # [:type]
       if type.is_a? Array
@@ -90,8 +98,18 @@ class Gillbus
     end
 
     def datetime(val)
-      tz = @options[:timezone] || 'Europe/Kiev'
-      ActiveSupport::TimeZone[tz].parse(val)
+      ActiveSupport::TimeZone[default_timezone].parse(val)
+    end
+
+    def datetime_combined(key)
+      date_string = doc["#{key}_DATE"]
+      time_string = doc["#{key}_TIME"]
+      timezone = doc["#{key}_TIMEZONE"].presence || default_timezone
+      ActiveSupport::TimeZone[timezone].parse("#{date_string} #{time_string}")
+    end
+
+    def default_timezone
+      @options[:timezone] || 'Europe/Kiev'
     end
 
     def decimal(val)

data/lib/gillbus/structs/segment.rb

@@ -146,11 +146,9 @@ class Gillbus
 
     field :bus_photos, [BusPhoto], key: 'BUS_PHOTO'
 
-    def start_at
-      timezone = data['START_TIMEZONE'] || 'Europe/Kiev'
-      datetime_string = "#{data['START_DATE']} #{data['START_TIME']}"
-      ActiveSupport::TimeZone[timezone].parse(datetime_string)
-    end
+    field :start_at, :datetime_combined, key: 'START'
+
+    field :end_at, :datetime_combined, key: 'END'
 
     parser do
       def money(val)

data/lib/gillbus/structs/ticket.rb

@@ -264,6 +264,10 @@ class Gillbus
     # Ticket type: i.e. bus ticket, insurance, etc
     field :service_type
 
+    field :start_at, :datetime_combined, key: 'START'
+
+    field :end_at, :datetime_combined, key: 'END'
+
     parser do
       def ticket_status(value)
         {

data/lib/gillbus/structs/trip.rb

@@ -160,11 +160,9 @@ class Gillbus
 
     field :bus_photos, [BusPhoto], key: 'BUS_PHOTO'
 
-    def start_at
-      timezone = data['START_TIMEZONE'] || 'Europe/Kiev'
-      datetime_string = "#{data['START_DATE']} #{data['START_TIME']}"
-      ActiveSupport::TimeZone[timezone].parse(datetime_string)
-    end
+    field :start_at, :datetime_combined, key: 'START'
+
+    field :end_at, :datetime_combined, key: 'END'
 
     parser do
       def money(val)

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = '0.17.3'.freeze
+  VERSION = '0.17.4'.freeze
 end

data/test/reserve_tickets_test.rb

@@ -2,8 +2,11 @@ require 'test_helper'
 require 'pry'
 
 class ReserveTicketsTest < Minitest::Test
-  def reserve_tickets
-    Gillbus::ReserveTickets::Response.parse_string(File.read('test/responses/reserveTickets.xml'))
+  def reserve_tickets(timezone: nil)
+    Gillbus::ReserveTickets::Response.parse_string(
+      File.read('test/responses/reserveTickets.xml'),
+      timezone: timezone,
+    )
   end
 
   def test_number
@@ -19,10 +22,8 @@ class ReserveTicketsTest < Minitest::Test
   end
 
   def test_date_to_pay_with_timezone
-    tickets = Gillbus::ReserveTickets::Response.parse_string(
-      File.read('test/responses/reserveTickets.xml'),
-      timezone: 'Europe/Moscow',
-    )
+    tickets = reserve_tickets(timezone: 'Europe/Moscow')
+
     assert_equal(DateTime.new(2013, 5, 22, 20, 30, 0, '+4'), tickets.tickets.first.date_to_pay)
     assert_equal('MSK', tickets.tickets.first.date_to_pay.zone)
   end
@@ -31,4 +32,32 @@ class ReserveTicketsTest < Minitest::Test
     xml = YAML.load(File.read('test/responses/reserveTickets.yml'))
     Gillbus::ReserveTickets::Response.parse(xml) # should not raise error
   end
+
+  def test_start_at_end_at_parsing
+    # default timezone - Europe/Kiev
+    response = reserve_tickets
+    ticket = response.tickets.first
+
+    # default timezone
+    expected_start_at = ActiveSupport::TimeZone['Europe/Kiev'].parse('20.02.2013 14:40')
+    # timezone from response
+    expected_end_at = ActiveSupport::TimeZone['Europe/Prague'].parse('21.02.2013 06:35')
+
+    assert_equal expected_start_at, ticket.start_at
+    assert_equal expected_end_at, ticket.end_at
+  end
+
+  def test_start_at_end_at_parsing_with_default_timezone
+    # default timezone - Europe/Moscow
+    response = reserve_tickets(timezone: 'Europe/Moscow')
+    ticket = response.tickets.first
+
+    # default timezone
+    expected_start_at = ActiveSupport::TimeZone['Europe/Moscow'].parse('20.02.2013 14:40')
+    # timezone from response
+    expected_end_at = ActiveSupport::TimeZone['Europe/Prague'].parse('21.02.2013 06:35')
+
+    assert_equal expected_start_at, ticket.start_at
+    assert_equal expected_end_at, ticket.end_at
+  end
 end

data/test/responses/reserveTickets.xml

@@ -24,8 +24,9 @@
     <START_CITY>Донецк</START_CITY>
     <START_DATE>20.02.2013</START_DATE>
     <START_TIME>14:40</START_TIME>
-    <END_CITY>Одесса</END_CITY>
+    <END_CITY>Прага</END_CITY>
     <END_TIME>06:35</END_TIME>
+    <END_TIMEZONE>Europe/Prague</END_TIMEZONE>
     <TYPE_TARIFF_NAME>Y</TYPE_TARIFF_NAME>
     <TARIFF>75.0</TARIFF>
     <TARIFF_VAT>15.0</TARIFF_VAT>

data/test/responses/searchTrips-segments.xml

@@ -57,7 +57,9 @@
             <START_DATE>26.06.2015</START_DATE>
             <END_DATE>26.06.2015</END_DATE>
             <START_TIME>08:30</START_TIME>
+            <START_TIMEZONE>Europe/Moscow</START_TIMEZONE>
             <END_TIME>15:30</END_TIME>
+            <END_TIMEZONE>Europe/Kiev</END_TIMEZONE>
             <BUS_MODEL>Neoplan(Free)</BUS_MODEL>
             <BUS_CLASS/>
             <TRIP_SEATS_MAP>true</TRIP_SEATS_MAP>

data/test/search_trips_test.rb

@@ -109,6 +109,16 @@ class SearchTripsResponseTest < Minitest::Test
     assert_equal trip2_start_at, response.trips[1].start_at
   end
 
+  def test_end_at_parsing
+    response = get_successful_search_trips
+
+    trip1_end_at = ActiveSupport::TimeZone['Europe/Moscow'].parse('24.08.2014 06:30')
+    trip2_end_at = ActiveSupport::TimeZone['Europe/Kiev'].parse('24.08.2014 08:40')
+
+    assert_equal trip1_end_at, response.trips[0].end_at
+    assert_equal trip2_end_at, response.trips[1].end_at
+  end
+
   def test_options_parsing
     response = get_successful_search_trips
     options = response.trips.first.options
@@ -182,12 +192,35 @@ class SearchTripsResponseTest < Minitest::Test
 
   def test_trips_with_segments
     response = get_trips_with_segments
+
     assert response.completed
     assert_equal 2, response.trips.size
-    assert_equal 'Europe/Kiev', response.trips.first.start_timezone
-    assert_equal 'Europe/Kiev', response.trips.first.end_timezone
-    assert_equal true, response.trips.first.fake_time_in_road
-    assert_equal 2, response.trips.first.segments.size
+
+    trip = response.trips.first
+    assert_equal 'Europe/Kiev', trip.start_timezone
+    assert_equal 'Europe/Kiev', trip.end_timezone
+    assert_equal true, trip.fake_time_in_road
+    assert_equal 2, trip.segments.size
+  end
+
+  def test_trip_segments_parsing
+    response = get_trips_with_segments
+    assert response.completed
+
+    segments = response.trips.first.segments
+    assert_equal 2, segments.size
+
+    segment1_start_at = ActiveSupport::TimeZone['Europe/Moscow'].parse('26.06.2015 08:30')
+    segment1_end_at = ActiveSupport::TimeZone['Europe/Kiev'].parse('26.06.2015 15:30')
+
+    assert_equal segment1_start_at, segments[0].start_at
+    assert_equal segment1_end_at, segments[0].end_at
+
+    segment2_start_at = ActiveSupport::TimeZone['Europe/Kiev'].parse('26.06.2015 22:40')
+    segment2_end_at = ActiveSupport::TimeZone['Europe/Kiev'].parse('27.06.2015 16:00')
+
+    assert_equal segment2_start_at, segments[1].start_at
+    assert_equal segment2_end_at, segments[1].end_at
   end
 
   def test_trips_with_insurance

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.17.4
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport