openactive 0.2.2 → 0.4.0

data/lib/openactive/models/schema/creative_work_season.rb

@@ -8,49 +8,42 @@ module OpenActive
           "schema:CreativeWorkSeason"
         end
 
-        # @return [int,String,nil]
-        define_property :season_number, as: "seasonNumber", types: [
-          "int",
-          "string",
-          "null",
+        # @return [OpenActive::Models::Schema::CreativeWorkSeries,URI]
+        define_property :part_of_series, as: "partOfSeries", types: [
+          "OpenActive::Models::Schema::CreativeWorkSeries",
+          "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Person,URI]
-        define_property :actor, as: "actor", types: [
-          "OpenActive::Models::Schema::Person",
+        # @return [OpenActive::Models::Schema::Episode,URI]
+        define_property :episodes, as: "episodes", types: [
+          "OpenActive::Models::Schema::Episode",
           "URI",
         ]
 
-        # @return [DateTime,Date,nil]
+        # @return [Date,DateTime,nil]
         define_property :start_date, as: "startDate", types: [
-          "DateTime",
           "Date",
+          "DateTime",
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::Person,URI]
-        define_property :director, as: "director", types: [
-          "OpenActive::Models::Schema::Person",
-          "URI",
-        ]
-
-        # @return [int,nil]
-        define_property :number_of_episodes, as: "numberOfEpisodes", types: [
+        # @return [String,int,nil]
+        define_property :season_number, as: "seasonNumber", types: [
+          "string",
           "int",
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::Episode,URI]
-        define_property :episodes, as: "episodes", types: [
-          "OpenActive::Models::Schema::Episode",
+        # @return [OpenActive::Models::Schema::VideoObject,URI]
+        define_property :trailer, as: "trailer", types: [
+          "OpenActive::Models::Schema::VideoObject",
           "URI",
         ]
 
-        # @return [Date,DateTime,nil]
-        define_property :end_date, as: "endDate", types: [
-          "Date",
-          "DateTime",
-          "null",
+        # @return [OpenActive::Models::Schema::Organization,URI]
+        define_property :production_company, as: "productionCompany", types: [
+          "OpenActive::Models::Schema::Organization",
+          "URI",
         ]
 
         # @return [OpenActive::Models::Schema::Episode,URI]
@@ -59,23 +52,30 @@ module OpenActive
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :production_company, as: "productionCompany", types: [
-          "OpenActive::Models::Schema::Organization",
+        # @return [OpenActive::Models::Schema::Person,URI]
+        define_property :director, as: "director", types: [
+          "OpenActive::Models::Schema::Person",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::VideoObject,URI]
-        define_property :trailer, as: "trailer", types: [
-          "OpenActive::Models::Schema::VideoObject",
-          "URI",
+        # @return [int,nil]
+        define_property :number_of_episodes, as: "numberOfEpisodes", types: [
+          "int",
+          "null",
         ]
 
-        # @return [OpenActive::Models::Schema::CreativeWorkSeries,URI]
-        define_property :part_of_series, as: "partOfSeries", types: [
-          "OpenActive::Models::Schema::CreativeWorkSeries",
+        # @return [OpenActive::Models::Schema::Person,URI]
+        define_property :actor, as: "actor", types: [
+          "OpenActive::Models::Schema::Person",
           "URI",
         ]
+
+        # @return [Date,DateTime,nil]
+        define_property :end_date, as: "endDate", types: [
+          "Date",
+          "DateTime",
+          "null",
+        ]
       end
     end
   end

data/lib/openactive/models/schema/creative_work_series.rb

@@ -1,17 +1,17 @@
 module OpenActive
   module Models
     module Schema
-      class CreativeWorkSeries < ::OpenActive::Models::Schema::Series
+      class CreativeWorkSeries < ::OpenActive::Models::Schema::CreativeWork
         # @!attribute type
         # @return [String]
         def type
           "schema:CreativeWorkSeries"
         end
 
-        # @return [DateTime,Date,nil]
+        # @return [Date,DateTime,nil]
         define_property :start_date, as: "startDate", types: [
-          "DateTime",
           "Date",
+          "DateTime",
           "null",
         ]
 

data/lib/openactive/models/schema/credit_card.rb

@@ -1,7 +1,7 @@
 module OpenActive
   module Models
     module Schema
-      class CreditCard < ::OpenActive::Models::Schema::PaymentCard
+      class CreditCard < ::OpenActive::Models::Schema::LoanOrCredit
         # @!attribute type
         # @return [String]
         def type

data/lib/openactive/models/schema/data_catalog.rb

@@ -8,16 +8,28 @@ module OpenActive
           "schema:DataCatalog"
         end
 
+        # @return [OpenActive::Models::Schema::DefinedTerm,URI,String,OpenActive::Enums::Schema::MeasurementMethodEnum,nil]
+        define_property :measurement_technique, as: "measurementTechnique", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
+          "URI",
+          "string",
+          "OpenActive::Enums::Schema::MeasurementMethodEnum",
+          "null",
+        ]
+
         # @return [OpenActive::Models::Schema::Dataset,URI]
         define_property :dataset, as: "dataset", types: [
           "OpenActive::Models::Schema::Dataset",
           "URI",
         ]
 
-        # @return [String,URI]
-        define_property :measurement_technique, as: "measurementTechnique", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::DefinedTerm,URI,String,OpenActive::Enums::Schema::MeasurementMethodEnum,nil]
+        define_property :measurement_method, as: "measurementMethod", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
           "URI",
+          "string",
+          "OpenActive::Enums::Schema::MeasurementMethodEnum",
+          "null",
         ]
       end
     end

data/lib/openactive/models/schema/data_download.rb

@@ -8,10 +8,22 @@ module OpenActive
           "schema:DataDownload"
         end
 
-        # @return [String,URI]
+        # @return [OpenActive::Models::Schema::DefinedTerm,URI,String,OpenActive::Enums::Schema::MeasurementMethodEnum,nil]
         define_property :measurement_technique, as: "measurementTechnique", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
+          "URI",
           "string",
+          "OpenActive::Enums::Schema::MeasurementMethodEnum",
+          "null",
+        ]
+
+        # @return [OpenActive::Models::Schema::DefinedTerm,URI,String,OpenActive::Enums::Schema::MeasurementMethodEnum,nil]
+        define_property :measurement_method, as: "measurementMethod", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
           "URI",
+          "string",
+          "OpenActive::Enums::Schema::MeasurementMethodEnum",
+          "null",
         ]
       end
     end

data/lib/openactive/models/schema/data_feed.rb

@@ -8,11 +8,11 @@ module OpenActive
           "schema:DataFeed"
         end
 
-        # @return [OpenActive::Models::Schema::Thing,String,OpenActive::Models::Schema::DataFeedItem,URI]
+        # @return [OpenActive::Models::Schema::Thing,OpenActive::Models::Schema::DataFeedItem,String,URI]
         define_property :data_feed_element, as: "dataFeedElement", types: [
           "OpenActive::Models::Schema::Thing",
-          "string",
           "OpenActive::Models::Schema::DataFeedItem",
+          "string",
           "URI",
         ]
       end

data/lib/openactive/models/schema/data_feed_item.rb

@@ -8,10 +8,10 @@ module OpenActive
           "schema:DataFeedItem"
         end
 
-        # @return [DateTime,Date,nil]
+        # @return [Date,DateTime,nil]
         define_property :date_modified, as: "dateModified", types: [
-          "DateTime",
           "Date",
+          "DateTime",
           "null",
         ]
 
@@ -21,17 +21,17 @@ module OpenActive
           "URI",
         ]
 
-        # @return [DateTime,Date,nil]
+        # @return [Date,DateTime,nil]
         define_property :date_created, as: "dateCreated", types: [
-          "DateTime",
           "Date",
+          "DateTime",
           "null",
         ]
 
-        # @return [DateTime,Date,nil]
+        # @return [Date,DateTime,nil]
         define_property :date_deleted, as: "dateDeleted", types: [
-          "DateTime",
           "Date",
+          "DateTime",
           "null",
         ]
       end

data/lib/openactive/models/schema/dataset.rb

@@ -15,16 +15,34 @@ module OpenActive
         ]
 
         # @return [OpenActive::Models::Schema::DataCatalog,URI]
-        define_property :included_in_data_catalog, as: "includedInDataCatalog", types: [
+        define_property :included_data_catalog, as: "includedDataCatalog", types: [
           "OpenActive::Models::Schema::DataCatalog",
           "URI",
         ]
 
-        # @return [String,OpenActive::Models::Schema::PropertyValue,URI]
+        # @return [OpenActive::Enums::PropertyEnumeration,OpenActive::Models::Schema::StatisticalVariable,String,OpenActive::Models::Schema::PropertyValue,URI,nil]
         define_property :variable_measured, as: "variableMeasured", types: [
+          "OpenActive::Enums::PropertyEnumeration",
+          "OpenActive::Models::Schema::StatisticalVariable",
           "string",
           "OpenActive::Models::Schema::PropertyValue",
           "URI",
+          "null",
+        ]
+
+        # @return [OpenActive::Models::Schema::DefinedTerm,URI,String,OpenActive::Enums::Schema::MeasurementMethodEnum,nil]
+        define_property :measurement_technique, as: "measurementTechnique", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
+          "URI",
+          "string",
+          "OpenActive::Enums::Schema::MeasurementMethodEnum",
+          "null",
+        ]
+
+        # @return [OpenActive::Models::Schema::DataCatalog,URI]
+        define_property :catalog, as: "catalog", types: [
+          "OpenActive::Models::Schema::DataCatalog",
+          "URI",
         ]
 
         # @return [String]
@@ -32,10 +50,13 @@ module OpenActive
           "string",
         ]
 
-        # @return [String,URI]
-        define_property :measurement_technique, as: "measurementTechnique", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::DefinedTerm,URI,String,OpenActive::Enums::Schema::MeasurementMethodEnum,nil]
+        define_property :measurement_method, as: "measurementMethod", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
           "URI",
+          "string",
+          "OpenActive::Enums::Schema::MeasurementMethodEnum",
+          "null",
         ]
 
         # @return [OpenActive::Models::Schema::DataDownload,URI]
@@ -45,13 +66,7 @@ module OpenActive
         ]
 
         # @return [OpenActive::Models::Schema::DataCatalog,URI]
-        define_property :included_data_catalog, as: "includedDataCatalog", types: [
-          "OpenActive::Models::Schema::DataCatalog",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::DataCatalog,URI]
-        define_property :catalog, as: "catalog", types: [
+        define_property :included_in_data_catalog, as: "includedInDataCatalog", types: [
           "OpenActive::Models::Schema::DataCatalog",
           "URI",
         ]

data/lib/openactive/models/schema/dated_money_specification.rb

@@ -8,18 +8,23 @@ module OpenActive
           "schema:DatedMoneySpecification"
         end
 
-        # @return [BigDecimal,OpenActive::Models::Schema::MonetaryAmount,URI,nil]
-        define_property :amount, as: "amount", types: [
-          "Number",
-          "OpenActive::Models::Schema::MonetaryAmount",
-          "URI",
-          "null",
+        # @return [String]
+        define_property :currency, as: "currency", types: [
+          "string",
         ]
 
-        # @return [DateTime,Date,nil]
+        # @return [Date,DateTime,nil]
         define_property :start_date, as: "startDate", types: [
-          "DateTime",
           "Date",
+          "DateTime",
+          "null",
+        ]
+
+        # @return [OpenActive::Models::Schema::MonetaryAmount,BigDecimal,URI,nil]
+        define_property :amount, as: "amount", types: [
+          "OpenActive::Models::Schema::MonetaryAmount",
+          "Number",
+          "URI",
           "null",
         ]
 
@@ -29,11 +34,6 @@ module OpenActive
           "DateTime",
           "null",
         ]
-
-        # @return [String]
-        define_property :currency, as: "currency", types: [
-          "string",
-        ]
       end
     end
   end

data/lib/openactive/models/schema/ddx_element.rb

@@ -8,17 +8,17 @@ module OpenActive
           "schema:DDxElement"
         end
 
-        # @return [OpenActive::Models::Schema::MedicalSignOrSymptom,URI]
-        define_property :distinguishing_sign, as: "distinguishingSign", types: [
-          "OpenActive::Models::Schema::MedicalSignOrSymptom",
-          "URI",
-        ]
-
         # @return [OpenActive::Models::Schema::MedicalCondition,URI]
         define_property :diagnosis, as: "diagnosis", types: [
           "OpenActive::Models::Schema::MedicalCondition",
           "URI",
         ]
+
+        # @return [OpenActive::Models::Schema::MedicalSignOrSymptom,URI]
+        define_property :distinguishing_sign, as: "distinguishingSign", types: [
+          "OpenActive::Models::Schema::MedicalSignOrSymptom",
+          "URI",
+        ]
       end
     end
   end

data/lib/openactive/models/schema/defined_region.rb

@@ -8,6 +8,18 @@ module OpenActive
           "schema:DefinedRegion"
         end
 
+        # @return [OpenActive::Models::Schema::Country,String,URI]
+        define_property :address_country, as: "addressCountry", types: [
+          "OpenActive::Models::Schema::Country",
+          "string",
+          "URI",
+        ]
+
+        # @return [String]
+        define_property :postal_code, as: "postalCode", types: [
+          "string",
+        ]
+
         # @return [String]
         define_property :postal_code_prefix, as: "postalCodePrefix", types: [
           "string",
@@ -19,22 +31,10 @@ module OpenActive
           "URI",
         ]
 
-        # @return [String,OpenActive::Models::Schema::Country,URI]
-        define_property :address_country, as: "addressCountry", types: [
-          "string",
-          "OpenActive::Models::Schema::Country",
-          "URI",
-        ]
-
         # @return [String]
         define_property :address_region, as: "addressRegion", types: [
           "string",
         ]
-
-        # @return [String]
-        define_property :postal_code, as: "postalCode", types: [
-          "string",
-        ]
       end
     end
   end

data/lib/openactive/models/schema/delivery_charge_specification.rb

@@ -8,36 +8,36 @@ module OpenActive
           "schema:DeliveryChargeSpecification"
         end
 
-        # @return [String,OpenActive::Models::Schema::GeoShape,OpenActive::Models::Schema::Place,URI]
-        define_property :eligible_region, as: "eligibleRegion", types: [
-          "string",
-          "OpenActive::Models::Schema::GeoShape",
-          "OpenActive::Models::Schema::Place",
-          "URI",
+        # @return [OpenActive::Enums::Schema::DeliveryMethod,nil]
+        define_property :applies_to_delivery_method, as: "appliesToDeliveryMethod", types: [
+          "OpenActive::Enums::Schema::DeliveryMethod",
+          "null",
         ]
 
-        # @return [String,OpenActive::Models::Schema::Place,OpenActive::Models::Schema::AdministrativeArea,OpenActive::Models::Schema::GeoShape,URI]
-        define_property :area_served, as: "areaServed", types: [
+        # @return [String,OpenActive::Models::Schema::Place,OpenActive::Models::Schema::GeoShape,URI]
+        define_property :ineligible_region, as: "ineligibleRegion", types: [
           "string",
           "OpenActive::Models::Schema::Place",
-          "OpenActive::Models::Schema::AdministrativeArea",
           "OpenActive::Models::Schema::GeoShape",
           "URI",
         ]
 
-        # @return [OpenActive::Enums::Schema::DeliveryMethod,nil]
-        define_property :applies_to_delivery_method, as: "appliesToDeliveryMethod", types: [
-          "OpenActive::Enums::Schema::DeliveryMethod",
-          "null",
-        ]
-
         # @return [OpenActive::Models::Schema::GeoShape,String,OpenActive::Models::Schema::Place,URI]
-        define_property :ineligible_region, as: "ineligibleRegion", types: [
+        define_property :eligible_region, as: "eligibleRegion", types: [
           "OpenActive::Models::Schema::GeoShape",
           "string",
           "OpenActive::Models::Schema::Place",
           "URI",
         ]
+
+        # @return [String,OpenActive::Models::Schema::Place,OpenActive::Models::Schema::GeoShape,OpenActive::Models::Schema::AdministrativeArea,URI]
+        define_property :area_served, as: "areaServed", types: [
+          "string",
+          "OpenActive::Models::Schema::Place",
+          "OpenActive::Models::Schema::GeoShape",
+          "OpenActive::Models::Schema::AdministrativeArea",
+          "URI",
+        ]
       end
     end
   end

data/lib/openactive/models/schema/delivery_event.rb

@@ -13,18 +13,18 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Enums::Schema::DeliveryMethod,nil]
-        define_property :has_delivery_method, as: "hasDeliveryMethod", types: [
-          "OpenActive::Enums::Schema::DeliveryMethod",
-          "null",
-        ]
-
         # @return [DateTime,nil]
         define_property :available_from, as: "availableFrom", types: [
           "DateTime",
           "null",
         ]
 
+        # @return [OpenActive::Enums::Schema::DeliveryMethod,nil]
+        define_property :has_delivery_method, as: "hasDeliveryMethod", types: [
+          "OpenActive::Enums::Schema::DeliveryMethod",
+          "null",
+        ]
+
         # @return [DateTime,nil]
         define_property :available_through, as: "availableThrough", types: [
           "DateTime",

data/lib/openactive/models/schema/delivery_time_settings.rb

@@ -8,12 +8,6 @@ module OpenActive
           "schema:DeliveryTimeSettings"
         end
 
-        # @return [Boolean,nil]
-        define_property :is_unlabelled_fallback, as: "isUnlabelledFallback", types: [
-          "bool",
-          "null",
-        ]
-
         # @return [OpenActive::Models::Schema::DefinedRegion,URI]
         define_property :shipping_destination, as: "shippingDestination", types: [
           "OpenActive::Models::Schema::DefinedRegion",
@@ -25,6 +19,12 @@ module OpenActive
           "string",
         ]
 
+        # @return [Boolean,nil]
+        define_property :is_unlabelled_fallback, as: "isUnlabelledFallback", types: [
+          "bool",
+          "null",
+        ]
+
         # @return [OpenActive::Models::Schema::ShippingDeliveryTime,URI]
         define_property :delivery_time, as: "deliveryTime", types: [
           "OpenActive::Models::Schema::ShippingDeliveryTime",