seatsio 44.1.0 → 45.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe189e46912b8485396ed4b32277e1a8ea6453142f3eb2e3777698f8cb2c02f9
-  data.tar.gz: f0c9d956828d89578256b032d7e40e715b6c3b0e86b9b512fab96c663d19a9e5
+  metadata.gz: bdd4179789ae397639cc2adeb699ef08bba663c37fad94fd5f7b548288a903f0
+  data.tar.gz: 2bb0b732ffc21d52031c58888433f5378c97c9c86b70753c66b9edc88a0255e9
 SHA512:
-  metadata.gz: 3b60686ec86fd71de14eaeeb22b2986c6ac8ace2e8b02a8d31746bceb5eb79355c1fdf8e0a8ccfd67f2c53953d37502b7afee56fb499061d48e632e53f12d7bf
-  data.tar.gz: 75bf17a7efe3a583dc9ba9934d8437972391b200f52e4815f3eb5121ab4ce0e159feedfd6aa2fba4e1a5f59cec414bfa22210c1315aa9601f613b0f68a93535c
+  metadata.gz: d15e85bef5d066ed46bc0b78e89eea0111ad1d2a9f8b07db6c294b3cd6a4c78cf0423b47e70b780319499d99d027052408a82f4d2586c44decb1ddd53c8462a5
+  data.tar.gz: 65c45a2ffd2260d5ddc72152c43e97acfc1c62fa927d96d66aed92a98072318d7df8ba9d33ad559af5f334e8856c2c0db46b7e4036e3299dc13eb37cdef77ee3

data/.github/workflows/release.yml

@@ -21,6 +21,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - uses: fregante/setup-git-user@v2
       - id: install-zx
         run: npm i -g zx

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    seatsio (44.1.0)
+    seatsio (45.0.0)
       rest-client (~> 2.0, >= 2.0.2)
 
 GEM
@@ -20,7 +20,7 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
-    minitest (5.18.0)
+    minitest (5.18.1)
     minitest-parallel_fork (1.3.0)
       minitest (>= 5.15.0)
     netrc (0.11.0)

data/lib/seatsio/charts.rb

@@ -105,11 +105,6 @@ module Seatsio
       @http_client.post("charts/#{chart_key}/version/draft/actions/publish")
     end
 
-    def save_social_distancing_rulesets(chart_key, rulesets)
-      payload = {"socialDistancingRulesets": rulesets}
-      @http_client.post("charts/#{chart_key}/social-distancing-rulesets", payload)
-    end
-
     def list(chart_filter: nil, tag: nil, expand_events: nil, with_validation: false)
       cursor = Pagination::Cursor.new(Chart, 'charts', @http_client)
       cursor.set_query_param('filter', chart_filter)

data/lib/seatsio/domain.rb

@@ -8,7 +8,7 @@ module Seatsio
 
     attr_reader :id, :key, :status, :name, :published_version_thumbnail_url,
                 :draft_version_thumbnail_url, :events, :tags, :archived,
-                :categories, :validation, :social_distancing_rulesets
+                :categories, :validation
 
     def initialize(data)
       @id = data['id']
@@ -21,21 +21,6 @@ module Seatsio
       @tags = data['tags']
       @archived = data['archived']
       @validation = data['validation']
-      @social_distancing_rulesets = data['socialDistancingRulesets'].map {
-        |key, r| [key, SocialDistancingRuleset.new(r['name'],
-                                                   number_of_disabled_seats_to_the_sides: r['numberOfDisabledSeatsToTheSides'],
-                                                   disable_seats_in_front_and_behind: r['disableSeatsInFrontAndBehind'],
-                                                   disable_diagonal_seats_in_front_and_behind: r['disableDiagonalSeatsInFrontAndBehind'],
-                                                   number_of_disabled_aisle_seats: r['numberOfDisabledAisleSeats'],
-                                                   max_group_size: r['maxGroupSize'],
-                                                   max_occupancy_absolute: r['maxOccupancyAbsolute'],
-                                                   max_occupancy_percentage: r['maxOccupancyPercentage'],
-                                                   one_group_per_table: r['oneGroupPerTable'],
-                                                   fixed_group_layout: r['fixedGroupLayout'],
-                                                   disabled_seats: r['disabledSeats'],
-                                                   enabled_seats: r['enabledSeats'],
-                                                   index: r['index'])]
-      }.to_h
     end
   end
 
@@ -161,16 +146,18 @@ module Seatsio
 
   class Event
 
-    attr_accessor :id, :key, :chart_key, :supports_best_available,
+    attr_accessor :id, :key, :chart_key, :name, :date, :supports_best_available,
                   :table_booking_config, :for_sale_config, :created_on, :updated_on, :channels,
-                  :social_distancing_ruleset_key, :is_top_level_season, :is_partial_season,
+                  :is_top_level_season, :is_partial_season,
                   :is_event_in_season, :top_level_season_key,
-                  :social_distancing_ruleset_key, :object_categories, :categories
+                  :object_categories, :categories
 
     def initialize(data)
       @id = data['id']
       @key = data['key']
       @chart_key = data['chartKey']
+      @name = data['name']
+      @date = Date.iso8601(data['date']) if data['date']
       @supports_best_available = data['supportsBestAvailable']
       @table_booking_config = TableBookingConfig::from_json(data['tableBookingConfig'])
       @for_sale_config = ForSaleConfig.new(data['forSaleConfig']) if data['forSaleConfig']
@@ -179,7 +166,6 @@ module Seatsio
       @channels = data['channels'].map {
         |d| Channel.new(d['key'], d['name'], d['color'], d['index'], d['objects'])
       } if data['channels']
-      @social_distancing_ruleset_key = data['socialDistancingRulesetKey']
       @is_top_level_season = data['isTopLevelSeason']
       @is_partial_season = data['isPartialSeason']
       @is_event_in_season = data['isEventInSeason']
@@ -391,7 +377,7 @@ module Seatsio
                 :category_key, :entrance, :object_type, :hold_token, :category_label,
                 :ticket_type, :num_booked, :num_free, :num_held, :for_sale, :section,
                 :is_accessible, :is_companion_seat, :has_restricted_view, :displayed_object_type,
-                :left_neighbour, :right_neighbour, :is_available, :is_disabled_by_social_distancing, :channel,
+                :left_neighbour, :right_neighbour, :is_available, :channel,
                 :book_as_a_whole, :distance_to_focal_point, :holds, :num_seats
 
     def initialize(data)
@@ -420,7 +406,6 @@ module Seatsio
       @left_neighbour = data['leftNeighbour']
       @right_neighbour = data['rightNeighbour']
       @is_available = data['isAvailable']
-      @is_disabled_by_social_distancing = data['isDisabledBySocialDistancing']
       @channel = data['channel']
       @book_as_a_whole = data['bookAsAWhole']
       @distance_to_focal_point = data['distanceToFocalPoint']
@@ -578,67 +563,4 @@ module Seatsio
     end
     object_details
   end
-
-  class SocialDistancingRuleset
-    attr_reader :name, :number_of_disabled_seats_to_the_sides, :disable_seats_in_front_and_behind,
-                :disable_diagonal_seats_in_front_and_behind, :number_of_disabled_aisle_seats, :max_group_size, :max_occupancy_absolute,
-                :max_occupancy_percentage, :one_group_per_table, :fixed_group_layout, :disabled_seats, :enabled_seats, :index
-
-    def initialize(name, number_of_disabled_seats_to_the_sides: 0, disable_seats_in_front_and_behind: false, disable_diagonal_seats_in_front_and_behind: false,
-                   number_of_disabled_aisle_seats: 0, max_group_size: 0, max_occupancy_absolute: 0, max_occupancy_percentage: 0, one_group_per_table: false,
-                   fixed_group_layout: false, disabled_seats: [], enabled_seats: [], index: 0)
-      @name = name
-      @number_of_disabled_seats_to_the_sides = number_of_disabled_seats_to_the_sides
-      @disable_seats_in_front_and_behind = disable_seats_in_front_and_behind
-      @disable_diagonal_seats_in_front_and_behind = disable_diagonal_seats_in_front_and_behind
-      @number_of_disabled_aisle_seats = number_of_disabled_aisle_seats
-      @max_group_size = max_group_size
-      @max_occupancy_absolute = max_occupancy_absolute
-      @max_occupancy_percentage = max_occupancy_percentage
-      @one_group_per_table = one_group_per_table
-      @fixed_group_layout = fixed_group_layout
-      @disabled_seats = disabled_seats
-      @enabled_seats = enabled_seats
-      @index = index
-    end
-
-    def self.fixed(name, disabled_seats: [], index: 0)
-      SocialDistancingRuleset.new(name, index: index, disabled_seats: disabled_seats, fixed_group_layout: true)
-    end
-
-    def self.rule_based(name, number_of_disabled_seats_to_the_sides: 0, disable_seats_in_front_and_behind: false, disable_diagonal_seats_in_front_and_behind: false,
-                        number_of_disabled_aisle_seats: 0, max_group_size: 0, max_occupancy_absolute: 0, max_occupancy_percentage: 0, one_group_per_table: false,
-                        disabled_seats: [], enabled_seats: [], index: 0)
-      SocialDistancingRuleset.new(name,
-                                  number_of_disabled_seats_to_the_sides: number_of_disabled_seats_to_the_sides,
-                                  disable_seats_in_front_and_behind: disable_seats_in_front_and_behind,
-                                  disable_diagonal_seats_in_front_and_behind: disable_diagonal_seats_in_front_and_behind,
-                                  number_of_disabled_aisle_seats: number_of_disabled_aisle_seats,
-                                  max_group_size: max_group_size,
-                                  max_occupancy_absolute: max_occupancy_absolute,
-                                  max_occupancy_percentage: max_occupancy_percentage,
-                                  one_group_per_table: one_group_per_table,
-                                  fixed_group_layout: false,
-                                  disabled_seats: disabled_seats,
-                                  enabled_seats: enabled_seats,
-                                  index: index)
-    end
-
-    def == (other)
-      name == other.name &&
-        number_of_disabled_seats_to_the_sides == other.number_of_disabled_seats_to_the_sides &&
-        disable_seats_in_front_and_behind == other.disable_seats_in_front_and_behind &&
-        disable_diagonal_seats_in_front_and_behind == other.disable_diagonal_seats_in_front_and_behind &&
-        number_of_disabled_aisle_seats == other.number_of_disabled_aisle_seats &&
-        max_group_size == other.max_group_size &&
-        max_occupancy_absolute == other.max_occupancy_absolute &&
-        max_occupancy_percentage == other.max_occupancy_percentage &&
-        one_group_per_table == other.one_group_per_table &&
-        fixed_group_layout == other.fixed_group_layout &&
-        disabled_seats == other.disabled_seats &&
-        enabled_seats == other.enabled_seats &&
-        index == other.index
-    end
-  end
-
 end

data/lib/seatsio/events/change_object_status_request.rb

@@ -1,4 +1,4 @@
-def create_change_object_status_request(object_or_objects, status, hold_token, order_id, event_key_or_keys, keep_extra_data, ignore_channels, channel_keys, ignore_social_distancing, allowed_previous_statuses, rejected_previous_statuses)
+def create_change_object_status_request(object_or_objects, status, hold_token, order_id, event_key_or_keys, keep_extra_data, ignore_channels, channel_keys, allowed_previous_statuses, rejected_previous_statuses)
   result = {}
   result[:objects] = normalize(object_or_objects)
   result[:status] = status
@@ -12,7 +12,6 @@ def create_change_object_status_request(object_or_objects, status, hold_token, o
   result[:keepExtraData] = keep_extra_data if keep_extra_data != nil
   result[:ignoreChannels] = ignore_channels if ignore_channels != nil
   result[:channelKeys] = channel_keys if channel_keys != nil
-  result[:ignoreSocialDistancing] = ignore_social_distancing if ignore_social_distancing != nil
   result[:allowedPreviousStatuses] = allowed_previous_statuses if allowed_previous_statuses != nil
   result[:rejectedPreviousStatuses] = rejected_previous_statuses if rejected_previous_statuses != nil
   result

data/lib/seatsio/events.rb

@@ -18,10 +18,10 @@ module Seatsio
       @channels = ChannelsClient.new(@http_client)
     end
 
-    def create(chart_key: nil, event_key: nil, table_booking_config: nil, social_distancing_ruleset_key: nil, object_categories: nil, categories: nil)
+    def create(chart_key: nil, event_key: nil, name: nil, date: nil, table_booking_config: nil, object_categories: nil, categories: nil)
       payload = build_event_request(chart_key: chart_key, event_key: event_key,
+                                    name: name, date: date,
                                     table_booking_config: table_booking_config,
-                                    social_distancing_ruleset_key: social_distancing_ruleset_key,
                                     object_categories: object_categories, categories: categories)
       response = @http_client.post("events", payload)
       Event.new(response)
@@ -33,12 +33,13 @@ module Seatsio
       Events.new(response).events
     end
 
-    def update(key:, chart_key: nil, event_key: nil, table_booking_config: nil, social_distancing_ruleset_key: nil, object_categories: nil, categories: nil)
+    def update(key:, chart_key: nil, event_key: nil, name: nil, date: nil, table_booking_config: nil, object_categories: nil, categories: nil)
       payload = build_event_request(
         chart_key: chart_key,
         event_key: event_key,
+        name: name,
+        date: date,
         table_booking_config: table_booking_config,
-        social_distancing_ruleset_key: social_distancing_ruleset_key,
         object_categories: object_categories,
         categories: categories)
       @http_client.post("/events/#{key}", payload)
@@ -69,12 +70,12 @@ module Seatsio
       response
     end
 
-    def book(event_key_or_keys, object_or_objects, hold_token: nil, order_id: nil, keep_extra_data: nil, ignore_channels: nil, channel_keys: nil, ignore_social_distancing: nil)
-      self.change_object_status(event_key_or_keys, object_or_objects, Seatsio::EventObjectInfo::BOOKED, hold_token: hold_token, order_id: order_id, keep_extra_data: keep_extra_data, ignore_channels: ignore_channels, channel_keys: channel_keys, ignore_social_distancing: ignore_social_distancing)
+    def book(event_key_or_keys, object_or_objects, hold_token: nil, order_id: nil, keep_extra_data: nil, ignore_channels: nil, channel_keys: nil)
+      self.change_object_status(event_key_or_keys, object_or_objects, Seatsio::EventObjectInfo::BOOKED, hold_token: hold_token, order_id: order_id, keep_extra_data: keep_extra_data, ignore_channels: ignore_channels, channel_keys: channel_keys)
     end
 
-    def change_object_status(event_key_or_keys, object_or_objects, status, hold_token: nil, order_id: nil, keep_extra_data: nil, ignore_channels: nil, channel_keys: nil, ignore_social_distancing: nil, allowed_previous_statuses: nil, rejected_previous_statuses: nil)
-      request = create_change_object_status_request(object_or_objects, status, hold_token, order_id, event_key_or_keys, keep_extra_data, ignore_channels, channel_keys, ignore_social_distancing, allowed_previous_statuses, rejected_previous_statuses)
+    def change_object_status(event_key_or_keys, object_or_objects, status, hold_token: nil, order_id: nil, keep_extra_data: nil, ignore_channels: nil, channel_keys: nil, allowed_previous_statuses: nil, rejected_previous_statuses: nil)
+      request = create_change_object_status_request(object_or_objects, status, hold_token, order_id, event_key_or_keys, keep_extra_data, ignore_channels, channel_keys, allowed_previous_statuses, rejected_previous_statuses)
       request[:params] = {
         :expand => 'objects'
       }
@@ -91,8 +92,8 @@ module Seatsio
       ChangeObjectStatusInBatchResult.new(response).results
     end
 
-    def hold(event_key_or_keys, object_or_objects, hold_token, order_id: nil, keep_extra_data: nil, ignore_channels: nil, channel_keys: nil, ignore_social_distancing: nil)
-      change_object_status(event_key_or_keys, object_or_objects, Seatsio::EventObjectInfo::HELD, hold_token: hold_token, order_id: order_id, keep_extra_data: keep_extra_data, ignore_channels: ignore_channels, channel_keys: channel_keys, ignore_social_distancing: ignore_social_distancing)
+    def hold(event_key_or_keys, object_or_objects, hold_token, order_id: nil, keep_extra_data: nil, ignore_channels: nil, channel_keys: nil)
+      change_object_status(event_key_or_keys, object_or_objects, Seatsio::EventObjectInfo::HELD, hold_token: hold_token, order_id: order_id, keep_extra_data: keep_extra_data, ignore_channels: ignore_channels, channel_keys: channel_keys)
     end
 
     def change_best_available_object_status(key, number, status, categories: nil, hold_token: nil, extra_data: nil, ticket_types: nil, order_id: nil, keep_extra_data: nil, ignore_channels: nil, channel_keys: nil, try_to_prevent_orphan_seats: nil)
@@ -168,12 +169,13 @@ module Seatsio
       payload
     end
 
-    def build_event_request(chart_key: nil, event_key: nil, table_booking_config: nil, social_distancing_ruleset_key: nil, object_categories: nil, categories: nil)
+    def build_event_request(chart_key: nil, event_key: nil, name: nil, date: nil, table_booking_config: nil, object_categories: nil, categories: nil)
       result = {}
       result["chartKey"] = chart_key if chart_key
       result["eventKey"] = event_key if event_key
+      result["name"] = name if name
+      result["date"] = date.iso8601 if date
       result["tableBookingConfig"] = table_booking_config_to_request(table_booking_config) if table_booking_config != nil
-      result["socialDistancingRulesetKey"] = social_distancing_ruleset_key if social_distancing_ruleset_key != nil
       result["objectCategories"] = object_categories if object_categories != nil
       result["categories"] = categories_to_request(categories) if categories != nil
       result
@@ -191,8 +193,9 @@ module Seatsio
       params.each do |param|
         r = {}
         r["eventKey"] = param[:event_key] if param[:event_key] != nil
+        r["name"] = param[:name] if param[:name]
+        r["date"] = param[:date].iso8601 if param[:date]
         r["tableBookingConfig"] = table_booking_config_to_request(param[:table_booking_config]) if param[:table_booking_config] != nil
-        r["socialDistancingRulesetKey"] = param[:social_distancing_ruleset_key] if param[:social_distancing_ruleset_key] != nil
         r["objectCategories"] = param[:object_categories] if param[:object_categories] != nil
         r["categories"] = categories_to_request(param[:categories]) if param[:categories] != nil
         result.push(r)

data/lib/seatsio/seasons.rb

@@ -14,9 +14,9 @@ module Seatsio
     end
 
     def create(chart_key:, key: nil, number_of_events: nil, event_keys: nil,
-               table_booking_config: nil, social_distancing_ruleset_key: nil)
+               table_booking_config: nil)
       request = build_create_season_request(chart_key: chart_key, key: key, number_of_events: number_of_events, event_keys: event_keys,
-                                            table_booking_config: table_booking_config, social_distancing_ruleset_key: social_distancing_ruleset_key)
+                                            table_booking_config: table_booking_config)
       response = @http_client.post('seasons', request)
       Season.new(response)
     end
@@ -55,14 +55,13 @@ module Seatsio
 
     private
 
-    def build_create_season_request(chart_key: nil, key: nil, number_of_events: nil, event_keys: nil, table_booking_config: nil, social_distancing_ruleset_key: nil)
+    def build_create_season_request(chart_key: nil, key: nil, number_of_events: nil, event_keys: nil, table_booking_config: nil)
       request = {}
       request['chartKey'] = chart_key if chart_key
       request['key'] = key if key
       request['numberOfEvents'] = number_of_events if number_of_events
       request['eventKeys'] = event_keys if event_keys
       request['tableBookingConfig'] = table_booking_config_to_request(table_booking_config) if table_booking_config != nil
-      request['socialDistancingRulesetKey'] = social_distancing_ruleset_key if social_distancing_ruleset_key != nil
       request
     end
 

data/lib/seatsio/version.rb

@@ -1,3 +1,3 @@
 module Seatsio
-  VERSION = "44.1.0"
+  VERSION = "45.0.0"
 end

data/release.mjs

@@ -20,13 +20,14 @@
 $.verbose = false
 
 const versionToBump = getVersionToBump()
-const latestVersion = await fetchLatestReleasedVersionNumber()
+const latestReleaseTag = await fetchLatestReleasedVersionNumber()
+const latestVersion = removeLeadingV(latestReleaseTag)
 const nextVersion = await determineNextVersionNumber(latestVersion)
 
-await pullLastVersion()
-    .then(bumpVersionInFiles)
-    .then(commitAndPush)
-    .then(release)
+await assertChangesSinceRelease(latestReleaseTag)
+await bumpVersionInFiles()
+await commitAndPush()
+await release()
 
 function getVersionToBump() {
     if (!argv.v || !(argv.v === 'minor' || argv.v === 'major')) {
@@ -44,8 +45,7 @@ function removeLeadingV(tagName) {
 
 async function fetchLatestReleasedVersionNumber() {
     let result = await $`gh release view --json tagName`
-    let tagName = JSON.parse(result).tagName
-    return removeLeadingV(tagName)
+    return JSON.parse(result).tagName
 }
 
 async function determineNextVersionNumber(previous) {
@@ -70,11 +70,6 @@ async function replaceInFile(filename, latestVersion, nextVersion) {
         .then(() => gitAdd(filename))
 }
 
-async function pullLastVersion() {
-    await $`git checkout master`
-    await $`git pull origin master`
-}
-
 async function gitAdd(filename) {
     return await $`git add ${filename}`
 }
@@ -84,8 +79,24 @@ async function commitAndPush() {
     await $`git push origin master`
 }
 
+async function getCurrentCommitHash() {
+  return (await $`git rev-parse HEAD`).stdout.trim()
+}
+
+async function getCommitHashOfTag(tag) {
+  return (await $`git rev-list -n 1 ${tag}`).stdout.trim()
+}
+
+async function assertChangesSinceRelease(releaseTag) {
+  let masterCommitHash = await getCurrentCommitHash()
+  let releaseCommitHash = await getCommitHashOfTag(releaseTag)
+  if(masterCommitHash === releaseCommitHash) {
+    throw new Error("No changes on master since release tagged " + releaseTag)
+  }
+}
+
 async function release() {
-    const newTag = 'v' + nextVersion
+  const newTag = 'v' + nextVersion
     return await $`gh release create ${newTag} --generate-notes`.catch(error => {
         console.error('something went wrong while creating the release. Please revert the version change!')
         throw error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seatsio
 version: !ruby/object:Gem::Version
-  version: 44.1.0
+  version: 45.0.0
 platform: ruby
 authors:
 - Seats.io
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client