gillbus 0.16.6 → 0.16.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ba7f74bfb1405a3b0534c05f21836f7bd06cdf
-  data.tar.gz: 44c2488a9950d8ab972069e30ef4737e5ba9c06c
+  metadata.gz: dfd0ac869d9d605b0344ae93bc7c0f26c8dce47a
+  data.tar.gz: c625a743ef866ce2cdd2671696afca22b29c396b
 SHA512:
-  metadata.gz: f18105410cc98948f506a8db5ed5922332548ad12b58d2db56c56a7d4f466ab67ff483f3736cfe57b581505696da66a46ed1233dc8761ceb5687edc404457a09
-  data.tar.gz: a234a9ba1c3c4e451dbf099f98bdc275ae07e7af34061c4feb57cb02e2646a7d87d2b15d329c11ccb4efe14bbf8da0035c8a81b682bed6c111b1a957d4169caa
+  metadata.gz: 857e79e6e0b3865f781693b3ad69cde047afacb98a344b2419348f25facfe3fd1ed3898012de843688c6ab2281bacdce2aa2da489688f6527d1d4eec3b079145
+  data.tar.gz: f7b1c07c2cef34801f585b497069228c10f144a766d2a2ccc829079cce93fcdfcc07bf89ee85293e3727ae3cdd2afbbd2182ff1a07413e7c09bb39d092521af1

data/Rakefile

@@ -4,6 +4,7 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.pattern = "test/*_test.rb"
+  t.warning = false
 end
 
 task :default => :test

data/lib/gillbus/structs/segment.rb

@@ -38,9 +38,15 @@ class Gillbus
     # => "22:50"
     field :start_time, :time
 
+    # => "Europe/Moscow"
+    field :start_timezone
+
     # => "08:00"
     field :end_time, :time
 
+    # => "Europe/Kiev"
+    field :end_timezone
+
     # => "Сетра S 315 НDH"
     field :bus_model
 
@@ -140,7 +146,9 @@ class Gillbus
     field :options, TripOptions, key: 'OPTIONS'
 
     def start_at
-      ActiveSupport::TimeZone["Europe/Kiev"].parse("#{data["START_DATE"]} #{data["START_TIME"]}")
+      timezone = data['START_TIMEZONE'] || 'Europe/Kiev'
+      datetime_string = "#{data['START_DATE']} #{data['START_TIME']}"
+      ActiveSupport::TimeZone[timezone].parse(datetime_string)
     end
 
     parser do

data/lib/gillbus/structs/trip.rb

@@ -160,7 +160,9 @@ class Gillbus
     field :options, TripOptions, key: 'OPTIONS'
 
     def start_at
-      ActiveSupport::TimeZone["Europe/Kiev"].parse("#{data["START_DATE"]} #{data["START_TIME"]}")
+      timezone = data['START_TIMEZONE'] || 'Europe/Kiev'
+      datetime_string = "#{data['START_DATE']} #{data['START_TIME']}"
+      ActiveSupport::TimeZone[timezone].parse(datetime_string)
     end
 
     parser do

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = "0.16.6"
+  VERSION = "0.16.7"
 end

data/test/search_trips_test.rb

@@ -98,6 +98,16 @@ class SearchTripsResponseTest < Minitest::Test
     assert_equal 'http://example.com/123', response.trips.first.redirect_url
   end
 
+  def test_start_at_parsing
+    response = get_successful_search_trips
+
+    trip1_start_at = ActiveSupport::TimeZone['Europe/Moscow'].parse('23.08.2014 19:00')
+    trip2_start_at = ActiveSupport::TimeZone['Europe/Kiev'].parse('23.08.2014 21:10')
+
+    assert_equal trip1_start_at, response.trips[0].start_at
+    assert_equal trip2_start_at, response.trips[1].start_at
+  end
+
   def test_options_parsing
     response = get_successful_search_trips
     options = response.trips.first.options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.16.6
+  version: 0.16.7
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml