gillbus-v2 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f5f66f49c4de6dce6487cd0cf702d49073ca1a870d1097599d5caaeef798c9
-  data.tar.gz: b413b3fb9ad9e346742bbf2566ffd6b81a2cc9f4e189b60a03d4f106eb954739
+  metadata.gz: fde634f5c1184079c313bebd9276de7096506f6e96c77459428cd46ff4018e95
+  data.tar.gz: 7b884d4a5c28e577181d831eab5208db26047dd96dac3a129bd7a87d6e515fa1
 SHA512:
-  metadata.gz: 1aad4fa134e4e69d6d3e52d9d725768c80e5abeab5055347043ad2eeb488b9506fca7d8b6da7e3b891b1d1398a9e1f098e946804ef0699b2901d8e903e8181b8
-  data.tar.gz: 18c6a257567c09351c22698c97c7376e3b4a9a5d142eeb9caa6c1547de9438f6dc502582048803f5e4cf1234c8d1cb747318ac113d74f3b19549f9193cace3da
+  metadata.gz: 1a5d85ad7349a52c756281bc2bdc13a59742961c20fb749c85f3ca9a095125c69ce710239c69c320a20de432735301ad36b6d5daa457a15cdd9452e00747bc3b
+  data.tar.gz: 728db2cc1e1f622f6b259add6ccd7abbf80c19621ab89f5b6b99283b0ef8de733c93f78e8e74670a54e8b9c08abd6a03910930a83d49e6f92a5d63407a0e0c36

data/README.md

@@ -188,6 +188,36 @@ response.vehicles
 response.points
 ```
 
+### Get trip seats
+
+Example of usage:
+
+```ruby
+response = client.get_trip_seats(
+  trip_id: "123",
+  date: Date.today + 1,
+  back_date: Date.today + 5,
+  passengers_count: 1,
+)
+
+response.seat_maps.each do |seat_map|
+  # Array of all seats
+  seat_map.seats
+
+  # Seats by floor
+  seat_map.floors.each do |floor|
+    # Array of floor seats
+    seat_map.floor_seats(floor)
+    # Array of arrays of seats
+    seat_map.floor_seat_map(floor)
+    # Print the same result
+    puts seat_map.format_seats(floor: floor)
+  end
+end
+```
+
+See `Structs::SegmentSeatMap` for details.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/gillbus/v2.rb

@@ -26,8 +26,11 @@ require "gillbus/v2/structs/trip"
 require "gillbus/v2/structs/carrier"
 require "gillbus/v2/structs/vehicle"
 require "gillbus/v2/structs/point"
+require "gillbus/v2/structs/seat"
+require "gillbus/v2/structs/segment_seat_map"
 
 require "gillbus/v2/responses/base"
 require "gillbus/v2/responses/authenticate"
 require "gillbus/v2/responses/locations"
 require "gillbus/v2/responses/search_trips"
+require "gillbus/v2/responses/trip_seats"

data/lib/gillbus/v2/client.rb

@@ -90,6 +90,17 @@ module Gillbus::V2
       )
     end
 
+    def get_trip_seats(trip_id:, date:, back_date: nil, passengers_count: 1)
+      params = {
+        date: date,
+        back_date: back_date,
+        pass_count: passengers_count,
+      }
+      call_api(:get, "/search/v2/trips/#{trip_id}/seats", params,
+        response_class: Responses::TripSeats,
+      )
+    end
+
     private
 
     def call_api(http_method, url, params, auth_required: true, response_class: Responses::Base)

data/lib/gillbus/v2/responses/trip_seats.rb

@@ -0,0 +1,12 @@
+module Gillbus::V2
+  module Responses
+    class TripSeats < Base
+      def seat_maps
+        @seat_maps ||=
+          (json_body["maps_seat"] || []).map do |item|
+            Structs::SegmentSeatMap.from_raw_data(item)
+          end
+      end
+    end
+  end
+end

data/lib/gillbus/v2/structs/seat.rb

@@ -1,26 +1,16 @@
 module Gillbus::V2
-  # TODO: use in seatmap response or remove
   class Structs::Seat < Structs::Base
     field :id, :string
-    field :number, :string
+    field :number, :string, from: "num"
 
-    field :floor, :integer
-    field :col, :integer
-    field :row, :integer
+    field :seat_type, :string # TODO: Enum
+    field :status, :string # TODO: Enum
 
-    field :seat_class, :string, from: "class"
-
-    field :status, Enum.(
-      "EMPTY",
-      "ORDERED",
-      "BLOCKED",
-      "FREE",
-      "BOOKED",
-      "SALED",
-      "SPESIAL",
-      "REGISTERED",
-      "TECHNICAL",
-      "PRIORITY",
-    )
+    # ярус
+    field :floor, :integer, from: "z"
+    # номер ряда, сверху вниз
+    field :row, :integer, from: "x"
+    # номер места в ряду, слева направо
+    field :col, :integer, from: "y"
   end
 end

data/lib/gillbus/v2/structs/segment_seat_map.rb

@@ -0,0 +1,35 @@
+module Gillbus::V2
+  class Structs::SegmentSeatMap < Structs::Base
+    field :segment_id, :string
+    field :seats, [Structs::Seat], from: "map_seat"
+
+    def floors
+      @floors ||= seats.map(&:floor).uniq
+    end
+
+    def floor_seats(floor)
+      seats.select { |seat| seat.floor == floor }
+    end
+
+    # Array of arrays (see result of #format_seats)
+    def floor_seat_map(floor)
+      floor_seats(floor)
+        .group_by(&:row)
+        .sort_by(&:first)
+        .map do |row, row_seats|
+          # TODO: reverse order?
+          row_seats.sort_by(&:col)
+        end
+    end
+
+    def format_seats(floor:, separator: "  ")
+      rows =
+        floor_seat_map(floor).map do |row_seats|
+          row_seats
+            .map { |seat| "%3s" % seat.number }
+            .join(separator)
+        end
+      rows.join("\n")
+    end
+  end
+end

data/lib/gillbus/v2/structs/trip.rb

@@ -1,6 +1,6 @@
 module Gillbus::V2
   class Structs::Trip < Structs::Base
-    field :id, :integer, from: "trip_id"
+    field :id, :string, from: "trip_id"
     field :direct_segments, [Structs::Segment], from: "direct_trip"
     field :back_segments, [Structs::Segment], from: "back_trip"
   end

data/lib/gillbus/v2/version.rb

@@ -1,5 +1,5 @@
 module Gillbus
   module V2
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gillbus-v2
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Roman Khrebtov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -147,6 +147,7 @@ files:
 - lib/gillbus/v2/responses/base.rb
 - lib/gillbus/v2/responses/locations.rb
 - lib/gillbus/v2/responses/search_trips.rb
+- lib/gillbus/v2/responses/trip_seats.rb
 - lib/gillbus/v2/structs/access_token.rb
 - lib/gillbus/v2/structs/base.rb
 - lib/gillbus/v2/structs/carrier.rb
@@ -162,6 +163,7 @@ files:
 - lib/gillbus/v2/structs/segment.rb
 - lib/gillbus/v2/structs/segment_options.rb
 - lib/gillbus/v2/structs/segment_price.rb
+- lib/gillbus/v2/structs/segment_seat_map.rb
 - lib/gillbus/v2/structs/segment_tariff.rb
 - lib/gillbus/v2/structs/trip.rb
 - lib/gillbus/v2/structs/vehicle.rb