openactive 0.3.0 → 0.4.0

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

@@ -8,40 +8,12 @@ module OpenActive
           "schema:Demand"
         end
 
-        # @return [String]
-        define_property :gtin12, as: "gtin12", types: [
-          "string",
-        ]
-
-        # @return [OpenActive::Models::Schema::Trip,OpenActive::Models::Schema::Event,OpenActive::Models::Schema::Product,OpenActive::Models::Schema::AggregateOffer,OpenActive::Models::Schema::CreativeWork,OpenActive::Models::Schema::MenuItem,OpenActive::Models::Schema::Service,URI]
-        define_property :item_offered, as: "itemOffered", types: [
-          "OpenActive::Models::Schema::Trip",
-          "OpenActive::Models::Schema::Event",
-          "OpenActive::Models::Schema::Product",
-          "OpenActive::Models::Schema::AggregateOffer",
-          "OpenActive::Models::Schema::CreativeWork",
-          "OpenActive::Models::Schema::MenuItem",
-          "OpenActive::Models::Schema::Service",
-          "URI",
-        ]
-
-        # @return [String]
-        define_property :mpn, as: "mpn", types: [
-          "string",
-        ]
-
-        # @return [OpenActive::Models::Schema::TypeAndQuantityNode,URI]
-        define_property :includes_object, as: "includesObject", types: [
-          "OpenActive::Models::Schema::TypeAndQuantityNode",
+        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
+        define_property :eligible_duration, as: "eligibleDuration", types: [
+          "OpenActive::Models::Schema::QuantitativeValue",
           "URI",
         ]
 
-        # @return [OpenActive::Enums::Schema::BusinessFunction,nil]
-        define_property :business_function, as: "businessFunction", types: [
-          "OpenActive::Enums::Schema::BusinessFunction",
-          "null",
-        ]
-
         # @return [OpenActive::Enums::Schema::OfferItemCondition,nil]
         define_property :item_condition, as: "itemCondition", types: [
           "OpenActive::Enums::Schema::OfferItemCondition",
@@ -49,27 +21,20 @@ module OpenActive
         ]
 
         # @return [String]
-        define_property :gtin, as: "gtin", types: [
+        define_property :gtin12, as: "gtin12", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
-        define_property :eligible_quantity, as: "eligibleQuantity", types: [
-          "OpenActive::Models::Schema::QuantitativeValue",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::LoanOrCredit,OpenActive::Enums::Schema::PaymentMethod,URI,nil]
-        define_property :accepted_payment_method, as: "acceptedPaymentMethod", types: [
-          "OpenActive::Models::Schema::LoanOrCredit",
-          "OpenActive::Enums::Schema::PaymentMethod",
-          "URI",
+        # @return [Date,DateTime,nil]
+        define_property :valid_from, as: "validFrom", types: [
+          "Date",
+          "DateTime",
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::WarrantyPromise,URI]
-        define_property :warranty, as: "warranty", types: [
-          "OpenActive::Models::Schema::WarrantyPromise",
+        # @return [OpenActive::Models::Schema::Place,URI]
+        define_property :available_at_or_from, as: "availableAtOrFrom", types: [
+          "OpenActive::Models::Schema::Place",
           "URI",
         ]
 
@@ -80,17 +45,9 @@ module OpenActive
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Place,String,OpenActive::Models::Schema::GeoShape,URI]
-        define_property :ineligible_region, as: "ineligibleRegion", types: [
-          "OpenActive::Models::Schema::Place",
-          "string",
-          "OpenActive::Models::Schema::GeoShape",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
-        define_property :delivery_lead_time, as: "deliveryLeadTime", types: [
-          "OpenActive::Models::Schema::QuantitativeValue",
+        # @return [OpenActive::Models::Schema::PriceSpecification,URI]
+        define_property :price_specification, as: "priceSpecification", types: [
+          "OpenActive::Models::Schema::PriceSpecification",
           "URI",
         ]
 
@@ -100,10 +57,15 @@ module OpenActive
           "null",
         ]
 
-        # @return [DateTime,Date,nil]
-        define_property :valid_from, as: "validFrom", types: [
-          "DateTime",
-          "Date",
+        # @return [OpenActive::Models::Schema::TypeAndQuantityNode,URI]
+        define_property :includes_object, as: "includesObject", types: [
+          "OpenActive::Models::Schema::TypeAndQuantityNode",
+          "URI",
+        ]
+
+        # @return [OpenActive::Enums::Schema::BusinessFunction,nil]
+        define_property :business_function, as: "businessFunction", types: [
+          "OpenActive::Enums::Schema::BusinessFunction",
           "null",
         ]
 
@@ -115,33 +77,67 @@ module OpenActive
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::GeoShape,String,OpenActive::Models::Schema::Place,URI]
-        define_property :eligible_region, as: "eligibleRegion", types: [
-          "OpenActive::Models::Schema::GeoShape",
+        # @return [OpenActive::Enums::Schema::ItemAvailability,nil]
+        define_property :availability, as: "availability", types: [
+          "OpenActive::Enums::Schema::ItemAvailability",
+          "null",
+        ]
+
+        # @return [String]
+        define_property :sku, as: "sku", types: [
           "string",
-          "OpenActive::Models::Schema::Place",
+        ]
+
+        # @return [Date,DateTime,nil]
+        define_property :valid_through, as: "validThrough", types: [
+          "Date",
+          "DateTime",
+          "null",
+        ]
+
+        # @return [OpenActive::Models::Schema::WarrantyPromise,URI]
+        define_property :warranty, as: "warranty", types: [
+          "OpenActive::Models::Schema::WarrantyPromise",
           "URI",
         ]
 
+        # @return [Time,Date,DateTime,nil]
+        define_property :availability_starts, as: "availabilityStarts", types: [
+          "Time",
+          "Date",
+          "DateTime",
+          "null",
+        ]
+
         # @return [String]
         define_property :gtin8, as: "gtin8", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
-        define_property :inventory_level, as: "inventoryLevel", types: [
-          "OpenActive::Models::Schema::QuantitativeValue",
+        # @return [String]
+        define_property :gtin13, as: "gtin13", types: [
+          "string",
+        ]
+
+        # @return [OpenActive::Enums::Schema::PaymentMethod,OpenActive::Models::Schema::LoanOrCredit,URI,nil]
+        define_property :accepted_payment_method, as: "acceptedPaymentMethod", types: [
+          "OpenActive::Enums::Schema::PaymentMethod",
+          "OpenActive::Models::Schema::LoanOrCredit",
           "URI",
+          "null",
         ]
 
-        # @return [String]
-        define_property :sku, as: "sku", types: [
+        # @return [String,URI]
+        define_property :asin, as: "asin", types: [
           "string",
+          "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
-        define_property :advance_booking_requirement, as: "advanceBookingRequirement", types: [
-          "OpenActive::Models::Schema::QuantitativeValue",
+        # @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::GeoShape",
           "URI",
         ]
 
@@ -150,15 +146,8 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::PriceSpecification,URI]
-        define_property :eligible_transaction_volume, as: "eligibleTransactionVolume", types: [
-          "OpenActive::Models::Schema::PriceSpecification",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::AdministrativeArea,OpenActive::Models::Schema::GeoShape,String,OpenActive::Models::Schema::Place,URI]
-        define_property :area_served, as: "areaServed", types: [
-          "OpenActive::Models::Schema::AdministrativeArea",
+        # @return [OpenActive::Models::Schema::GeoShape,String,OpenActive::Models::Schema::Place,URI]
+        define_property :eligible_region, as: "eligibleRegion", types: [
           "OpenActive::Models::Schema::GeoShape",
           "string",
           "OpenActive::Models::Schema::Place",
@@ -171,47 +160,59 @@ module OpenActive
           "null",
         ]
 
-        # @return [OpenActive::Enums::Schema::ItemAvailability,nil]
-        define_property :availability, as: "availability", types: [
-          "OpenActive::Enums::Schema::ItemAvailability",
-          "null",
-        ]
-
-        # @return [String]
-        define_property :gtin13, as: "gtin13", types: [
-          "string",
-        ]
-
-        # @return [DateTime,Date,nil]
-        define_property :valid_through, as: "validThrough", types: [
-          "DateTime",
-          "Date",
-          "null",
+        # @return [OpenActive::Models::Schema::CreativeWork,OpenActive::Models::Schema::AggregateOffer,OpenActive::Models::Schema::MenuItem,OpenActive::Models::Schema::Trip,OpenActive::Models::Schema::Event,OpenActive::Models::Schema::Service,OpenActive::Models::Schema::Product,URI]
+        define_property :item_offered, as: "itemOffered", types: [
+          "OpenActive::Models::Schema::CreativeWork",
+          "OpenActive::Models::Schema::AggregateOffer",
+          "OpenActive::Models::Schema::MenuItem",
+          "OpenActive::Models::Schema::Trip",
+          "OpenActive::Models::Schema::Event",
+          "OpenActive::Models::Schema::Service",
+          "OpenActive::Models::Schema::Product",
+          "URI",
         ]
 
         # @return [OpenActive::Models::Schema::PriceSpecification,URI]
-        define_property :price_specification, as: "priceSpecification", types: [
+        define_property :eligible_transaction_volume, as: "eligibleTransactionVolume", types: [
           "OpenActive::Models::Schema::PriceSpecification",
           "URI",
         ]
 
-        # @return [Time,DateTime,Date,nil]
-        define_property :availability_starts, as: "availabilityStarts", types: [
-          "Time",
-          "DateTime",
-          "Date",
-          "null",
+        # @return [URI,String]
+        define_property :gtin, as: "gtin", types: [
+          "URI",
+          "string",
         ]
 
         # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
-        define_property :eligible_duration, as: "eligibleDuration", types: [
+        define_property :delivery_lead_time, as: "deliveryLeadTime", types: [
           "OpenActive::Models::Schema::QuantitativeValue",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Place,URI]
-        define_property :available_at_or_from, as: "availableAtOrFrom", types: [
+        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
+        define_property :advance_booking_requirement, as: "advanceBookingRequirement", types: [
+          "OpenActive::Models::Schema::QuantitativeValue",
+          "URI",
+        ]
+
+        # @return [String]
+        define_property :mpn, as: "mpn", types: [
+          "string",
+        ]
+
+        # @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",
+        ]
+
+        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
+        define_property :inventory_level, as: "inventoryLevel", types: [
+          "OpenActive::Models::Schema::QuantitativeValue",
           "URI",
         ]
 
@@ -219,6 +220,12 @@ module OpenActive
         define_property :serial_number, as: "serialNumber", types: [
           "string",
         ]
+
+        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
+        define_property :eligible_quantity, as: "eligibleQuantity", types: [
+          "OpenActive::Models::Schema::QuantitativeValue",
+          "URI",
+        ]
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module OpenActive
   module Models
     module Schema
-      class Dentist < ::OpenActive::Models::Schema::MedicalOrganization
+      class Dentist < ::OpenActive::Models::Schema::LocalBusiness
         # @!attribute type
         # @return [String]
         def type

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

@@ -1,7 +1,7 @@
 module OpenActive
   module Models
     module Schema
-      class DepositAccount < ::OpenActive::Models::Schema::InvestmentOrDeposit
+      class DepositAccount < ::OpenActive::Models::Schema::BankAccount
         # @!attribute type
         # @return [String]
         def type

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

@@ -9,7 +9,7 @@ module OpenActive
         end
 
         # @return [String]
-        define_property :expert_considerations, as: "expertConsiderations", types: [
+        define_property :physiological_benefits, as: "physiologicalBenefits", types: [
           "string",
         ]
 
@@ -18,11 +18,6 @@ module OpenActive
           "string",
         ]
 
-        # @return [String]
-        define_property :physiological_benefits, as: "physiologicalBenefits", types: [
-          "string",
-        ]
-
         # @return [OpenActive::Models::Schema::Person,OpenActive::Models::Schema::Organization,URI]
         define_property :endorsers, as: "endorsers", types: [
           "OpenActive::Models::Schema::Person",
@@ -30,6 +25,11 @@ module OpenActive
           "URI",
         ]
 
+        # @return [String]
+        define_property :expert_considerations, as: "expertConsiderations", types: [
+          "string",
+        ]
+
         # @return [String]
         define_property :diet_features, as: "dietFeatures", types: [
           "string",

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

@@ -1,7 +1,7 @@
 module OpenActive
   module Models
     module Schema
-      class DietarySupplement < ::OpenActive::Models::Schema::Substance
+      class DietarySupplement < ::OpenActive::Models::Schema::Product
         # @!attribute type
         # @return [String]
         def type
@@ -9,23 +9,13 @@ module OpenActive
         end
 
         # @return [String]
-        define_property :target_population, as: "targetPopulation", types: [
+        define_property :active_ingredient, as: "activeIngredient", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::RecommendedDoseSchedule,URI]
-        define_property :recommended_intake, as: "recommendedIntake", types: [
-          "OpenActive::Models::Schema::RecommendedDoseSchedule",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::DrugLegalStatus,String,OpenActive::Enums::Schema::MedicalEnumeration,URI,nil]
-        define_property :legal_status, as: "legalStatus", types: [
-          "OpenActive::Models::Schema::DrugLegalStatus",
+        # @return [String]
+        define_property :target_population, as: "targetPopulation", types: [
           "string",
-          "OpenActive::Enums::Schema::MedicalEnumeration",
-          "URI",
-          "null",
         ]
 
         # @return [String]
@@ -33,19 +23,26 @@ module OpenActive
           "string",
         ]
 
+        # @return [Boolean,nil]
+        define_property :is_proprietary, as: "isProprietary", types: [
+          "bool",
+          "null",
+        ]
+
         # @return [OpenActive::Models::Schema::MaximumDoseSchedule,URI]
         define_property :maximum_intake, as: "maximumIntake", types: [
           "OpenActive::Models::Schema::MaximumDoseSchedule",
           "URI",
         ]
 
-        # @return [String]
-        define_property :active_ingredient, as: "activeIngredient", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::RecommendedDoseSchedule,URI]
+        define_property :recommended_intake, as: "recommendedIntake", types: [
+          "OpenActive::Models::Schema::RecommendedDoseSchedule",
+          "URI",
         ]
 
         # @return [String]
-        define_property :proprietary_name, as: "proprietaryName", types: [
+        define_property :safety_consideration, as: "safetyConsideration", types: [
           "string",
         ]
 
@@ -54,21 +51,18 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :manufacturer, as: "manufacturer", types: [
-          "OpenActive::Models::Schema::Organization",
-          "URI",
-        ]
-
-        # @return [Boolean,nil]
-        define_property :is_proprietary, as: "isProprietary", types: [
-          "bool",
-          "null",
+        # @return [String]
+        define_property :proprietary_name, as: "proprietaryName", types: [
+          "string",
         ]
 
-        # @return [String]
-        define_property :safety_consideration, as: "safetyConsideration", types: [
+        # @return [OpenActive::Models::Schema::DrugLegalStatus,OpenActive::Enums::Schema::MedicalEnumeration,String,URI,nil]
+        define_property :legal_status, as: "legalStatus", types: [
+          "OpenActive::Models::Schema::DrugLegalStatus",
+          "OpenActive::Enums::Schema::MedicalEnumeration",
           "string",
+          "URI",
+          "null",
         ]
       end
     end

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

@@ -8,20 +8,20 @@ module OpenActive
           "schema:DigitalDocumentPermission"
         end
 
-        # @return [OpenActive::Models::Schema::Person,OpenActive::Models::Schema::Audience,OpenActive::Models::Schema::ContactPoint,OpenActive::Models::Schema::Organization,URI]
+        # @return [OpenActive::Enums::Schema::DigitalDocumentPermissionType,nil]
+        define_property :permission_type, as: "permissionType", types: [
+          "OpenActive::Enums::Schema::DigitalDocumentPermissionType",
+          "null",
+        ]
+
+        # @return [OpenActive::Models::Schema::Audience,OpenActive::Models::Schema::Person,OpenActive::Models::Schema::ContactPoint,OpenActive::Models::Schema::Organization,URI]
         define_property :grantee, as: "grantee", types: [
-          "OpenActive::Models::Schema::Person",
           "OpenActive::Models::Schema::Audience",
+          "OpenActive::Models::Schema::Person",
           "OpenActive::Models::Schema::ContactPoint",
           "OpenActive::Models::Schema::Organization",
           "URI",
         ]
-
-        # @return [OpenActive::Enums::Schema::DigitalDocumentPermissionType,nil]
-        define_property :permission_type, as: "permissionType", types: [
-          "OpenActive::Enums::Schema::DigitalDocumentPermissionType",
-          "null",
-        ]
       end
     end
   end

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

@@ -8,12 +8,12 @@ module OpenActive
           "schema:DonateAction"
         end
 
-        # @return [OpenActive::Models::Schema::Person,OpenActive::Models::Schema::Audience,OpenActive::Models::Schema::ContactPoint,OpenActive::Models::Schema::Organization,URI]
+        # @return [OpenActive::Models::Schema::ContactPoint,OpenActive::Models::Schema::Organization,OpenActive::Models::Schema::Audience,OpenActive::Models::Schema::Person,URI]
         define_property :recipient, as: "recipient", types: [
-          "OpenActive::Models::Schema::Person",
-          "OpenActive::Models::Schema::Audience",
           "OpenActive::Models::Schema::ContactPoint",
           "OpenActive::Models::Schema::Organization",
+          "OpenActive::Models::Schema::Audience",
+          "OpenActive::Models::Schema::Person",
           "URI",
         ]
       end

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

@@ -8,9 +8,11 @@ module OpenActive
           "schema:DoseSchedule"
         end
 
-        # @return [String]
-        define_property :target_population, as: "targetPopulation", types: [
-          "string",
+        # @return [BigDecimal,OpenActive::Enums::Schema::QualitativeValue,nil]
+        define_property :dose_value, as: "doseValue", types: [
+          "Number",
+          "OpenActive::Enums::Schema::QualitativeValue",
+          "null",
         ]
 
         # @return [String]
@@ -19,15 +21,13 @@ module OpenActive
         ]
 
         # @return [String]
-        define_property :dose_unit, as: "doseUnit", types: [
+        define_property :target_population, as: "targetPopulation", types: [
           "string",
         ]
 
-        # @return [BigDecimal,OpenActive::Enums::Schema::QualitativeValue,nil]
-        define_property :dose_value, as: "doseValue", types: [
-          "Number",
-          "OpenActive::Enums::Schema::QualitativeValue",
-          "null",
+        # @return [String]
+        define_property :dose_unit, as: "doseUnit", types: [
+          "string",
         ]
       end
     end