gillbus 0.14.3 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1f9c1f664641532022e161da84efda95e922158
-  data.tar.gz: 766f12829e5cd9c73da4c68ae71dc37460cc07c1
+  metadata.gz: d57a0b689c5f11218c4bb5189c1493646d577718
+  data.tar.gz: eb0a3092834e8416ff3386caf86d13a04ec79371
 SHA512:
-  metadata.gz: 37cbb7cc1895c820d3ca9aced318b7c5fbb862e6e5b7a0473b7767f0a9360e310e6b7d188f4ee07f1a9bfc1657d285b397da52ad37619b88cb30e191a53a1df6
-  data.tar.gz: ac9a90945e9dabe5a62c0b483476a98a504c22c84549f8e9c588c4050fc617ef698bf8c7bb5bb1f28ed9197fd85593dd450b1c819f9d03ee94b2ce7bf0d941e0
+  metadata.gz: f641884fc5ab6c4764c5c252cd530fbf1cb8583871aef9a27e73421744cf3069f413bf253ee8d12a4831d25c73e9502a05c9415319293c7c70267672cf6a1aaa
+  data.tar.gz: 469a792ff28013ecd4177c91831bf9e19bc28140a67fdbb6add44d048d971c7aaa4b3b7f52b2e124ad63059844e390f2ac4739b94ea558693239e7fa2560b1e8

data/lib/gillbus/helpers/fields.rb

@@ -41,8 +41,8 @@ class Gillbus
       @fields ||= []
     end
 
-    def field(name, type=:string, key: name.to_s.upcase)
-      field_definitions << {name: name, key: key, type: type}
+    def field(name, type=:string, key: name.to_s.upcase, root: nil)
+      field_definitions << {name: name, key: key, type: type, root: root}
       attr_accessor name
     end
 

data/lib/gillbus/helpers/parser.rb

@@ -15,10 +15,12 @@ class Gillbus
     end
 
     def parse
-      fields.each do |name:, key:, type:|
+      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]
           else
             doc[key]
           end
@@ -97,4 +99,4 @@ class Gillbus
     end
 
   end
-end
+end

data/lib/gillbus/structs/trip.rb

@@ -146,6 +146,8 @@ class Gillbus
 
     field :segments, [Segment], key: "SEGMENT"
 
+    field :options, [:string], root: 'OPTIONS', key: 'OPTION'
+
     def start_at
       ActiveSupport::TimeZone["Europe/Kiev"].parse("#{data["START_DATE"]} #{data["START_TIME"]}")
     end

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = "0.14.3"
+  VERSION = "0.14.4"
 end

data/test/responses/searchTrips-prod.xml

@@ -97,6 +97,10 @@
             <DISPATCH_TIME/>
             <CHECK_POINT>false</CHECK_POINT>
         </POINT>
+        <OPTIONS>
+            <OPTION>Кофе</OPTION>
+            <OPTION>Wi-Fi</OPTION>
+        </OPTIONS>
     </TRIP>
     <TRIP>
         <ID>-3986171261205069729</ID>

data/test/search_trips_test.rb

@@ -80,6 +80,7 @@ class SearchTripsResponseTest < Minitest::Test
     assert_equal 'Europe/Moscow', response.trips.first.start_timezone
     assert_equal 'Europe/Moscow', response.trips.first.end_timezone
     assert_equal true, response.trips.first.fake_time_in_road
+    assert_equal ['Кофе', 'Wi-Fi'], response.trips.first.options
   end
 
   def test_faking_response

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml