openactive 0.2.2 → 0.3.0

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

@@ -8,104 +8,140 @@ module OpenActive
           "schema:Product"
         end
 
-        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
-        define_property :has_measurement, as: "hasMeasurement", types: [
-          "OpenActive::Models::Schema::QuantitativeValue",
+        # @return [OpenActive::Models::Schema::Product,URI]
+        define_property :is_accessory_or_spare_part_for, as: "isAccessoryOrSparePartFor", types: [
+          "OpenActive::Models::Schema::Product",
           "URI",
         ]
 
-        # @return [OpenActive::Enums::Schema::OfferItemCondition,nil]
-        define_property :item_condition, as: "itemCondition", types: [
-          "OpenActive::Enums::Schema::OfferItemCondition",
+        # @return [OpenActive::Enums::Schema::AdultOrientedEnumeration,nil]
+        define_property :has_adult_consideration, as: "hasAdultConsideration", types: [
+          "OpenActive::Enums::Schema::AdultOrientedEnumeration",
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::AggregateRating,URI]
-        define_property :aggregate_rating, as: "aggregateRating", types: [
-          "OpenActive::Models::Schema::AggregateRating",
-          "URI",
+        # @return [String]
+        define_property :gtin12, as: "gtin12", types: [
+          "string",
         ]
 
-        # @return [OpenActive::Models::Schema::DefinedTerm,OpenActive::Models::Schema::SizeSpecification,OpenActive::Models::Schema::QuantitativeValue,String,URI]
-        define_property :size, as: "size", types: [
-          "OpenActive::Models::Schema::DefinedTerm",
-          "OpenActive::Models::Schema::SizeSpecification",
-          "OpenActive::Models::Schema::QuantitativeValue",
+        # @return [String]
+        define_property :nsn, as: "nsn", types: [
+          "string",
+        ]
+
+        # @return [String,URI,OpenActive::Models::Schema::Product]
+        define_property :material, as: "material", types: [
           "string",
           "URI",
+          "OpenActive::Models::Schema::Product",
         ]
 
-        # @return [OpenActive::Models::Schema::Distance,OpenActive::Models::Schema::QuantitativeValue,URI]
-        define_property :depth, as: "depth", types: [
-          "OpenActive::Models::Schema::Distance",
-          "OpenActive::Models::Schema::QuantitativeValue",
+        # @return [OpenActive::Models::Schema::Review,URI]
+        define_property :review, as: "review", types: [
+          "OpenActive::Models::Schema::Review",
           "URI",
         ]
 
+        # @return [String]
+        define_property :award, as: "award", types: [
+          "string",
+        ]
+
         # @return [OpenActive::Models::Schema::QuantitativeValue,OpenActive::Models::Schema::Distance,URI]
-        define_property :height, as: "height", types: [
+        define_property :width, as: "width", types: [
           "OpenActive::Models::Schema::QuantitativeValue",
           "OpenActive::Models::Schema::Distance",
           "URI",
         ]
 
-        # @return [String]
-        define_property :gtin12, as: "gtin12", types: [
+        # @return [OpenActive::Models::Schema::Country,URI]
+        define_property :country_of_origin, as: "countryOfOrigin", types: [
+          "OpenActive::Models::Schema::Country",
+          "URI",
+        ]
+
+        # @return [OpenActive::Models::Schema::DefinedTerm,String,URI]
+        define_property :pattern, as: "pattern", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
           "string",
+          "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Product,OpenActive::Models::Schema::Service,URI]
-        define_property :is_similar_to, as: "isSimilarTo", types: [
-          "OpenActive::Models::Schema::Product",
-          "OpenActive::Models::Schema::Service",
+        # @return [URI,String,OpenActive::Enums::Schema::PhysicalActivityCategory,OpenActive::Models::Schema::Thing,OpenActive::Models::Schema::CategoryCode,nil]
+        define_property :category, as: "category", types: [
           "URI",
+          "string",
+          "OpenActive::Enums::Schema::PhysicalActivityCategory",
+          "OpenActive::Models::Schema::Thing",
+          "OpenActive::Models::Schema::CategoryCode",
+          "null",
         ]
 
-        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
-        define_property :weight, as: "weight", types: [
-          "OpenActive::Models::Schema::QuantitativeValue",
+        # @return [OpenActive::Models::Schema::Grant,URI]
+        define_property :funding, as: "funding", types: [
+          "OpenActive::Models::Schema::Grant",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::MerchantReturnPolicy,URI]
-        define_property :has_merchant_return_policy, as: "hasMerchantReturnPolicy", types: [
-          "OpenActive::Models::Schema::MerchantReturnPolicy",
+        # @return [String]
+        define_property :mpn, as: "mpn", types: [
+          "string",
+        ]
+
+        # @return [OpenActive::Models::Schema::Distance,OpenActive::Models::Schema::QuantitativeValue,URI]
+        define_property :height, as: "height", types: [
+          "OpenActive::Models::Schema::Distance",
+          "OpenActive::Models::Schema::QuantitativeValue",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Offer,OpenActive::Models::Schema::Demand,URI]
-        define_property :offers, as: "offers", types: [
-          "OpenActive::Models::Schema::Offer",
-          "OpenActive::Models::Schema::Demand",
+        # @return [OpenActive::Models::Schema::DefinedTerm,String,URI]
+        define_property :keywords, as: "keywords", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
+          "string",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::QuantitativeValue,OpenActive::Models::Schema::Distance,URI]
-        define_property :width, as: "width", types: [
-          "OpenActive::Models::Schema::QuantitativeValue",
-          "OpenActive::Models::Schema::Distance",
+        # @return [Date,nil]
+        define_property :purchase_date, as: "purchaseDate", types: [
+          "Date",
+          "null",
+        ]
+
+        # @return [OpenActive::Models::Schema::EnergyConsumptionDetails,URI]
+        define_property :has_energy_consumption_details, as: "hasEnergyConsumptionDetails", types: [
+          "OpenActive::Models::Schema::EnergyConsumptionDetails",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Product,URI]
-        define_property :is_consumable_for, as: "isConsumableFor", types: [
-          "OpenActive::Models::Schema::Product",
+        # @return [OpenActive::Models::Schema::Audience,URI]
+        define_property :audience, as: "audience", types: [
+          "OpenActive::Models::Schema::Audience",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Review,URI]
-        define_property :reviews, as: "reviews", types: [
-          "OpenActive::Models::Schema::Review",
+        # @return [OpenActive::Models::Schema::Offer,OpenActive::Models::Schema::Demand,URI]
+        define_property :offers, as: "offers", types: [
+          "OpenActive::Models::Schema::Offer",
+          "OpenActive::Models::Schema::Demand",
           "URI",
         ]
 
-        # @return [String]
-        define_property :award, as: "award", types: [
-          "string",
+        # @return [Date,nil]
+        define_property :production_date, as: "productionDate", types: [
+          "Date",
+          "null",
+        ]
+
+        # @return [OpenActive::Enums::Schema::OfferItemCondition,nil]
+        define_property :item_condition, as: "itemCondition", types: [
+          "OpenActive::Enums::Schema::OfferItemCondition",
+          "null",
         ]
 
         # @return [String]
-        define_property :gtin13, as: "gtin13", types: [
+        define_property :awards, as: "awards", types: [
           "string",
         ]
 
@@ -114,16 +150,14 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Review,URI]
-        define_property :review, as: "review", types: [
-          "OpenActive::Models::Schema::Review",
-          "URI",
+        # @return [String]
+        define_property :product_id, as: "productID", types: [
+          "string",
         ]
 
-        # @return [OpenActive::Models::Schema::EnergyConsumptionDetails,URI]
-        define_property :has_energy_consumption_details, as: "hasEnergyConsumptionDetails", types: [
-          "OpenActive::Models::Schema::EnergyConsumptionDetails",
-          "URI",
+        # @return [String]
+        define_property :country_of_assembly, as: "countryOfAssembly", types: [
+          "string",
         ]
 
         # @return [String]
@@ -131,41 +165,35 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::PropertyValue,URI]
-        define_property :additional_property, as: "additionalProperty", types: [
-          "OpenActive::Models::Schema::PropertyValue",
+        # @return [OpenActive::Models::Schema::AggregateRating,URI]
+        define_property :aggregate_rating, as: "aggregateRating", types: [
+          "OpenActive::Models::Schema::AggregateRating",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::ImageObject,URI]
-        define_property :logo, as: "logo", types: [
-          "OpenActive::Models::Schema::ImageObject",
+        # @return [OpenActive::Models::Schema::Service,OpenActive::Models::Schema::Product,URI]
+        define_property :is_similar_to, as: "isSimilarTo", types: [
+          "OpenActive::Models::Schema::Service",
+          "OpenActive::Models::Schema::Product",
           "URI",
         ]
 
-        # @return [String]
-        define_property :mpn, as: "mpn", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::Distance,OpenActive::Models::Schema::QuantitativeValue,URI]
+        define_property :depth, as: "depth", types: [
+          "OpenActive::Models::Schema::Distance",
+          "OpenActive::Models::Schema::QuantitativeValue",
+          "URI",
         ]
 
         # @return [String]
-        define_property :in_product_group_with_id, as: "inProductGroupWithID", types: [
-          "string",
-        ]
-
-        # @return [OpenActive::Enums::Schema::PhysicalActivityCategory,String,URI,OpenActive::Models::Schema::Thing,nil]
-        define_property :category, as: "category", types: [
-          "OpenActive::Enums::Schema::PhysicalActivityCategory",
+        define_property :country_of_last_processing, as: "countryOfLastProcessing", types: [
           "string",
-          "URI",
-          "OpenActive::Models::Schema::Thing",
-          "null",
         ]
 
-        # @return [OpenActive::Models::Schema::ProductGroup,OpenActive::Models::Schema::ProductModel,URI]
+        # @return [OpenActive::Models::Schema::ProductModel,OpenActive::Models::Schema::ProductGroup,URI]
         define_property :is_variant_of, as: "isVariantOf", types: [
-          "OpenActive::Models::Schema::ProductGroup",
           "OpenActive::Models::Schema::ProductModel",
+          "OpenActive::Models::Schema::ProductGroup",
           "URI",
         ]
 
@@ -174,44 +202,50 @@ module OpenActive
           "string",
         ]
 
-        # @return [String,OpenActive::Models::Schema::DefinedTerm,URI]
-        define_property :pattern, as: "pattern", types: [
-          "string",
-          "OpenActive::Models::Schema::DefinedTerm",
+        # @return [OpenActive::Models::Schema::Organization,OpenActive::Models::Schema::Brand,URI]
+        define_property :brand, as: "brand", types: [
+          "OpenActive::Models::Schema::Organization",
+          "OpenActive::Models::Schema::Brand",
           "URI",
         ]
 
-        # @return [String]
-        define_property :sku, as: "sku", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::Organization,URI]
+        define_property :manufacturer, as: "manufacturer", types: [
+          "OpenActive::Models::Schema::Organization",
+          "URI",
         ]
 
-        # @return [String]
-        define_property :nsn, as: "nsn", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
+        define_property :has_measurement, as: "hasMeasurement", types: [
+          "OpenActive::Models::Schema::QuantitativeValue",
+          "URI",
         ]
 
-        # @return [Date,nil]
-        define_property :purchase_date, as: "purchaseDate", types: [
-          "Date",
-          "null",
+        # @return [OpenActive::Models::Schema::Product,URI]
+        define_property :is_consumable_for, as: "isConsumableFor", types: [
+          "OpenActive::Models::Schema::Product",
+          "URI",
+        ]
+
+        # @return [URI,OpenActive::Models::Schema::ImageObject]
+        define_property :logo, as: "logo", types: [
+          "URI",
+          "OpenActive::Models::Schema::ImageObject",
         ]
 
         # @return [String]
-        define_property :gtin14, as: "gtin14", types: [
+        define_property :gtin8, as: "gtin8", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Product,URI]
-        define_property :is_accessory_or_spare_part_for, as: "isAccessoryOrSparePartFor", types: [
-          "OpenActive::Models::Schema::Product",
-          "URI",
+        # @return [String]
+        define_property :sku, as: "sku", types: [
+          "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :manufacturer, as: "manufacturer", types: [
-          "OpenActive::Models::Schema::Organization",
-          "URI",
+        # @return [String]
+        define_property :in_product_group_with_id, as: "inProductGroupWithID", types: [
+          "string",
         ]
 
         # @return [OpenActive::Models::Schema::ProductModel,String,URI]
@@ -221,10 +255,9 @@ module OpenActive
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Brand,OpenActive::Models::Schema::Organization,URI]
-        define_property :brand, as: "brand", types: [
-          "OpenActive::Models::Schema::Brand",
-          "OpenActive::Models::Schema::Organization",
+        # @return [OpenActive::Models::Schema::MerchantReturnPolicy,URI]
+        define_property :has_merchant_return_policy, as: "hasMerchantReturnPolicy", types: [
+          "OpenActive::Models::Schema::MerchantReturnPolicy",
           "URI",
         ]
 
@@ -235,45 +268,54 @@ module OpenActive
         ]
 
         # @return [String]
-        define_property :gtin8, as: "gtin8", types: [
+        define_property :gtin14, as: "gtin14", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Product,String,URI]
-        define_property :material, as: "material", types: [
-          "OpenActive::Models::Schema::Product",
+        # @return [OpenActive::Models::Schema::QuantitativeValue,URI]
+        define_property :weight, as: "weight", types: [
+          "OpenActive::Models::Schema::QuantitativeValue",
+          "URI",
+        ]
+
+        # @return [OpenActive::Models::Schema::QuantitativeValue,OpenActive::Models::Schema::DefinedTerm,String,OpenActive::Models::Schema::SizeSpecification,URI]
+        define_property :size, as: "size", types: [
+          "OpenActive::Models::Schema::QuantitativeValue",
+          "OpenActive::Models::Schema::DefinedTerm",
           "string",
+          "OpenActive::Models::Schema::SizeSpecification",
           "URI",
         ]
 
-        # @return [Date,nil]
-        define_property :production_date, as: "productionDate", types: [
-          "Date",
-          "null",
+        # @return [OpenActive::Models::Schema::PropertyValue,URI]
+        define_property :additional_property, as: "additionalProperty", types: [
+          "OpenActive::Models::Schema::PropertyValue",
+          "URI",
         ]
 
         # @return [String]
-        define_property :awards, as: "awards", types: [
+        define_property :gtin13, as: "gtin13", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Audience,URI]
-        define_property :audience, as: "audience", types: [
-          "OpenActive::Models::Schema::Audience",
+        # @return [OpenActive::Models::Schema::Review,URI]
+        define_property :reviews, as: "reviews", types: [
+          "OpenActive::Models::Schema::Review",
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::Product,OpenActive::Models::Schema::Service,URI]
+        # @return [Boolean,nil]
+        define_property :is_family_friendly, as: "isFamilyFriendly", types: [
+          "bool",
+          "null",
+        ]
+
+        # @return [OpenActive::Models::Schema::Service,OpenActive::Models::Schema::Product,URI]
         define_property :is_related_to, as: "isRelatedTo", types: [
-          "OpenActive::Models::Schema::Product",
           "OpenActive::Models::Schema::Service",
+          "OpenActive::Models::Schema::Product",
           "URI",
         ]
-
-        # @return [String]
-        define_property :product_id, as: "productID", types: [
-          "string",
-        ]
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module OpenActive
   module Models
     module Schema
-      class ProductCollection < ::OpenActive::Models::Schema::Collection
+      class ProductCollection < ::OpenActive::Models::Schema::Product
         # @!attribute type
         # @return [String]
         def type

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

@@ -8,9 +8,8 @@ module OpenActive
           "schema:ProductModel"
         end
 
-        # @return [OpenActive::Models::Schema::ProductGroup,OpenActive::Models::Schema::ProductModel,URI]
-        define_property :is_variant_of, as: "isVariantOf", types: [
-          "OpenActive::Models::Schema::ProductGroup",
+        # @return [OpenActive::Models::Schema::ProductModel,URI]
+        define_property :successor_of, as: "successorOf", types: [
           "OpenActive::Models::Schema::ProductModel",
           "URI",
         ]
@@ -21,9 +20,10 @@ module OpenActive
           "URI",
         ]
 
-        # @return [OpenActive::Models::Schema::ProductModel,URI]
-        define_property :successor_of, as: "successorOf", types: [
+        # @return [OpenActive::Models::Schema::ProductModel,OpenActive::Models::Schema::ProductGroup,URI]
+        define_property :is_variant_of, as: "isVariantOf", types: [
           "OpenActive::Models::Schema::ProductModel",
+          "OpenActive::Models::Schema::ProductGroup",
           "URI",
         ]
       end

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

@@ -8,22 +8,28 @@ module OpenActive
           "schema:ProgramMembership"
         end
 
-        # @return [OpenActive::Models::Schema::QuantitativeValue,BigDecimal,URI,nil]
+        # @return [BigDecimal,OpenActive::Models::Schema::QuantitativeValue,URI,nil]
         define_property :membership_points_earned, as: "membershipPointsEarned", types: [
-          "OpenActive::Models::Schema::QuantitativeValue",
           "Number",
+          "OpenActive::Models::Schema::QuantitativeValue",
           "URI",
           "null",
         ]
 
+        # @return [OpenActive::Models::Schema::Organization,OpenActive::Models::Schema::Person,URI]
+        define_property :member, as: "member", types: [
+          "OpenActive::Models::Schema::Organization",
+          "OpenActive::Models::Schema::Person",
+          "URI",
+        ]
+
         # @return [String]
         define_property :membership_number, as: "membershipNumber", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Person,OpenActive::Models::Schema::Organization,URI]
-        define_property :members, as: "members", types: [
-          "OpenActive::Models::Schema::Person",
+        # @return [OpenActive::Models::Schema::Organization,URI]
+        define_property :hosting_organization, as: "hostingOrganization", types: [
           "OpenActive::Models::Schema::Organization",
           "URI",
         ]
@@ -33,15 +39,9 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Organization,OpenActive::Models::Schema::Person,URI]
-        define_property :member, as: "member", types: [
-          "OpenActive::Models::Schema::Organization",
+        # @return [OpenActive::Models::Schema::Person,OpenActive::Models::Schema::Organization,URI]
+        define_property :members, as: "members", types: [
           "OpenActive::Models::Schema::Person",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :hosting_organization, as: "hostingOrganization", types: [
           "OpenActive::Models::Schema::Organization",
           "URI",
         ]

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

@@ -9,12 +9,17 @@ module OpenActive
         end
 
         # @return [String]
-        define_property :text_value, as: "textValue", types: [
+        define_property :phonetic_text, as: "phoneticText", types: [
           "string",
         ]
 
         # @return [String]
-        define_property :phonetic_text, as: "phoneticText", types: [
+        define_property :speech_to_text_markup, as: "speechToTextMarkup", types: [
+          "string",
+        ]
+
+        # @return [String]
+        define_property :text_value, as: "textValue", types: [
           "string",
         ]
 
@@ -24,11 +29,6 @@ module OpenActive
           "OpenActive::Models::Schema::Language",
           "URI",
         ]
-
-        # @return [String]
-        define_property :speech_to_text_markup, as: "speechToTextMarkup", types: [
-          "string",
-        ]
       end
     end
   end

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

@@ -8,23 +8,23 @@ module OpenActive
           "schema:Property"
         end
 
-        # @return [OpenActive::Enums::PropertyEnumeration,OpenActive::Models::Schema::Enumeration,OpenActive::Models::Schema::Class,URI,nil]
-        define_property :superseded_by, as: "supersededBy", types: [
-          "OpenActive::Enums::PropertyEnumeration",
-          "OpenActive::Models::Schema::Enumeration",
+        # @return [OpenActive::Models::Schema::Class,URI]
+        define_property :domain_includes, as: "domainIncludes", types: [
           "OpenActive::Models::Schema::Class",
           "URI",
-          "null",
         ]
 
-        # @return [OpenActive::Models::Schema::Class,URI]
-        define_property :range_includes, as: "rangeIncludes", types: [
+        # @return [OpenActive::Models::Schema::Enumeration,OpenActive::Models::Schema::Class,OpenActive::Enums::PropertyEnumeration,URI,nil]
+        define_property :superseded_by, as: "supersededBy", types: [
+          "OpenActive::Models::Schema::Enumeration",
           "OpenActive::Models::Schema::Class",
+          "OpenActive::Enums::PropertyEnumeration",
           "URI",
+          "null",
         ]
 
         # @return [OpenActive::Models::Schema::Class,URI]
-        define_property :domain_includes, as: "domainIncludes", types: [
+        define_property :range_includes, as: "rangeIncludes", types: [
           "OpenActive::Models::Schema::Class",
           "URI",
         ]