algolia 3.10.2 → 3.11.0

data/lib/algolia/models/insights/purchased_object_ids.rb

@@ -54,9 +54,13 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
+      # Returns the keys that uniquely identify this oneOf variant when present
+      def self.discriminator_attributes
+        [
+          :eventType,
+          :eventSubtype,
+          :objectIDs
+        ]
       end
 
       # Attribute type mapping.

data/lib/algolia/models/insights/purchased_object_ids_after_search.rb

@@ -54,9 +54,14 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
+      # Returns the keys that uniquely identify this oneOf variant when present
+      def self.discriminator_attributes
+        [
+          :eventType,
+          :eventSubtype,
+          :objectIDs,
+          :objectData
+        ]
       end
 
       # Attribute type mapping.

data/lib/algolia/models/insights/value.rb

@@ -45,7 +45,6 @@ module Algolia
 
         SchemaMismatchError = Class.new(StandardError)
 
-        # Note: 'File' is missing here because in the regular case we get the data _after_ a call to JSON.parse.
         def find_and_cast_into_type(klass, data)
           return if data.nil?
 
@@ -84,12 +83,12 @@ module Algolia
               if const.respond_to?(:openapi_one_of)
                 # nested oneOf model
                 model = const.build(data)
-              elsif const.respond_to?(:acceptable_attributes)
-                # raise if data contains keys that are not known to the model
-                raise unless (data.keys - const.acceptable_attributes).empty?
-                model = const.build_from_hash(data)
+              elsif const.respond_to?(:discriminator_attributes)
+                if const.discriminator_attributes.all? { |attr| data.key?(attr) }
+                  model = const.build_from_hash(data)
+                end
               else
-                # maybe it's an enum
+                # maybe it's an enum, or doens't have discriminators
                 model = const.build_from_hash(data)
               end
 

data/lib/algolia/models/insights/viewed_filters.rb

@@ -40,9 +40,12 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
+      # Returns the keys that uniquely identify this oneOf variant when present
+      def self.discriminator_attributes
+        [
+          :eventType,
+          :filters
+        ]
       end
 
       # Attribute type mapping.

data/lib/algolia/models/insights/viewed_object_ids.rb

@@ -40,9 +40,12 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
+      # Returns the keys that uniquely identify this oneOf variant when present
+      def self.discriminator_attributes
+        [
+          :eventType,
+          :objectIDs
+        ]
       end
 
       # Attribute type mapping.

data/lib/algolia/models/monitoring/error_base.rb

@@ -18,11 +18,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/incident.rb

@@ -20,11 +20,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/incident_entry.rb

@@ -19,11 +19,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/incidents_response.rb

@@ -15,11 +15,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/indexing_metric.rb

@@ -15,11 +15,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/indexing_time_response.rb

@@ -15,11 +15,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/infrastructure_response.rb

@@ -15,11 +15,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/inventory_response.rb

@@ -15,11 +15,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/latency_metric.rb

@@ -15,11 +15,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/latency_response.rb

@@ -15,11 +15,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/metrics.rb

@@ -32,11 +32,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/probes_metric.rb

@@ -20,11 +20,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/server.rb

@@ -37,11 +37,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/status_response.rb

@@ -15,11 +15,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/monitoring/time_entry.rb

@@ -20,11 +20,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/personalization/delete_user_profile_response.rb

@@ -20,11 +20,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/personalization/error_base.rb

@@ -18,11 +18,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/personalization/{event_scoring.rb → events_scoring.rb}

@@ -5,7 +5,7 @@ require "time"
 
 module Algolia
   module Personalization
-    class EventScoring
+    class EventsScoring
       # Event score.
       attr_accessor :score
 
@@ -23,11 +23,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {
@@ -50,7 +45,7 @@ module Algolia
         if (!attributes.is_a?(Hash))
           raise(
             ArgumentError,
-            "The input argument (attributes) must be a hash in `Algolia::EventScoring` initialize method"
+            "The input argument (attributes) must be a hash in `Algolia::EventsScoring` initialize method"
           )
         end
 
@@ -59,7 +54,7 @@ module Algolia
           if (!self.class.attribute_map.key?(k.to_sym))
             raise(
               ArgumentError,
-              "`#{k}` is not a valid attribute in `Algolia::EventScoring`. Please check the name to make sure it's valid. List of attributes: " +
+              "`#{k}` is not a valid attribute in `Algolia::EventsScoring`. Please check the name to make sure it's valid. List of attributes: " +
                 self.class.attribute_map.keys.inspect
             )
           end

data/lib/algolia/models/personalization/{facet_scoring.rb → facets_scoring.rb}

@@ -5,7 +5,7 @@ require "time"
 
 module Algolia
   module Personalization
-    class FacetScoring
+    class FacetsScoring
       # Event score.
       attr_accessor :score
 
@@ -20,11 +20,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {
@@ -46,7 +41,7 @@ module Algolia
         if (!attributes.is_a?(Hash))
           raise(
             ArgumentError,
-            "The input argument (attributes) must be a hash in `Algolia::FacetScoring` initialize method"
+            "The input argument (attributes) must be a hash in `Algolia::FacetsScoring` initialize method"
           )
         end
 
@@ -55,7 +50,7 @@ module Algolia
           if (!self.class.attribute_map.key?(k.to_sym))
             raise(
               ArgumentError,
-              "`#{k}` is not a valid attribute in `Algolia::FacetScoring`. Please check the name to make sure it's valid. List of attributes: " +
+              "`#{k}` is not a valid attribute in `Algolia::FacetsScoring`. Please check the name to make sure it's valid. List of attributes: " +
                 self.class.attribute_map.keys.inspect
             )
           end

data/lib/algolia/models/personalization/get_user_token_response.rb

@@ -24,11 +24,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/personalization/personalization_strategy_params.rb

@@ -7,10 +7,10 @@ module Algolia
   module Personalization
     class PersonalizationStrategyParams
       # Scores associated with each event.  The higher the scores, the higher the impact of those events on the personalization of search results.
-      attr_accessor :event_scoring
+      attr_accessor :events_scoring
 
       # Scores associated with each facet.  The higher the scores, the higher the impact of those events on the personalization of search results.
-      attr_accessor :facet_scoring
+      attr_accessor :facets_scoring
 
       # Impact of personalization on the search results.  If set to 0, personalization has no impact on the search results.
       attr_accessor :personalization_impact
@@ -18,22 +18,17 @@ module Algolia
       # Attribute mapping from ruby-style variable name to JSON key.
       def self.attribute_map
         {
-          :event_scoring => :eventScoring,
-          :facet_scoring => :facetScoring,
+          :events_scoring => :eventsScoring,
+          :facets_scoring => :facetsScoring,
           :personalization_impact => :personalizationImpact
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {
-          :event_scoring => :"Array<EventScoring>",
-          :facet_scoring => :"Array<FacetScoring>",
+          :events_scoring => :"Array<EventsScoring>",
+          :facets_scoring => :"Array<FacetsScoring>",
           :personalization_impact => :"Integer"
         }
       end
@@ -68,20 +63,20 @@ module Algolia
           h[k.to_sym] = v
         }
 
-        if attributes.key?(:event_scoring)
-          if (value = attributes[:event_scoring]).is_a?(Array)
-            self.event_scoring = value
+        if attributes.key?(:events_scoring)
+          if (value = attributes[:events_scoring]).is_a?(Array)
+            self.events_scoring = value
           end
         else
-          self.event_scoring = nil
+          self.events_scoring = nil
         end
 
-        if attributes.key?(:facet_scoring)
-          if (value = attributes[:facet_scoring]).is_a?(Array)
-            self.facet_scoring = value
+        if attributes.key?(:facets_scoring)
+          if (value = attributes[:facets_scoring]).is_a?(Array)
+            self.facets_scoring = value
           end
         else
-          self.facet_scoring = nil
+          self.facets_scoring = nil
         end
 
         if attributes.key?(:personalization_impact)
@@ -96,8 +91,8 @@ module Algolia
       def ==(other)
         return true if self.equal?(other)
         self.class == other.class &&
-          event_scoring == other.event_scoring &&
-          facet_scoring == other.facet_scoring &&
+          events_scoring == other.events_scoring &&
+          facets_scoring == other.facets_scoring &&
           personalization_impact == other.personalization_impact
       end
 
@@ -110,7 +105,7 @@ module Algolia
       # Calculates hash code according to all attributes.
       # @return [Integer] Hash code
       def hash
-        [event_scoring, facet_scoring, personalization_impact].hash
+        [events_scoring, facets_scoring, personalization_impact].hash
       end
 
       # Builds the object from hash

data/lib/algolia/models/personalization/set_personalization_strategy_response.rb

@@ -16,11 +16,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/query-suggestions/base_response.rb

@@ -20,11 +20,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/query-suggestions/config_status.rb

@@ -32,11 +32,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/query-suggestions/configuration.rb

@@ -31,11 +31,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/query-suggestions/configuration_response.rb

@@ -39,11 +39,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/query-suggestions/configuration_with_index.rb

@@ -35,11 +35,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/query-suggestions/error_base.rb

@@ -18,11 +18,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/query-suggestions/facet.rb

@@ -21,11 +21,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/query-suggestions/languages.rb

@@ -45,7 +45,6 @@ module Algolia
 
         SchemaMismatchError = Class.new(StandardError)
 
-        # Note: 'File' is missing here because in the regular case we get the data _after_ a call to JSON.parse.
         def find_and_cast_into_type(klass, data)
           return if data.nil?
 
@@ -84,12 +83,12 @@ module Algolia
               if const.respond_to?(:openapi_one_of)
                 # nested oneOf model
                 model = const.build(data)
-              elsif const.respond_to?(:acceptable_attributes)
-                # raise if data contains keys that are not known to the model
-                raise unless (data.keys - const.acceptable_attributes).empty?
-                model = const.build_from_hash(data)
+              elsif const.respond_to?(:discriminator_attributes)
+                if const.discriminator_attributes.all? { |attr| data.key?(attr) }
+                  model = const.build_from_hash(data)
+                end
               else
-                # maybe it's an enum
+                # maybe it's an enum, or doens't have discriminators
                 model = const.build_from_hash(data)
               end
 

data/lib/algolia/models/query-suggestions/log_file.rb

@@ -27,11 +27,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {

data/lib/algolia/models/query-suggestions/source_index.rb

@@ -41,11 +41,6 @@ module Algolia
         }
       end
 
-      # Returns all the JSON keys this model knows about
-      def self.acceptable_attributes
-        attribute_map.values
-      end
-
       # Attribute type mapping.
       def self.types_mapping
         {