gillbus 0.11.0

data/lib/gillbus/tickets_booking.rb

@@ -0,0 +1,182 @@
+class Gillbus
+  module TicketsBooking
+
+    Gillbus.register self, :tickets_booking
+
+    class Request < BaseRequest
+
+      def path; '/online2/ticketsBooking' end
+
+      # orderId
+      # Сгенерированный уникальный ИД заказа.
+      attr_accessor :order_id
+
+      # terminalNumber (не обязательный)
+      # Номер терминала, с которого выполняется команда.
+      attr_accessor :terminal_number
+
+      # applyDiscount (не обязательный)
+      # Если при поиске рейсов не были указаны скидочные данные но есть возможность их применить при оформлении отложенной продажи (параметр CAN_DISCOUNT = true при поиске рейсов), то для применения скидочных данных необходимо этот параметр установить в true. Если на оформляемый рейс действуют скидки, то стоимость тарифа может быть пересчитана по переданным данным в параметрах passenger(0 - N)studentTicket, passenger(0 - N)birthday, passenger(0 - N)ISIC. По умолчанию false (скидочные данные не применяются ).
+      attr_accessor :apply_discount
+
+      # paymentMethod (не обязательный)
+      # Способ оплаты заказа.
+      attr_accessor :payment_method
+
+      # 1 – наличный;
+      METHOD_CASH = 1
+      # 2 – кредитной карточкой;
+      METHOD_CARD = 2
+      # 3 – безналичный;
+      METHOD_NOCASH = 3
+      # 4 – сервисный;
+      METHOD_SERVICE = 4
+      # 5 – эквайринг.
+      METHOD_ACQUIRING = 5
+      # По умолчанию 3.
+
+      # phoneNumber (не обязательный)
+      # Номер телефона пассажира.
+      attr_accessor :phone_number
+
+      # mailAddress (не обязательный)
+      # Адрес электронной почты пассажира. Если указан, то на него будет отправлен маршрутный лист соответствующий форме утвержденной с перевозчиком.
+      attr_accessor :mail_address
+
+      # note (не обязательный)
+      # Примечания.
+      attr_accessor :note
+
+      # ticketLocale (не обязательный)
+      # Язык, на котором будут возвращены данные для печати билета. Если язык не передан или ошибочный, то будет установлен язык переданный при вызове команды входа в систему.
+      # rus – русский;
+      # ukr – украинский; lat – английский.
+      attr_accessor :ticket_locale
+
+      # список пассажиров
+      attr_accessor :passengers
+
+      # отправлять ли email с листом бронирования пользователю
+      attr_accessor :send_to
+
+      def params
+        pax = (passengers || []).map.with_index { |p, i| Passenger.new(p).params("passenger#{i}") }.reduce({}, :merge)
+        compact(
+          orderId: order_id,
+          terminalNumber: terminal_number,
+          applyDiscount: apply_discount,
+          paymentMethod: payment_method,
+          phoneNumber: phone_number,
+          mailAddress: mail_address,
+          note: note,
+          ticketLocale: translated_locale(ticket_locale),
+          sendTo: send_to,
+          **pax
+        )
+
+      end
+
+      # not a request, just a record for BookTickets
+      class Passenger < BaseRequest
+
+        # passenger0studentTicket... passengerNstudentTicket (не обязательный)
+        # Номер студенческого билета пассажира с порядковым номером 0... N.
+
+        # passenger0birthday... passengerNbirthday (обязательный для авиаперевозки)
+        # Дата рождения пассажира с порядковым номером 0...N.
+        attr_accessor :birthday
+
+        # passenger0ISIC...passengerNISIC (не обязательный)
+        # Номер ISIC пассажира с порядковым номером 0...N.
+        attr_accessor :isic
+
+        # passenger0firstName... passengerNfirstName (не обязательный)
+        # Имя пассажира с порядковым номером 0...N.
+        attr_accessor :first_name
+
+        # passenger0lastName... passengerNlastName (не обязательный)
+        # Фамилия пассажира с порядковым номером 0...N.
+        attr_accessor :last_name
+
+        # passenger0middleName... passengerNmiddleName (не обязательный)
+        # Отчество пассажира с порядковым номером 0...N.
+        attr_accessor :second_name
+
+        # passenger0tariffShortName... passengerNtariffShortName (не обязательный)
+        # Краткое обозначение тарифа, полученное при поиске рейсов в списке тарифов, по указанным passenger0studentTicket, passenger0birthday, passenger0ISIC.
+        attr_accessor :tariff_short_name
+
+        # passenger0tariffCost... passengerNtariffCost (не обязательный)
+        # Стоимость тарифа, полученное при поиске рейсов в списке тарифов, с кратким обозначением passenger0tariffShortName с порядковым номером 0...N.
+        attr_accessor :tariff_cost
+
+        # passenger0documentType... passengerNdocumentType (не обязательный)
+        # Тип удостоверения личности (для определения типа документа, номер которого передан в параметре passport).
+        # Возможные значения:
+        # :passport              1 - паспорт
+        # :military_card         2 - военный билет
+        # :foreign_document      3 - иностранный документ
+        # :foreign_passport      4 - заграничный паспорт
+        # :seaman_passport       6 - паспорт моряка
+        # :birth_certificate     7 - свидетельство о рождении
+        # :ussr_passport         8 - паспорт формы СССР
+        attr_accessor :document_type
+
+        # passenger0passport... passengerNpassport (обязательный для авиаперевозки)
+        # Паспортные данные пассажира с порядковым номером 0...N.
+        attr_accessor :passport
+
+        # passenger0passportExpireDate... passengerNpassportExpireDate (обязательный для авиаперевозки)
+        # Дата окончания действия паспорта пассажира с порядковым номером 0...N.
+        attr_accessor :passport_expire_date
+
+        # passenger0citizenship... passengerNcitizenship (обязательный для авиаперевозки)
+        # Гражданство пассажира с порядковым номером 0...N. 2-х буквенный код страны, пример, Украина – UA.
+        attr_accessor :citizenship
+
+        # passenger0gender... passengerNgender (обязательный для авиаперевозки)
+        # Пол пассажира с порядковым номером 0...N. M – мужской, F – женский.
+        attr_accessor :gender
+
+        # passenger0discountValue... passengerNdiscountValue (не обязательный)
+        # Величина скидки в валюте продажи для пассажира с порядковым номером 0…N.
+        attr_accessor :discount
+
+        def params(prefix="")
+          compact(
+            birthday: date(birthday),
+            ISIC: isic,
+            firstName: first_name,
+            lastName: last_name,
+            middleName: second_name,
+            tariffShortName: tariff_short_name,
+            tariffCost: tariff_cost,
+            documentType: document_type_to_int(document_type),
+            passport: passport,
+            passportExpireDate: passport_expire_date,
+            citizenship: citizenship,
+            gender: gender,
+            discountValue: discount.to_f.to_s,
+          ).map {|k, v| [:"#{prefix}#{k}", v] }.to_h
+        end
+
+        def document_type_to_int(value)
+          {
+            passport: 1,
+            military_card: 2,
+            foreign_document: 3,
+            foreign_passport: 4,
+            seaman_passport: 6,
+            birth_certificate: 7,
+            ussr_passport: 8,
+          }[value.try(:to_sym)]
+        end
+      end
+    end
+
+    class Response < BaseResponse
+      field :tickets, [Ticket], key: 'TICKET'
+    end
+
+  end
+end

data/lib/gillbus/unlock_seats.rb

@@ -0,0 +1,15 @@
+class Gillbus
+  module UnlockSeats
+
+    Gillbus.register self, :unlock_seats
+
+    class Request < BaseRequest
+      def path; '/online2/unlockSeats' end
+    end
+
+    # TODO: is it empty?
+    class Response < BaseResponse
+    end
+
+  end
+end

data/lib/gillbus/version.rb

@@ -0,0 +1,3 @@
+class Gillbus
+  VERSION = "0.11.0"
+end

data/lib/gillbus.rb

@@ -0,0 +1,86 @@
+require "gillbus/version"
+require "faraday"
+
+class Gillbus
+
+  # driver: e.g. Faraday.new(url: 'http://demo.gillbus.com')
+  def initialize(driver:, session_id: nil)
+    @driver = driver
+    @session_id = session_id
+  end
+
+  # Faraday instance
+  attr_reader :driver
+  # JSESSIONID сессии API gillbus
+  attr_accessor :session_id
+
+  def login(password:, locale: nil)
+    response = session_login password: password, locale: locale
+    self
+  end
+
+  def self.register klass, method_name
+    define_method method_name do |*args|
+      request_class = klass::Request
+      response_class = klass::Response
+      request = request_class.new(*args)
+      headers = {'Cookie' => "JSESSIONID=#{session_id}"} if session_id
+      http_response = driver.post( request.path, request.params, headers )
+      result = response_class.parse_string(http_response.body.force_encoding('utf-8'))
+      if cookie_string = http_response.headers["Set-Cookie"]
+        returned_session_id = CGI::Cookie.parse(cookie_string)['JSESSIONID'].first
+        self.session_id = returned_session_id
+      end
+      result.session_id = session_id
+      result
+    end
+  end
+
+  require 'monetize'
+  require 'gillbus/helpers/fields'
+  require 'gillbus/helpers/update_attrs'
+  require 'gillbus/helpers/parser'
+
+  require 'gillbus/structs/point'
+  require 'gillbus/structs/tariff'
+  require 'gillbus/structs/segment'
+  require 'gillbus/structs/timetable_segment'
+  require 'gillbus/structs/trip'
+  require 'gillbus/structs/timetable_trip'
+
+  require 'gillbus/structs/commission'
+  require 'gillbus/structs/return_cause'
+  require 'gillbus/structs/ticket'
+
+  require 'gillbus/structs/seat'
+  require 'gillbus/structs/item'
+
+  require 'gillbus/parse_error'
+  require 'gillbus/base_request'
+  require 'gillbus/base_response'
+
+  require 'gillbus/structs/passenger_discount'
+
+  require 'gillbus/session_login'
+  require 'gillbus/get_countries'
+  require 'gillbus/get_cities'
+  require 'gillbus/get_all_cities'
+  require 'gillbus/get_time_table'
+  require 'gillbus/get_dates_new'
+  require 'gillbus/search_trips'
+  require 'gillbus/get_trips'
+  require 'gillbus/get_trip_seats'
+  require 'gillbus/get_required_fields'
+  require 'gillbus/lock_seats'
+  require 'gillbus/unlock_seats'
+  require 'gillbus/tickets_booking'
+  require 'gillbus/reserve_tickets'
+  require 'gillbus/buy_booking'
+  require 'gillbus/buy_tickets'
+  require 'gillbus/cancel_order'
+  require 'gillbus/get_order_ticket'
+  require 'gillbus/find_order'
+  require 'gillbus/get_order_status'
+  require 'gillbus/logout'
+
+end

data/script/example_booking.rb

@@ -0,0 +1,82 @@
+#!/usr/bin/env ruby
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gillbus'
+require 'pry'
+require 'logger'
+require 'securerandom'
+
+GILLBUS_SERVER = "http://mdc.demo.gillbus.com"
+GILLBUS_PASSWORD = "3DVG/x1AOk+xwNlAEXytMCxZMsb73r39DOg97k8b8c4YaMrlOar071diefS0IyZT"
+
+driver = Faraday.new(url: GILLBUS_SERVER) { |c|
+  c.response :logger, Logger.new(STDOUT), bodies: true
+  c.request :url_encoded
+  c.adapter Faraday.default_adapter
+}
+
+g = Gillbus.new(driver: driver).login(
+  password: GILLBUS_PASSWORD,
+  locale: :ru
+)
+
+# getCities
+
+cities = g.get_cities.cities
+
+kiiv_id = cities.find {|c| c.name == "Киев" }.id
+lviv_id = cities.find {|c| c.name == "Львов" }.id
+
+
+# searchTrips
+
+tomorrow = Date.today + 1
+trips = g.search_trips(
+  start_city_id: kiiv_id,
+  end_city_id: lviv_id,
+  start_date_search: tomorrow,
+  ticket_count: 2,
+  passengers: [
+    { birthday: Date.new(1983,4,19) },
+    { birthday: Date.new(2007,10,15) },
+  ]
+).trips
+
+trip_id = trips.first.id
+
+# lockSeats
+
+tl = g.lock_seats(trip_id: trip_id).time_limit
+
+# ticketsBooking
+order_id = SecureRandom.uuid
+
+puts "making order: #{order_id}"
+passengers = [
+  { first_name: 'Иван', last_name: 'Иванов', passport: "123" },
+  { first_name: 'Петр', last_name: 'Петров', passport: "123" }
+]
+
+tb = g.tickets_booking(
+  order_id: order_id,
+  mail_address: 'invanov@mail.ru',
+  note: 'test',
+  passengers: passengers
+)
+
+# relogging again
+
+g = Gillbus.new(driver: driver).login(password: GILLBUS_PASSWORD, locale: :ru)
+
+# buyTickets
+puts "confirmation: " + g.buy_tickets(order_id: order_id).ticket.confirmation.inspect
+
+# getOrderTicket
+ot = g.get_order_ticket order_id: order_id, base64: true
+
+filename = order_id + ".pdf"
+puts "saving " + filename
+File.open filename, 'wb' do |f|
+  f << ot.ticket
+end
+

data/script/example_booking_with_segments.rb

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gillbus'
+require 'pry'
+require 'logger'
+require 'securerandom'
+
+GILLBUS_SERVER = "http://mdc.demo.gillbus.com"
+GILLBUS_PASSWORD = "3DVG/x1AOk+xwNlAEXytMCxZMsb73r39DOg97k8b8c4YaMrlOar071diefS0IyZT"
+
+driver = Faraday.new(url: GILLBUS_SERVER) { |c|
+  c.response :logger, Logger.new(STDOUT), bodies: true
+  c.request :url_encoded
+  c.adapter Faraday.default_adapter
+}
+
+g = Gillbus.new(driver: driver).login(
+  password: GILLBUS_PASSWORD,
+  locale: :ru
+)
+
+# getCities
+
+cities = g.get_cities.cities
+
+kiiv_id = cities.find {|c| c.name == "Киев" }.id
+praga_id = cities.find {|c| c.name == "Прага" }.id
+
+
+# searchTrips
+
+tomorrow = Date.today + 1
+trips = g.search_trips(
+  start_city_id: kiiv_id,
+  end_city_id: praga_id,
+  start_date_search: tomorrow,
+  ticket_count: 2,
+  selected_modes: [ :bus, :connections ],
+  ],
+).trips
+
+trip_id = trips.find { |trip| trip.segments.present? }.id
+
+# getTripSeats
+
+seat_map = g.get_trip_seats(trip_id: trip_id)
+selected_seat_ids = seat_map.segments.map do |k, v|
+  [k, v.select(&:free?).sample(2).map(&:id)]
+end.to_h
+
+# lockSeats
+
+tl = g.lock_seats(
+  trip_id: trip_id,
+  segments_seat_ids: selected_seat_ids,
+).time_limit
+
+# ticketsBooking
+order_id = SecureRandom.uuid
+
+puts "making order: #{order_id}"
+passengers = [
+  { first_name: 'Иван', last_name: 'Иванов', passport: "123" },
+  { first_name: 'Петр', last_name: 'Петров', passport: "123" }
+]
+
+tb = g.tickets_booking(
+  order_id: order_id,
+  mail_address: 'ivan@mail.ru',
+  note: 'test',
+  passengers: passengers
+)
+
+# relogging again
+
+g = Gillbus.new(driver: driver).login(password: GILLBUS_PASSWORD, locale: :ru)
+
+# buyTickets
+puts "confirmation: " + g.buy_tickets(order_id: order_id).ticket.confirmation.inspect
+
+# getOrderTicket
+ot = g.get_order_ticket order_id: order_id, base64: true
+
+filename = order_id + ".pdf"
+puts "saving " + filename
+File.open filename, 'wb' do |f|
+  f << ot.ticket
+end
+

data/script/example_canceling_booking.rb

@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gillbus'
+require 'pry'
+require 'logger'
+require 'securerandom'
+
+GILLBUS_SERVER = "http://mdc.demo.gillbus.com"
+GILLBUS_PASSWORD = "3DVG/x1AOk+xwNlAEXytMCxZMsb73r39DOg97k8b8c4YaMrlOar071diefS0IyZT"
+
+driver = Faraday.new(url: GILLBUS_SERVER) { |c|
+  c.response :logger, Logger.new(STDOUT), bodies: true
+  c.request :url_encoded
+  c.adapter Faraday.default_adapter
+}
+
+g = Gillbus.new(driver: driver).login(
+  password: GILLBUS_PASSWORD,
+  locale: :ru
+)
+
+# getCities
+
+cities = g.get_cities.cities
+
+kiiv_id = cities.find {|c| c.name == "Киев" }.id
+lviv_id = cities.find {|c| c.name == "Львов" }.id
+
+
+# searchTrips
+
+tomorrow = Date.today + 1
+trips = g.search_trips(
+  start_city_id: kiiv_id,
+  end_city_id: lviv_id,
+  start_date_search: tomorrow,
+  ticket_count: 2
+).trips
+
+trip_id = trips.first.id
+
+# lockSeats
+
+tl = g.lock_seats(trip_id: trip_id).time_limit
+
+# ticketsBooking
+order_id = SecureRandom.uuid
+
+puts "making order: #{order_id}"
+passengers = [
+  { first_name: 'Иван', last_name: 'Иванов' },
+  { first_name: 'Петр', last_name: 'Петров' }
+]
+
+tb = g.tickets_booking(
+  order_id: order_id,
+  mail_address: 'ivan@mail.ru',
+  note: 'test',
+  passengers: passengers
+)
+
+# отмена отложенной продажи
+order_number = tb.tickets.first.order_number
+canceling = g.cancel_order(order_number: order_number, cancel_reason: 'no_reason')
+puts "canceling: " + canceling.inspect
+puts "success? " + canceling.order_cancel.confirmation.inspect

data/script/example_canceling_reservation.rb

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gillbus'
+require 'pry'
+require 'securerandom'
+
+GILLBUS_SERVER = "http://mdc.demo.gillbus.com"
+GILLBUS_PASSWORD = "3DVG/x1AOk+xwNlAEXytMCxZMsb73r39DOg97k8b8c4YaMrlOar071diefS0IyZT"
+
+require 'logger'
+
+driver = Faraday.new(url: GILLBUS_SERVER) { |c|
+  c.response :logger, Logger.new(STDOUT), bodies: true
+  c.request :url_encoded
+  c.adapter Faraday.default_adapter
+}
+
+g = Gillbus.new(driver: driver).login(
+  password: GILLBUS_PASSWORD,
+  locale: :ru
+)
+
+# getCities
+
+cities = g.get_cities.cities
+
+kiiv_id = cities.find {|c| c.name == "Киев" }.id
+odessa_id = cities.find {|c| c.name == "Львов" }.id
+
+
+# searchTrips
+
+search_date = Date.today + 7
+trips = g.search_trips(
+  start_city_id: kiiv_id,
+  end_city_id: odessa_id,
+  start_date_search: search_date,
+  ticket_count: 2,
+  selected_modes: 1,
+).trips
+
+trip_id = trips.find { |trip| trip.reservation_enabled == true }.id
+
+# lockSeats
+
+tl = g.lock_seats(trip_id: trip_id).time_limit
+
+# ticketsBooking
+order_id = SecureRandom.uuid
+
+puts "making order: #{order_id}"
+passengers = [
+  { first_name: 'Иван', last_name: 'Иванов' },
+  { first_name: 'Петр', last_name: 'Петров' }
+]
+
+rt = g.reserve_tickets(
+  order_id: order_id,
+  mail_address: 'ivan@mail.ru',
+  note: 'test',
+  passengers: passengers
+)
+
+# отмена брони
+order_number = rt.tickets.first.order_number
+canceling = g.cancel_order(order_number: order_number, cancel_reason: 'no_reason')
+puts "canceling: " + canceling.inspect
+puts "success? " + canceling.order_cancel.confirmation.inspect

data/script/example_reservation.rb

@@ -0,0 +1,88 @@
+#!/usr/bin/env ruby
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gillbus'
+require 'pry'
+require 'securerandom'
+
+GILLBUS_SERVER = "http://mdc.demo.gillbus.com"
+GILLBUS_PASSWORD = "3DVG/x1AOk+xwNlAEXytMCxZMsb73r39DOg97k8b8c4YaMrlOar071diefS0IyZT"
+
+require 'logger'
+
+driver = Faraday.new(url: GILLBUS_SERVER) { |c|
+  c.response :logger, Logger.new(STDOUT), bodies: true
+  c.request :url_encoded
+  c.adapter Faraday.default_adapter
+}
+
+g = Gillbus.new(driver: driver).login(
+  password: GILLBUS_PASSWORD,
+  locale: :ru
+)
+
+# getCities
+
+cities = g.get_cities.cities
+
+kiiv_id = cities.find {|c| c.name == "Киев" }.id
+lviv_id = cities.find {|c| c.name == "Львов" }.id
+
+
+# searchTrips
+
+search_date = Date.today + 7
+trips = g.search_trips(
+  start_city_id: kiiv_id,
+  end_city_id: lviv_id,
+  start_date_search: search_date,
+  ticket_count: 2,
+  selected_modes: 1,
+).trips
+
+trip_id = trips.find { |trip| trip.reservation_enabled == true }.id
+
+# lockSeats
+
+tl = g.lock_seats(
+  trip_id: trip_id,
+).time_limit
+
+# ticketsBooking
+order_id = SecureRandom.uuid
+
+puts "making order: #{order_id}"
+passengers = [
+  { first_name: 'Иван', last_name: 'Иванов' },
+  { first_name: 'Петр', last_name: 'Петров' }
+]
+
+rt = g.reserve_tickets(
+  order_id: order_id,
+  mail_address: 'ivan@mail.ru',
+  note: 'test',
+  passengers: passengers
+)
+ticket_numbers = rt.tickets.map(&:ticket_number)
+
+# relogging again
+
+g = Gillbus.new(driver: driver).login(password: GILLBUS_PASSWORD, locale: :ru)
+
+# buyBooking
+response = g.buy_booking(
+  ticket_count: 2,
+  ticket_numbers: ticket_numbers,
+  order_ids: [order_id, order_id]
+)
+p "confirmation: " + response.ticket.confirmation.inspect
+p "ticket_numbers: " + response.ticket.position_numbers.inspect
+
+# getOrderTicket
+ot = g.get_order_ticket order_id: order_id, base64: true
+
+filename = order_id + ".pdf"
+puts "saving " + filename
+File.open filename, 'wb' do |f|
+  f << ot.ticket
+end