openactive 0.2.2 → 0.3.0

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

@@ -8,41 +8,41 @@ module OpenActive
           "schema:GeoCoordinates"
         end
 
-        # @return [String,OpenActive::Models::Schema::PostalAddress,URI]
-        define_property :address, as: "address", types: [
+        # @return [OpenActive::Models::Schema::Country,String,URI]
+        define_property :address_country, as: "addressCountry", types: [
+          "OpenActive::Models::Schema::Country",
           "string",
-          "OpenActive::Models::Schema::PostalAddress",
           "URI",
         ]
 
         # @return [String,BigDecimal,nil]
-        define_property :longitude, as: "longitude", types: [
+        define_property :latitude, as: "latitude", types: [
           "string",
           "Number",
           "null",
         ]
 
-        # @return [String,OpenActive::Models::Schema::Country,URI]
-        define_property :address_country, as: "addressCountry", types: [
+        # @return [String,OpenActive::Models::Schema::PostalAddress,URI]
+        define_property :address, as: "address", types: [
           "string",
-          "OpenActive::Models::Schema::Country",
+          "OpenActive::Models::Schema::PostalAddress",
           "URI",
         ]
 
-        # @return [String,BigDecimal,nil]
-        define_property :latitude, as: "latitude", types: [
+        # @return [String]
+        define_property :postal_code, as: "postalCode", types: [
           "string",
-          "Number",
-          "null",
         ]
 
-        # @return [String]
-        define_property :postal_code, as: "postalCode", types: [
+        # @return [String,BigDecimal,nil]
+        define_property :elevation, as: "elevation", types: [
           "string",
+          "Number",
+          "null",
         ]
 
         # @return [BigDecimal,String,nil]
-        define_property :elevation, as: "elevation", types: [
+        define_property :longitude, as: "longitude", types: [
           "Number",
           "string",
           "null",

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

@@ -8,9 +8,11 @@ module OpenActive
           "schema:GeoShape"
         end
 
-        # @return [String]
-        define_property :polygon, as: "polygon", types: [
+        # @return [OpenActive::Models::Schema::Country,String,URI]
+        define_property :address_country, as: "addressCountry", types: [
+          "OpenActive::Models::Schema::Country",
           "string",
+          "URI",
         ]
 
         # @return [String]
@@ -18,28 +20,21 @@ module OpenActive
           "string",
         ]
 
-        # @return [String,OpenActive::Models::Schema::PostalAddress,URI]
-        define_property :address, as: "address", types: [
-          "string",
-          "OpenActive::Models::Schema::PostalAddress",
-          "URI",
-        ]
-
-        # @return [String,OpenActive::Models::Schema::Country,URI]
-        define_property :address_country, as: "addressCountry", types: [
+        # @return [String]
+        define_property :line, as: "line", types: [
           "string",
-          "OpenActive::Models::Schema::Country",
-          "URI",
         ]
 
         # @return [String]
-        define_property :line, as: "line", types: [
+        define_property :polygon, as: "polygon", types: [
           "string",
         ]
 
-        # @return [String]
-        define_property :box, as: "box", types: [
+        # @return [String,OpenActive::Models::Schema::PostalAddress,URI]
+        define_property :address, as: "address", types: [
           "string",
+          "OpenActive::Models::Schema::PostalAddress",
+          "URI",
         ]
 
         # @return [String]
@@ -47,12 +42,17 @@ module OpenActive
           "string",
         ]
 
-        # @return [BigDecimal,String,nil]
+        # @return [String,BigDecimal,nil]
         define_property :elevation, as: "elevation", types: [
-          "Number",
           "string",
+          "Number",
           "null",
         ]
+
+        # @return [String]
+        define_property :box, as: "box", types: [
+          "string",
+        ]
       end
     end
   end

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

@@ -8,41 +8,34 @@ module OpenActive
           "schema:GeospatialGeometry"
         end
 
-        # @return [OpenActive::Models::Schema::GeospatialGeometry,OpenActive::Models::Schema::Place,URI]
-        define_property :geo_intersects, as: "geoIntersects", types: [
-          "OpenActive::Models::Schema::GeospatialGeometry",
+        # @return [OpenActive::Models::Schema::Place,OpenActive::Models::Schema::GeospatialGeometry,URI]
+        define_property :geo_contains, as: "geoContains", types: [
           "OpenActive::Models::Schema::Place",
+          "OpenActive::Models::Schema::GeospatialGeometry",
           "URI",
         ]
 
         # @return [OpenActive::Models::Schema::GeospatialGeometry,OpenActive::Models::Schema::Place,URI]
-        define_property :geo_covered_by, as: "geoCoveredBy", types: [
+        define_property :geo_intersects, as: "geoIntersects", types: [
           "OpenActive::Models::Schema::GeospatialGeometry",
           "OpenActive::Models::Schema::Place",
           "URI",
         ]
 
         # @return [OpenActive::Models::Schema::Place,OpenActive::Models::Schema::GeospatialGeometry,URI]
-        define_property :geo_overlaps, as: "geoOverlaps", types: [
+        define_property :geo_touches, as: "geoTouches", types: [
           "OpenActive::Models::Schema::Place",
           "OpenActive::Models::Schema::GeospatialGeometry",
           "URI",
         ]
 
         # @return [OpenActive::Models::Schema::Place,OpenActive::Models::Schema::GeospatialGeometry,URI]
-        define_property :geo_within, as: "geoWithin", types: [
+        define_property :geo_covered_by, as: "geoCoveredBy", types: [
           "OpenActive::Models::Schema::Place",
           "OpenActive::Models::Schema::GeospatialGeometry",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::GeospatialGeometry,OpenActive::Models::Schema::Place,URI]
-        define_property :geo_covers, as: "geoCovers", types: [
-          "OpenActive::Models::Schema::GeospatialGeometry",
-          "OpenActive::Models::Schema::Place",
-          "URI",
-        ]
-
         # @return [OpenActive::Models::Schema::Place,OpenActive::Models::Schema::GeospatialGeometry,URI]
         define_property :geo_equals, as: "geoEquals", types: [
           "OpenActive::Models::Schema::Place",
@@ -50,29 +43,36 @@ module OpenActive
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Place,OpenActive::Models::Schema::GeospatialGeometry,URI]
-        define_property :geo_disjoint, as: "geoDisjoint", types: [
+        # @return [OpenActive::Models::Schema::GeospatialGeometry,OpenActive::Models::Schema::Place,URI]
+        define_property :geo_crosses, as: "geoCrosses", types: [
+          "OpenActive::Models::Schema::GeospatialGeometry",
           "OpenActive::Models::Schema::Place",
+          "URI",
+        ]
+
+        # @return [OpenActive::Models::Schema::GeospatialGeometry,OpenActive::Models::Schema::Place,URI]
+        define_property :geo_covers, as: "geoCovers", types: [
           "OpenActive::Models::Schema::GeospatialGeometry",
+          "OpenActive::Models::Schema::Place",
           "URI",
         ]
 
         # @return [OpenActive::Models::Schema::Place,OpenActive::Models::Schema::GeospatialGeometry,URI]
-        define_property :geo_touches, as: "geoTouches", types: [
+        define_property :geo_within, as: "geoWithin", types: [
           "OpenActive::Models::Schema::Place",
           "OpenActive::Models::Schema::GeospatialGeometry",
           "URI",
         ]
 
         # @return [OpenActive::Models::Schema::GeospatialGeometry,OpenActive::Models::Schema::Place,URI]
-        define_property :geo_crosses, as: "geoCrosses", types: [
+        define_property :geo_disjoint, as: "geoDisjoint", types: [
           "OpenActive::Models::Schema::GeospatialGeometry",
           "OpenActive::Models::Schema::Place",
           "URI",
         ]
 
         # @return [OpenActive::Models::Schema::GeospatialGeometry,OpenActive::Models::Schema::Place,URI]
-        define_property :geo_contains, as: "geoContains", types: [
+        define_property :geo_overlaps, as: "geoOverlaps", types: [
           "OpenActive::Models::Schema::GeospatialGeometry",
           "OpenActive::Models::Schema::Place",
           "URI",

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

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

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

@@ -8,16 +8,16 @@ module OpenActive
           "schema:GovernmentService"
         end
 
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :service_operator, as: "serviceOperator", types: [
-          "OpenActive::Models::Schema::Organization",
+        # @return [String,OpenActive::Models::Schema::AdministrativeArea,URI]
+        define_property :jurisdiction, as: "jurisdiction", types: [
+          "string",
+          "OpenActive::Models::Schema::AdministrativeArea",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::AdministrativeArea,String,URI]
-        define_property :jurisdiction, as: "jurisdiction", types: [
-          "OpenActive::Models::Schema::AdministrativeArea",
-          "string",
+        # @return [OpenActive::Models::Schema::Organization,URI]
+        define_property :service_operator, as: "serviceOperator", types: [
+          "OpenActive::Models::Schema::Organization",
           "URI",
         ]
       end

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

@@ -8,16 +8,29 @@ module OpenActive
           "schema:Grant"
         end
 
-        # @return [OpenActive::Models::Schema::Person,OpenActive::Models::Schema::Organization,URI]
-        define_property :sponsor, as: "sponsor", types: [
-          "OpenActive::Models::Schema::Person",
+        # @return [OpenActive::Models::Schema::Organization,OpenActive::Models::Schema::Person,URI]
+        define_property :funder, as: "funder", types: [
           "OpenActive::Models::Schema::Organization",
+          "OpenActive::Models::Schema::Person",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Thing,URI]
+        # @return [OpenActive::Models::Schema::Product,OpenActive::Models::Schema::Person,OpenActive::Models::Schema::BioChemEntity,OpenActive::Models::Schema::Event,OpenActive::Models::Schema::MedicalEntity,OpenActive::Models::Schema::CreativeWork,OpenActive::Models::Schema::Organization,URI]
         define_property :funded_item, as: "fundedItem", types: [
-          "OpenActive::Models::Schema::Thing",
+          "OpenActive::Models::Schema::Product",
+          "OpenActive::Models::Schema::Person",
+          "OpenActive::Models::Schema::BioChemEntity",
+          "OpenActive::Models::Schema::Event",
+          "OpenActive::Models::Schema::MedicalEntity",
+          "OpenActive::Models::Schema::CreativeWork",
+          "OpenActive::Models::Schema::Organization",
+          "URI",
+        ]
+
+        # @return [OpenActive::Models::Schema::Organization,OpenActive::Models::Schema::Person,URI]
+        define_property :sponsor, as: "sponsor", types: [
+          "OpenActive::Models::Schema::Organization",
+          "OpenActive::Models::Schema::Person",
           "URI",
         ]
       end

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

@@ -8,53 +8,53 @@ module OpenActive
           "schema:HealthInsurancePlan"
         end
 
-        # @return [String,URI]
-        define_property :uses_health_plan_id_standard, as: "usesHealthPlanIdStandard", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::HealthPlanFormulary,URI]
+        define_property :includes_health_plan_formulary, as: "includesHealthPlanFormulary", types: [
+          "OpenActive::Models::Schema::HealthPlanFormulary",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::ContactPoint,URI]
-        define_property :contact_point, as: "contactPoint", types: [
-          "OpenActive::Models::Schema::ContactPoint",
+        # @return [URI]
+        define_property :benefits_summary_url, as: "benefitsSummaryUrl", types: [
           "URI",
         ]
 
         # @return [String]
-        define_property :health_plan_drug_tier, as: "healthPlanDrugTier", types: [
+        define_property :health_plan_drug_option, as: "healthPlanDrugOption", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::HealthPlanNetwork,URI]
-        define_property :includes_health_plan_network, as: "includesHealthPlanNetwork", types: [
-          "OpenActive::Models::Schema::HealthPlanNetwork",
-          "URI",
+        # @return [String]
+        define_property :health_plan_drug_tier, as: "healthPlanDrugTier", types: [
+          "string",
         ]
 
-        # @return [URI]
-        define_property :health_plan_marketing_url, as: "healthPlanMarketingUrl", types: [
-          "URI",
+        # @return [String]
+        define_property :health_plan_id, as: "healthPlanId", types: [
+          "string",
         ]
 
-        # @return [OpenActive::Models::Schema::HealthPlanFormulary,URI]
-        define_property :includes_health_plan_formulary, as: "includesHealthPlanFormulary", types: [
-          "OpenActive::Models::Schema::HealthPlanFormulary",
+        # @return [OpenActive::Models::Schema::ContactPoint,URI]
+        define_property :contact_point, as: "contactPoint", types: [
+          "OpenActive::Models::Schema::ContactPoint",
           "URI",
         ]
 
-        # @return [URI]
-        define_property :benefits_summary_url, as: "benefitsSummaryUrl", types: [
+        # @return [URI,String]
+        define_property :uses_health_plan_id_standard, as: "usesHealthPlanIdStandard", types: [
           "URI",
+          "string",
         ]
 
-        # @return [String]
-        define_property :health_plan_id, as: "healthPlanId", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::HealthPlanNetwork,URI]
+        define_property :includes_health_plan_network, as: "includesHealthPlanNetwork", types: [
+          "OpenActive::Models::Schema::HealthPlanNetwork",
+          "URI",
         ]
 
-        # @return [String]
-        define_property :health_plan_drug_option, as: "healthPlanDrugOption", types: [
-          "string",
+        # @return [URI]
+        define_property :health_plan_marketing_url, as: "healthPlanMarketingUrl", types: [
+          "URI",
         ]
       end
     end

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

@@ -8,14 +8,14 @@ module OpenActive
           "schema:HealthPlanCostSharingSpecification"
         end
 
-        # @return [OpenActive::Models::Schema::PriceSpecification,URI]
-        define_property :health_plan_copay, as: "healthPlanCopay", types: [
-          "OpenActive::Models::Schema::PriceSpecification",
-          "URI",
+        # @return [BigDecimal,nil]
+        define_property :health_plan_coinsurance_rate, as: "healthPlanCoinsuranceRate", types: [
+          "Number",
+          "null",
         ]
 
         # @return [String]
-        define_property :health_plan_copay_option, as: "healthPlanCopayOption", types: [
+        define_property :health_plan_coinsurance_option, as: "healthPlanCoinsuranceOption", types: [
           "string",
         ]
 
@@ -24,14 +24,14 @@ module OpenActive
           "string",
         ]
 
-        # @return [BigDecimal,nil]
-        define_property :health_plan_coinsurance_rate, as: "healthPlanCoinsuranceRate", types: [
-          "Number",
-          "null",
+        # @return [OpenActive::Models::Schema::PriceSpecification,URI]
+        define_property :health_plan_copay, as: "healthPlanCopay", types: [
+          "OpenActive::Models::Schema::PriceSpecification",
+          "URI",
         ]
 
         # @return [String]
-        define_property :health_plan_coinsurance_option, as: "healthPlanCoinsuranceOption", types: [
+        define_property :health_plan_copay_option, as: "healthPlanCopayOption", types: [
           "string",
         ]
       end

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

@@ -8,6 +8,12 @@ module OpenActive
           "schema:HealthPlanFormulary"
         end
 
+        # @return [Boolean,nil]
+        define_property :offers_prescription_by_mail, as: "offersPrescriptionByMail", types: [
+          "bool",
+          "null",
+        ]
+
         # @return [String]
         define_property :health_plan_drug_tier, as: "healthPlanDrugTier", types: [
           "string",
@@ -18,12 +24,6 @@ module OpenActive
           "bool",
           "null",
         ]
-
-        # @return [Boolean,nil]
-        define_property :offers_prescription_by_mail, as: "offersPrescriptionByMail", types: [
-          "bool",
-          "null",
-        ]
       end
     end
   end

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

@@ -8,11 +8,6 @@ module OpenActive
           "schema:HealthPlanNetwork"
         end
 
-        # @return [String]
-        define_property :health_plan_network_tier, as: "healthPlanNetworkTier", types: [
-          "string",
-        ]
-
         # @return [String]
         define_property :health_plan_network_id, as: "healthPlanNetworkId", types: [
           "string",
@@ -23,6 +18,11 @@ module OpenActive
           "bool",
           "null",
         ]
+
+        # @return [String]
+        define_property :health_plan_network_tier, as: "healthPlanNetworkTier", types: [
+          "string",
+        ]
       end
     end
   end

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

@@ -1,25 +1,25 @@
 module OpenActive
   module Models
     module Schema
-      class Hospital < ::OpenActive::Models::Schema::CivicStructure
+      class Hospital < ::OpenActive::Models::Schema::MedicalOrganization
         # @!attribute type
         # @return [String]
         def type
           "schema:Hospital"
         end
 
-        # @return [OpenActive::Models::Schema::MedicalTest,OpenActive::Models::Schema::MedicalTherapy,OpenActive::Models::Schema::MedicalProcedure,URI]
+        # @return [OpenActive::Models::Schema::MedicalTest,OpenActive::Models::Schema::MedicalProcedure,OpenActive::Models::Schema::MedicalTherapy,URI]
         define_property :available_service, as: "availableService", types: [
           "OpenActive::Models::Schema::MedicalTest",
-          "OpenActive::Models::Schema::MedicalTherapy",
           "OpenActive::Models::Schema::MedicalProcedure",
+          "OpenActive::Models::Schema::MedicalTherapy",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::CDCPMDRecord,OpenActive::Models::Schema::Dataset,URI]
+        # @return [OpenActive::Models::Schema::Dataset,OpenActive::Models::Schema::CDCPMDRecord,URI]
         define_property :healthcare_reporting_data, as: "healthcareReportingData", types: [
-          "OpenActive::Models::Schema::CDCPMDRecord",
           "OpenActive::Models::Schema::Dataset",
+          "OpenActive::Models::Schema::CDCPMDRecord",
           "URI",
         ]
 

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

@@ -8,10 +8,10 @@ module OpenActive
           "schema:House"
         end
 
-        # @return [BigDecimal,OpenActive::Models::Schema::QuantitativeValue,URI,nil]
+        # @return [OpenActive::Models::Schema::QuantitativeValue,BigDecimal,URI,nil]
         define_property :number_of_rooms, as: "numberOfRooms", types: [
-          "Number",
           "OpenActive::Models::Schema::QuantitativeValue",
+          "Number",
           "URI",
           "null",
         ]

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

@@ -8,6 +8,20 @@ module OpenActive
           "schema:HowTo"
         end
 
+        # @return [String,OpenActive::Models::Schema::QuantitativeValue,URI]
+        define_property :yield, as: "yield", types: [
+          "string",
+          "OpenActive::Models::Schema::QuantitativeValue",
+          "URI",
+        ]
+
+        # @return [String,OpenActive::Models::Schema::MonetaryAmount,URI]
+        define_property :estimated_cost, as: "estimatedCost", types: [
+          "string",
+          "OpenActive::Models::Schema::MonetaryAmount",
+          "URI",
+        ]
+
         # @return [OpenActive::Models::Schema::HowToSupply,String,URI]
         define_property :supply, as: "supply", types: [
           "OpenActive::Models::Schema::HowToSupply",
@@ -15,60 +29,46 @@ module OpenActive
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::HowToStep,String,OpenActive::Models::Schema::CreativeWork,OpenActive::Models::Schema::HowToSection,URI]
+        # @return [OpenActive::Models::Schema::HowToStep,OpenActive::Models::Schema::HowToSection,String,OpenActive::Models::Schema::CreativeWork,URI]
         define_property :step, as: "step", types: [
           "OpenActive::Models::Schema::HowToStep",
+          "OpenActive::Models::Schema::HowToSection",
           "string",
           "OpenActive::Models::Schema::CreativeWork",
-          "OpenActive::Models::Schema::HowToSection",
           "URI",
         ]
 
         # @return [ActiveSupport::Duration,URI,nil]
-        define_property :perform_time, as: "performTime", types: [
+        define_property :total_time, as: "totalTime", types: [
           "DateInterval",
           "URI",
           "null",
         ]
 
-        # @return [String,OpenActive::Models::Schema::MonetaryAmount,URI]
-        define_property :estimated_cost, as: "estimatedCost", types: [
-          "string",
-          "OpenActive::Models::Schema::MonetaryAmount",
-          "URI",
-        ]
-
-        # @return [String,OpenActive::Models::Schema::QuantitativeValue,URI]
-        define_property :yield, as: "yield", types: [
+        # @return [OpenActive::Models::Schema::HowToTool,String,URI]
+        define_property :tool, as: "tool", types: [
+          "OpenActive::Models::Schema::HowToTool",
           "string",
-          "OpenActive::Models::Schema::QuantitativeValue",
           "URI",
         ]
 
         # @return [ActiveSupport::Duration,URI,nil]
-        define_property :total_time, as: "totalTime", types: [
+        define_property :prep_time, as: "prepTime", types: [
           "DateInterval",
           "URI",
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::CreativeWork,OpenActive::Models::Schema::ItemList,String,URI]
+        # @return [OpenActive::Models::Schema::ItemList,OpenActive::Models::Schema::CreativeWork,String,URI]
         define_property :steps, as: "steps", types: [
-          "OpenActive::Models::Schema::CreativeWork",
           "OpenActive::Models::Schema::ItemList",
+          "OpenActive::Models::Schema::CreativeWork",
           "string",
           "URI",
         ]
 
-        # @return [String,OpenActive::Models::Schema::HowToTool,URI]
-        define_property :tool, as: "tool", types: [
-          "string",
-          "OpenActive::Models::Schema::HowToTool",
-          "URI",
-        ]
-
         # @return [ActiveSupport::Duration,URI,nil]
-        define_property :prep_time, as: "prepTime", types: [
+        define_property :perform_time, as: "performTime", types: [
           "DateInterval",
           "URI",
           "null",