gillbus 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54e47ea904a8755c00a4576845ae6779abea4cc3
-  data.tar.gz: c6d830de157b234b145ae9b130c8152d712b5cee
+  metadata.gz: 6e967c8446ef81abea1d78c2a65b347bf9f9cac7
+  data.tar.gz: 3b6b92154b530f2c0cb9f2cdd1569df04142cecf
 SHA512:
-  metadata.gz: 5a71b4974da670c7ff4a4ca2e63522c81a3835ec7b8eb4a58a0b823bd3b63db1c4cf9ac180776cedef74e6d791e8d3145fe9cd1a5a6013cbae1f90ab1acf61b6
-  data.tar.gz: 1719fa183ae15163244f3d35da7e10be74ba180ffcbddfb6e2d6cef3a71262489eb085077265c97a80eae08aff98666e025e7c5037d982c9b273dea6e2bb059d
+  metadata.gz: b4ecde0f8320dcee976b504543343c3b0790a2d0fd30586fc0ba77dd565b34b0fafbbfe4184f0d8d8930dcc9ae5f2cdd792637f5ff56d371179fe59489164703
+  data.tar.gz: 5c7065a612da886f5c672a47e790ef26be481cd0bb16bed841eeffe08d6953ecaefc0af2042f67394490e9315c034aa035aef85c8f8f36d2e60e7efa6961dda5

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.3.2

data/lib/gillbus/helpers/fields.rb

@@ -15,7 +15,11 @@ class Gillbus
   module Fields
 
     def parser_class
-      @parser_class || Gillbus::Parser
+      if defined? @parser_class
+        @parser_class || Gillbus::Parser
+      else
+        Gillbus::Parser
+      end
     end
 
     def parse(doc, instance=new)

data/lib/gillbus/search_trips.rb

@@ -51,15 +51,24 @@ class Gillbus
       # Количество оформляемых билетов. От 1 до k.
       attr_accessor :ticket_count
 
-      # TODO
       # passenger0studentTicket... passengerNstudentTicket (не обязательный)
       # Номер студенческого билета пассажира с порядковым номером 0... N.
       #
+      # passenger0studentYea... passengerNstudentYear (не обязательный)
+      # Курс, на котором учится пассажир с порядковым номером 0…N, если он студент. Для просчета более выгодной скидки.
+      #
       # passenger0birthday... passengerNbirthday (не обязательный)
       # Дата рождения пассажира с порядковым номером 0...N.
       #
       # passenger0ISIC... passengerNISIC (не обязательный)
       # Номер ISIC пассажира с порядковым номером 0...N.
+
+      # В passengers записывается структура вида
+      # [
+      #   {birthday: ..., student_ticket:..., student_year:..., isic:... },
+      #   {birthday: ..., student_ticket:..., student_year:..., isic:... },
+      # ]
+      # Далее она преобразуется к формату gillbus методом passengers_data
       attr_accessor :passengers
 
       # waitTimeout
@@ -74,7 +83,6 @@ class Gillbus
       attr_accessor :only_branded
 
       def params
-        pax = (passengers || []).map.with_index { |p, i| PassengerDiscount.wrap(p).params("passenger#{i}") }.reduce({}, :merge)
         compact(
           selectedModes:       modes(selected_modes),
           connectionIds:       list(connection_ids),
@@ -88,9 +96,27 @@ class Gillbus
           ticketCount:         ticket_count,
           waitTimeout:         wait_timeout,
           onlyBranded:         bool(only_branded),
-          **pax
+          **passengers_data,
         )
       end
+
+      # В passengers_data преобразуем passengers к виду для передачи в gillbus:
+      #  {
+      #   :passenger0birthday=>"01.01.1990",
+      #   :passenger0studentTicket=>"STUDENTTICKET#1",
+      #   :passenger0studentYear=>1,
+      #   :passenger0ISIC=>"ISIC#1",
+      #   :passenger1birthday=>"02.02.1990",
+      #   :passenger1studentTicket=>"STUDENTTICKET#2",
+      #   :passenger1studentYear=>2,
+      #   :passenger1ISIC=>"ISIC#2"
+      # }
+      def passengers_data
+        (passengers || []).map.with_index do |p, i|
+          PassengerDiscount.wrap(p).params("passenger#{i}")
+        end.reduce({}, :merge)
+      end
+
     end
 
     class Response < BaseResponse

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/lib/gillbus.rb

@@ -15,7 +15,7 @@ class Gillbus
   attr_accessor :session_id
 
   def login(password:, locale: nil)
-    response = session_login password: password, locale: locale
+    session_login password: password, locale: locale
     self
   end
 

data/test/search_trips_test.rb

@@ -6,15 +6,38 @@ class SearchTripsRequestTest < Minitest::Test
     req = Gillbus::SearchTrips::Request.new(
       start_date_search: Date.new(2013, 2, 4),
       selected_modes: [:avia, :connections],
-      round_trip: true
+      round_trip: true,
+      passengers: [
+        {
+          birthday: Date.parse('1990-01-01'),
+          student_ticket: 'STUDENTTICKET#1',
+          student_year: 1,
+          isic: 'ISIC#1',
+        },
+        {
+          birthday: Date.parse('1990-02-02'),
+          student_ticket: 'STUDENTTICKET#2',
+          student_year: 2,
+          isic: 'ISIC#2',
+        }
+      ],
     )
 
-    assert_equal req.params,
-      {
-        startDateSearch: "04.02.2013",
-        selectedModes: "3;8",
-        roundTrip: "1"
-      }
+    expected_params = {
+      startDateSearch: "04.02.2013",
+      selectedModes: "3;8",
+      roundTrip: "1",
+      passenger0birthday: '01.01.1990',
+      passenger0studentTicket: 'STUDENTTICKET#1',
+      passenger0studentYear: 1,
+      passenger0ISIC: 'ISIC#1',
+      passenger1birthday: '02.02.1990',
+      passenger1studentTicket: 'STUDENTTICKET#2',
+      passenger1studentYear: 2,
+      passenger1ISIC: 'ISIC#2',
+    }
+
+    assert_equal expected_params, req.params
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Driver for Gillbus IDS API