openactive 0.2.2 → 0.4.0

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

@@ -1,7 +1,7 @@
 module OpenActive
   module Models
     module Schema
-      class Drug < ::OpenActive::Models::Schema::Substance
+      class Drug < ::OpenActive::Models::Schema::Product
         # @!attribute type
         # @return [String]
         def type
@@ -9,176 +9,170 @@ module OpenActive
         end
 
         # @return [String]
-        define_property :mechanism_of_action, as: "mechanismOfAction", types: [
+        define_property :clinical_pharmacology, as: "clinicalPharmacology", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::DrugPregnancyCategory,URI]
-        define_property :pregnancy_category, as: "pregnancyCategory", types: [
-          "OpenActive::Models::Schema::DrugPregnancyCategory",
+        # @return [OpenActive::Models::Schema::DoseSchedule,URI]
+        define_property :dose_schedule, as: "doseSchedule", types: [
+          "OpenActive::Models::Schema::DoseSchedule",
           "URI",
         ]
 
-        # @return [Boolean,nil]
-        define_property :is_proprietary, as: "isProprietary", types: [
-          "bool",
-          "null",
+        # @return [String]
+        define_property :active_ingredient, as: "activeIngredient", types: [
+          "string",
         ]
 
-        # @return [OpenActive::Models::Schema::HealthInsurancePlan,URI]
-        define_property :included_in_health_insurance_plan, as: "includedInHealthInsurancePlan", types: [
-          "OpenActive::Models::Schema::HealthInsurancePlan",
+        # @return [OpenActive::Models::Schema::Drug,URI]
+        define_property :interacting_drug, as: "interactingDrug", types: [
+          "OpenActive::Models::Schema::Drug",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::MaximumDoseSchedule,URI]
-        define_property :maximum_intake, as: "maximumIntake", types: [
-          "OpenActive::Models::Schema::MaximumDoseSchedule",
+        # @return [String]
+        define_property :overdosage, as: "overdosage", types: [
+          "string",
+        ]
+
+        # @return [OpenActive::Models::Schema::DrugStrength,URI]
+        define_property :available_strength, as: "availableStrength", types: [
+          "OpenActive::Models::Schema::DrugStrength",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::DrugClass,URI]
-        define_property :drug_class, as: "drugClass", types: [
-          "OpenActive::Models::Schema::DrugClass",
+        # @return [OpenActive::Models::Schema::DrugPrescriptionStatus,String,URI]
+        define_property :prescription_status, as: "prescriptionStatus", types: [
+          "OpenActive::Models::Schema::DrugPrescriptionStatus",
+          "string",
           "URI",
         ]
 
         # @return [String]
-        define_property :clinical_pharmacology, as: "clinicalPharmacology", types: [
+        define_property :administration_route, as: "administrationRoute", types: [
           "string",
         ]
 
         # @return [String]
-        define_property :rxcui, as: "rxcui", types: [
+        define_property :alcohol_warning, as: "alcoholWarning", types: [
           "string",
         ]
 
-        # @return [OpenActive::Enums::Schema::MedicalEnumeration,String,OpenActive::Models::Schema::DrugLegalStatus,URI,nil]
-        define_property :legal_status, as: "legalStatus", types: [
-          "OpenActive::Enums::Schema::MedicalEnumeration",
-          "string",
-          "OpenActive::Models::Schema::DrugLegalStatus",
+        # @return [OpenActive::Models::Schema::DrugClass,URI]
+        define_property :drug_class, as: "drugClass", types: [
+          "OpenActive::Models::Schema::DrugClass",
           "URI",
-          "null",
         ]
 
-        # @return [String]
-        define_property :breastfeeding_warning, as: "breastfeedingWarning", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::DrugPregnancyCategory,URI]
+        define_property :pregnancy_category, as: "pregnancyCategory", types: [
+          "OpenActive::Models::Schema::DrugPregnancyCategory",
+          "URI",
         ]
 
         # @return [String]
-        define_property :non_proprietary_name, as: "nonProprietaryName", types: [
+        define_property :mechanism_of_action, as: "mechanismOfAction", types: [
           "string",
         ]
 
+        # @return [Boolean,nil]
+        define_property :is_proprietary, as: "isProprietary", types: [
+          "bool",
+          "null",
+        ]
+
         # @return [URI]
         define_property :label_details, as: "labelDetails", types: [
           "URI",
         ]
 
-        # @return [String]
-        define_property :overdosage, as: "overdosage", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::MaximumDoseSchedule,URI]
+        define_property :maximum_intake, as: "maximumIntake", types: [
+          "OpenActive::Models::Schema::MaximumDoseSchedule",
+          "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Drug,URI]
-        define_property :interacting_drug, as: "interactingDrug", types: [
-          "OpenActive::Models::Schema::Drug",
+        # @return [URI,String]
+        define_property :warning, as: "warning", types: [
           "URI",
+          "string",
         ]
 
         # @return [String]
-        define_property :clincal_pharmacology, as: "clincalPharmacology", types: [
+        define_property :drug_unit, as: "drugUnit", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Drug,URI]
-        define_property :related_drug, as: "relatedDrug", types: [
-          "OpenActive::Models::Schema::Drug",
+        # @return [URI]
+        define_property :prescribing_info, as: "prescribingInfo", types: [
           "URI",
         ]
 
         # @return [String]
-        define_property :food_warning, as: "foodWarning", types: [
+        define_property :dosage_form, as: "dosageForm", types: [
           "string",
         ]
 
-        # @return [Boolean,nil]
-        define_property :is_available_generically, as: "isAvailableGenerically", types: [
-          "bool",
-          "null",
-        ]
-
         # @return [String]
-        define_property :proprietary_name, as: "proprietaryName", types: [
+        define_property :pregnancy_warning, as: "pregnancyWarning", types: [
           "string",
         ]
 
         # @return [String]
-        define_property :active_ingredient, as: "activeIngredient", types: [
+        define_property :non_proprietary_name, as: "nonProprietaryName", types: [
           "string",
         ]
 
         # @return [String]
-        define_property :administration_route, as: "administrationRoute", types: [
-          "string",
-        ]
-
-        # @return [URI,String]
-        define_property :warning, as: "warning", types: [
-          "URI",
+        define_property :clincal_pharmacology, as: "clincalPharmacology", types: [
           "string",
         ]
 
         # @return [String]
-        define_property :alcohol_warning, as: "alcoholWarning", types: [
+        define_property :proprietary_name, as: "proprietaryName", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :manufacturer, as: "manufacturer", types: [
-          "OpenActive::Models::Schema::Organization",
+        # @return [OpenActive::Models::Schema::Drug,URI]
+        define_property :related_drug, as: "relatedDrug", types: [
+          "OpenActive::Models::Schema::Drug",
           "URI",
         ]
 
         # @return [String]
-        define_property :dosage_form, as: "dosageForm", types: [
+        define_property :food_warning, as: "foodWarning", types: [
           "string",
         ]
 
-        # @return [String]
-        define_property :pregnancy_warning, as: "pregnancyWarning", 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",
         ]
 
         # @return [String]
-        define_property :drug_unit, as: "drugUnit", types: [
+        define_property :rxcui, as: "rxcui", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::DrugStrength,URI]
-        define_property :available_strength, as: "availableStrength", types: [
-          "OpenActive::Models::Schema::DrugStrength",
+        # @return [OpenActive::Models::Schema::HealthInsurancePlan,URI]
+        define_property :included_in_health_insurance_plan, as: "includedInHealthInsurancePlan", types: [
+          "OpenActive::Models::Schema::HealthInsurancePlan",
           "URI",
         ]
 
-        # @return [URI]
-        define_property :prescribing_info, as: "prescribingInfo", types: [
-          "URI",
+        # @return [Boolean,nil]
+        define_property :is_available_generically, as: "isAvailableGenerically", types: [
+          "bool",
+          "null",
         ]
 
-        # @return [OpenActive::Models::Schema::DrugPrescriptionStatus,String,URI]
-        define_property :prescription_status, as: "prescriptionStatus", types: [
-          "OpenActive::Models::Schema::DrugPrescriptionStatus",
+        # @return [String]
+        define_property :breastfeeding_warning, as: "breastfeedingWarning", types: [
           "string",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::DoseSchedule,URI]
-        define_property :dose_schedule, as: "doseSchedule", types: [
-          "OpenActive::Models::Schema::DoseSchedule",
-          "URI",
         ]
       end
     end

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

@@ -13,10 +13,12 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::AdministrativeArea,URI]
-        define_property :applicable_location, as: "applicableLocation", types: [
-          "OpenActive::Models::Schema::AdministrativeArea",
-          "URI",
+        # @return [BigDecimal,String,OpenActive::Enums::Schema::QualitativeValue,nil]
+        define_property :cost_per_unit, as: "costPerUnit", types: [
+          "Number",
+          "string",
+          "OpenActive::Enums::Schema::QualitativeValue",
+          "null",
         ]
 
         # @return [String]
@@ -24,23 +26,21 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::DrugCostCategory,URI]
-        define_property :cost_category, as: "costCategory", types: [
-          "OpenActive::Models::Schema::DrugCostCategory",
-          "URI",
+        # @return [String]
+        define_property :drug_unit, as: "drugUnit", types: [
+          "string",
         ]
 
-        # @return [String,OpenActive::Enums::Schema::QualitativeValue,BigDecimal,nil]
-        define_property :cost_per_unit, as: "costPerUnit", types: [
-          "string",
-          "OpenActive::Enums::Schema::QualitativeValue",
-          "Number",
-          "null",
+        # @return [OpenActive::Models::Schema::AdministrativeArea,URI]
+        define_property :applicable_location, as: "applicableLocation", types: [
+          "OpenActive::Models::Schema::AdministrativeArea",
+          "URI",
         ]
 
-        # @return [String]
-        define_property :drug_unit, as: "drugUnit", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::DrugCostCategory,URI]
+        define_property :cost_category, as: "costCategory", types: [
+          "OpenActive::Models::Schema::DrugCostCategory",
+          "URI",
         ]
       end
     end

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

@@ -13,10 +13,9 @@ module OpenActive
           "string",
         ]
 
-        # @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 [BigDecimal,nil]
@@ -25,9 +24,10 @@ module OpenActive
           "null",
         ]
 
-        # @return [String]
-        define_property :active_ingredient, as: "activeIngredient", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::MaximumDoseSchedule,URI]
+        define_property :maximum_intake, as: "maximumIntake", types: [
+          "OpenActive::Models::Schema::MaximumDoseSchedule",
+          "URI",
         ]
 
         # @return [OpenActive::Models::Schema::AdministrativeArea,URI]

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

@@ -16,14 +16,14 @@ module OpenActive
         ]
 
         # @return [String,OpenActive::Models::Schema::DefinedTerm,URI]
-        define_property :teaches, as: "teaches", types: [
+        define_property :assesses, as: "assesses", types: [
           "string",
           "OpenActive::Models::Schema::DefinedTerm",
           "URI",
         ]
 
         # @return [OpenActive::Models::Schema::DefinedTerm,String,URI]
-        define_property :assesses, as: "assesses", types: [
+        define_property :teaches, as: "teaches", types: [
           "OpenActive::Models::Schema::DefinedTerm",
           "string",
           "URI",

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

@@ -8,13 +8,6 @@ module OpenActive
           "schema:EducationalOccupationalCredential"
         end
 
-        # @return [OpenActive::Models::Schema::DefinedTerm,URI,String]
-        define_property :credential_category, as: "credentialCategory", types: [
-          "OpenActive::Models::Schema::DefinedTerm",
-          "URI",
-          "string",
-        ]
-
         # @return [URI,OpenActive::Models::Schema::DefinedTerm,String]
         define_property :educational_level, as: "educationalLevel", types: [
           "URI",
@@ -22,23 +15,23 @@ module OpenActive
           "string",
         ]
 
+        # @return [OpenActive::Models::Schema::Organization,URI]
+        define_property :recognized_by, as: "recognizedBy", types: [
+          "OpenActive::Models::Schema::Organization",
+          "URI",
+        ]
+
         # @return [OpenActive::Models::Schema::AdministrativeArea,URI]
         define_property :valid_in, as: "validIn", types: [
           "OpenActive::Models::Schema::AdministrativeArea",
           "URI",
         ]
 
-        # @return [String,URI,OpenActive::Models::Schema::DefinedTerm]
-        define_property :competency_required, as: "competencyRequired", types: [
-          "string",
+        # @return [URI,OpenActive::Models::Schema::DefinedTerm,String]
+        define_property :credential_category, as: "credentialCategory", types: [
           "URI",
           "OpenActive::Models::Schema::DefinedTerm",
-        ]
-
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :recognized_by, as: "recognizedBy", types: [
-          "OpenActive::Models::Schema::Organization",
-          "URI",
+          "string",
         ]
 
         # @return [ActiveSupport::Duration,URI,nil]
@@ -47,6 +40,13 @@ module OpenActive
           "URI",
           "null",
         ]
+
+        # @return [URI,OpenActive::Models::Schema::DefinedTerm,String]
+        define_property :competency_required, as: "competencyRequired", types: [
+          "URI",
+          "OpenActive::Models::Schema::DefinedTerm",
+          "string",
+        ]
       end
     end
   end

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

@@ -8,57 +8,38 @@ module OpenActive
           "schema:EducationalOccupationalProgram"
         end
 
-        # @return [OpenActive::Models::Schema::Course,URI]
-        define_property :has_course, as: "hasCourse", types: [
-          "OpenActive::Models::Schema::Course",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::DefinedTerm,String,URI]
-        define_property :program_type, as: "programType", types: [
-          "OpenActive::Models::Schema::DefinedTerm",
-          "string",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::MonetaryAmountDistribution,URI]
-        define_property :training_salary, as: "trainingSalary", types: [
-          "OpenActive::Models::Schema::MonetaryAmountDistribution",
-          "URI",
-        ]
-
         # @return [Date,nil]
         define_property :application_start_date, as: "applicationStartDate", types: [
           "Date",
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::CategoryCode,String,URI]
+        # @return [String,OpenActive::Models::Schema::CategoryCode,URI]
         define_property :occupational_category, as: "occupationalCategory", types: [
-          "OpenActive::Models::Schema::CategoryCode",
           "string",
+          "OpenActive::Models::Schema::CategoryCode",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Offer,OpenActive::Models::Schema::Demand,URI]
+        # @return [OpenActive::Models::Schema::Demand,OpenActive::Models::Schema::Offer,URI]
         define_property :offers, as: "offers", types: [
-          "OpenActive::Models::Schema::Offer",
           "OpenActive::Models::Schema::Demand",
+          "OpenActive::Models::Schema::Offer",
           "URI",
         ]
 
-        # @return [DateTime,Date,nil]
-        define_property :start_date, as: "startDate", types: [
-          "DateTime",
-          "Date",
-          "null",
+        # @return [URI,String]
+        define_property :educational_program_mode, as: "educationalProgramMode", types: [
+          "URI",
+          "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Organization,OpenActive::Models::Schema::Person,URI]
-        define_property :provider, as: "provider", types: [
-          "OpenActive::Models::Schema::Organization",
-          "OpenActive::Models::Schema::Person",
+        # @return [int,OpenActive::Models::Schema::StructuredValue,URI,nil]
+        define_property :typical_credits_per_term, as: "typicalCreditsPerTerm", types: [
+          "int",
+          "OpenActive::Models::Schema::StructuredValue",
           "URI",
+          "null",
         ]
 
         # @return [BigDecimal,nil]
@@ -67,56 +48,48 @@ module OpenActive
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::MonetaryAmountDistribution,URI]
-        define_property :salary_upon_completion, as: "salaryUponCompletion", types: [
-          "OpenActive::Models::Schema::MonetaryAmountDistribution",
-          "URI",
-        ]
-
-        # @return [URI,String,OpenActive::Models::Schema::EducationalOccupationalCredential]
-        define_property :occupational_credential_awarded, as: "occupationalCredentialAwarded", types: [
-          "URI",
-          "string",
-          "OpenActive::Models::Schema::EducationalOccupationalCredential",
+        # @return [int,nil]
+        define_property :maximum_enrollment, as: "maximumEnrollment", types: [
+          "int",
+          "null",
         ]
 
-        # @return [OpenActive::Models::Schema::DefinedTerm,String,URI]
-        define_property :financial_aid_eligible, as: "financialAidEligible", types: [
-          "OpenActive::Models::Schema::DefinedTerm",
-          "string",
+        # @return [OpenActive::Models::Schema::Course,URI]
+        define_property :has_course, as: "hasCourse", types: [
+          "OpenActive::Models::Schema::Course",
           "URI",
         ]
 
-        # @return [OpenActive::Enums::Schema::DayOfWeek,nil]
-        define_property :day_of_week, as: "dayOfWeek", types: [
-          "OpenActive::Enums::Schema::DayOfWeek",
-          "null",
-        ]
-
         # @return [Date,DateTime,nil]
-        define_property :end_date, as: "endDate", types: [
+        define_property :start_date, as: "startDate", types: [
           "Date",
           "DateTime",
           "null",
         ]
 
-        # @return [String,URI]
-        define_property :educational_program_mode, as: "educationalProgramMode", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::MonetaryAmountDistribution,URI]
+        define_property :training_salary, as: "trainingSalary", types: [
+          "OpenActive::Models::Schema::MonetaryAmountDistribution",
           "URI",
         ]
 
-        # @return [int,nil]
-        define_property :maximum_enrollment, as: "maximumEnrollment", types: [
+        # @return [int,OpenActive::Models::Schema::StructuredValue,URI,nil]
+        define_property :number_of_credits, as: "numberOfCredits", types: [
           "int",
+          "OpenActive::Models::Schema::StructuredValue",
+          "URI",
           "null",
         ]
 
-        # @return [ActiveSupport::Duration,URI,nil]
-        define_property :term_duration, as: "termDuration", types: [
-          "DateInterval",
+        # @return [OpenActive::Models::Schema::MonetaryAmountDistribution,URI]
+        define_property :salary_upon_completion, as: "salaryUponCompletion", types: [
+          "OpenActive::Models::Schema::MonetaryAmountDistribution",
           "URI",
-          "null",
+        ]
+
+        # @return [String]
+        define_property :time_of_day, as: "timeOfDay", types: [
+          "string",
         ]
 
         # @return [Date,nil]
@@ -125,11 +98,16 @@ module OpenActive
           "null",
         ]
 
-        # @return [int,OpenActive::Models::Schema::StructuredValue,URI,nil]
-        define_property :typical_credits_per_term, as: "typicalCreditsPerTerm", types: [
-          "int",
-          "OpenActive::Models::Schema::StructuredValue",
+        # @return [OpenActive::Models::Schema::DefinedTerm,String,URI]
+        define_property :program_type, as: "programType", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
+          "string",
           "URI",
+        ]
+
+        # @return [OpenActive::Enums::Schema::DayOfWeek,nil]
+        define_property :day_of_week, as: "dayOfWeek", types: [
+          "OpenActive::Enums::Schema::DayOfWeek",
           "null",
         ]
 
@@ -140,32 +118,54 @@ module OpenActive
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::StructuredValue,int,URI,nil]
-        define_property :number_of_credits, as: "numberOfCredits", types: [
-          "OpenActive::Models::Schema::StructuredValue",
-          "int",
+        # @return [ActiveSupport::Duration,URI,nil]
+        define_property :term_duration, as: "termDuration", types: [
+          "DateInterval",
           "URI",
           "null",
         ]
 
-        # @return [String]
-        define_property :time_of_day, as: "timeOfDay", types: [
+        # @return [String,OpenActive::Models::Schema::DefinedTerm,URI]
+        define_property :financial_aid_eligible, as: "financialAidEligible", types: [
           "string",
+          "OpenActive::Models::Schema::DefinedTerm",
+          "URI",
         ]
 
         # @return [URI,String,OpenActive::Models::Schema::EducationalOccupationalCredential]
-        define_property :educational_credential_awarded, as: "educationalCredentialAwarded", types: [
+        define_property :occupational_credential_awarded, as: "occupationalCredentialAwarded", types: [
           "URI",
           "string",
           "OpenActive::Models::Schema::EducationalOccupationalCredential",
         ]
 
-        # @return [OpenActive::Models::Schema::Course,OpenActive::Models::Schema::AlignmentObject,OpenActive::Models::Schema::EducationalOccupationalCredential,String,URI]
-        define_property :program_prerequisites, as: "programPrerequisites", types: [
-          "OpenActive::Models::Schema::Course",
-          "OpenActive::Models::Schema::AlignmentObject",
+        # @return [OpenActive::Models::Schema::Person,OpenActive::Models::Schema::Organization,URI]
+        define_property :provider, as: "provider", types: [
+          "OpenActive::Models::Schema::Person",
+          "OpenActive::Models::Schema::Organization",
+          "URI",
+        ]
+
+        # @return [OpenActive::Models::Schema::EducationalOccupationalCredential,URI,String]
+        define_property :educational_credential_awarded, as: "educationalCredentialAwarded", types: [
           "OpenActive::Models::Schema::EducationalOccupationalCredential",
+          "URI",
           "string",
+        ]
+
+        # @return [Date,DateTime,nil]
+        define_property :end_date, as: "endDate", types: [
+          "Date",
+          "DateTime",
+          "null",
+        ]
+
+        # @return [String,OpenActive::Models::Schema::EducationalOccupationalCredential,OpenActive::Models::Schema::AlignmentObject,OpenActive::Models::Schema::Course,URI]
+        define_property :program_prerequisites, as: "programPrerequisites", types: [
+          "string",
+          "OpenActive::Models::Schema::EducationalOccupationalCredential",
+          "OpenActive::Models::Schema::AlignmentObject",
+          "OpenActive::Models::Schema::Course",
           "URI",
         ]
       end

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

@@ -1,7 +1,7 @@
 module OpenActive
   module Models
     module Schema
-      class EducationalOrganization < ::OpenActive::Models::Schema::Organization
+      class EducationalOrganization < ::OpenActive::Models::Schema::CivicStructure
         # @!attribute type
         # @return [String]
         def type