Make options hash not optional

Author: lgebhardt

lib/jsonapi/active_relation/join_manager.rb

@@ -77,7 +77,7 @@ def join_details_by_relationship(relationship)
         @join_details[segment]
       end
 
-      def self.get_join_arel_node(records, relationship, join_type, options = {})
+      def self.get_join_arel_node(records, relationship, join_type, options)
         init_join_sources = records.arel.join_sources
         init_join_sources_length = init_join_sources.length
 

lib/jsonapi/active_relation/join_manager_v10.rb

@@ -72,7 +72,7 @@ def join_details_by_relationship(relationship)
         @join_details[segment]
       end
 
-      def self.get_join_arel_node(records, relationship, join_type, options = {})
+      def self.get_join_arel_node(records, relationship, join_type, options)
         init_join_sources = records.arel.join_sources
         init_join_sources_length = init_join_sources.length
 

lib/jsonapi/active_relation_retrieval.rb

@@ -4,7 +4,7 @@ module JSONAPI
   module ActiveRelationRetrieval
     include ::JSONAPI::RelationRetrieval
 
-    def find_related_ids(relationship, options = {})
+    def find_related_ids(relationship, options)
       self.class.find_related_fragments(self, relationship, options).keys.collect { |rid| rid.id }
     end
 
@@ -17,7 +17,7 @@ module ClassMethods
       # @option options [Hash] :include_directives The `include_directives`
       #
       # @return [Array<Resource>] the Resource instances matching the filters, sorting and pagination rules.
-      def find(filters, options = {})
+      def find(filters, options)
         sort_criteria = options.fetch(:sort_criteria) { [] }
 
         join_manager = ActiveRelation::JoinManager.new(resource_klass: self,
@@ -41,7 +41,7 @@ def find(filters, options = {})
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [Integer] the count
-      def count(filters, options = {})
+      def count(filters, options)
         join_manager = ActiveRelation::JoinManager.new(resource_klass: self,
                                                        filters: filters)
 
@@ -57,7 +57,7 @@ def count(filters, options = {})
       #
       # @param key the primary key of the resource to find
       # @option options [Hash] :context The context of the request, set in the controller
-      def find_by_key(key, options = {})
+      def find_by_key(key, options)
         record = find_record_by_key(key, options)
         resource_for(record, options[:context])
       end
@@ -66,7 +66,7 @@ def find_by_key(key, options = {})
       #
       # @param keys [Array<key>] Array of primary keys to find resources for
       # @option options [Hash] :context The context of the request, set in the controller
-      def find_by_keys(keys, options = {})
+      def find_by_keys(keys, options)
         records = find_records_by_keys(keys, options)
         resources_for(records, options[:context])
       end
@@ -76,7 +76,7 @@ def find_by_keys(keys, options = {})
       #
       # @param keys [Array<key>] Array of primary keys to find resources for
       # @option options [Hash] :context The context of the request, set in the controller
-      def find_to_populate_by_keys(keys, options = {})
+      def find_to_populate_by_keys(keys, options)
         records = records_for_populate(options).where(_primary_key => keys)
         resources_for(records, options[:context])
       end
@@ -93,7 +93,7 @@ def find_to_populate_by_keys(keys, options = {})
       # @return [Hash{ResourceIdentity => {identity: => ResourceIdentity, cache: cache_field}]
       #    the ResourceInstances matching the filters, sorting, and pagination rules along with any request
       #    additional_field values
-      def find_fragments(filters, options = {})
+      def find_fragments(filters, options)
         include_directives = options.fetch(:include_directives, {})
         resource_klass = self
 
@@ -259,7 +259,7 @@ def find_fragments(filters, options = {})
       # @return [Hash{ResourceIdentity => {identity: => ResourceIdentity, cache: cache_field, related: {relationship_name: [] }}}]
       #    the ResourceInstances matching the filters, sorting, and pagination rules along with any request
       #    additional_field values
-      def find_related_fragments(source_fragment, relationship, options = {})
+      def find_related_fragments(source_fragment, relationship, options)
         if relationship.polymorphic? # && relationship.foreign_key_on == :self
           source_resource_klasses = if relationship.foreign_key_on == :self
                                       relationship.polymorphic_types.collect do |polymorphic_type|
@@ -498,11 +498,11 @@ def find_related_fragments_from_inverse(source, source_relationship, options, co
       #
       # @return [Integer] the count
 
-      def count_related(source, relationship, options = {})
+      def count_related(source, relationship, options)
         relationship.resource_klass.count_related_from_inverse(source, relationship, options)
       end
 
-      def count_related_from_inverse(source_resource, source_relationship, options = {})
+      def count_related_from_inverse(source_resource, source_relationship, options)
         inverse_relationship = source_relationship._inverse_relationship
         return -1 if inverse_relationship.blank?
 
@@ -542,7 +542,7 @@ def count_related_from_inverse(source_resource, source_relationship, options = {
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [ActiveRecord::Relation]
-      def records_base(_options = {})
+      def records_base(_options)
         _model_class.all
       end
 
@@ -552,7 +552,7 @@ def records_base(_options = {})
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [ActiveRecord::Relation]
-      def records(options = {})
+      def records(options)
         records_base(options)
       end
 
@@ -563,7 +563,7 @@ def records(options = {})
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [ActiveRecord::Relation]
-      def records_for_populate(options = {})
+      def records_for_populate(options)
         records_base(options)
       end
 
@@ -572,7 +572,7 @@ def records_for_populate(options = {})
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [ActiveRecord::Relation]
-      def records_for_source_to_related(options = {})
+      def records_for_source_to_related(options)
         records_base(options)
       end
 
@@ -637,13 +637,13 @@ def join_relationship(records:, relationship:, resource_type: nil, join_type: :i
 
       # protected
 
-      def find_record_by_key(key, options = {})
+      def find_record_by_key(key, options)
         record = apply_request_settings_to_records(records: records(options), primary_keys: key, options: options).first
         fail JSONAPI::Exceptions::RecordNotFound.new(key) if record.nil?
         record
       end
 
-      def find_records_by_keys(keys, options = {})
+      def find_records_by_keys(keys, options)
         apply_request_settings_to_records(records: records(options), primary_keys: keys, options: options)
       end
 
@@ -839,7 +839,7 @@ def quote(field)
         %{"#{field.to_s}"}
       end
 
-      def apply_filters(records, filters, options = {})
+      def apply_filters(records, filters, options)
         if filters
           filters.each do |filter, value|
             records = apply_filter(records, filter, value, options)
@@ -865,7 +865,7 @@ def get_aliased_field(path_with_field, join_manager)
         concat_table_field(table_alias, field_segment.delegated_field_name)
       end
 
-      def apply_filter(records, filter, value, options = {})
+      def apply_filter(records, filter, value, options)
         strategy = _allowed_filters.fetch(filter.to_sym, Hash.new)[:apply]
 
         if strategy

lib/jsonapi/active_relation_retrieval_v09.rb

@@ -4,7 +4,7 @@ module JSONAPI
   module ActiveRelationRetrievalV09
     include ::JSONAPI::RelationRetrieval
 
-    def find_related_ids(relationship, options = {})
+    def find_related_ids(relationship, options)
       self.class.find_related_fragments(self.fragment, relationship, options).keys.collect { |rid| rid.id }
     end
 
@@ -23,7 +23,7 @@ module ClassMethods
       # @option options [Hash] :include_directives The `include_directives`
       #
       # @return [Array<Resource>] the Resource instances matching the filters, sorting and pagination rules.
-      def find(filters, options = {})
+      def find(filters, options)
         context = options[:context]
 
         records = filter_records(records(options), filters, options)
@@ -43,15 +43,15 @@ def find(filters, options = {})
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [Integer] the count
-      def count(filters, options = {})
+      def count(filters, options)
         count_records(filter_records(records(options), filters, options))
       end
 
       # Returns the single Resource identified by `key`
       #
       # @param key the primary key of the resource to find
       # @option options [Hash] :context The context of the request, set in the controller
-      def find_by_key(key, options = {})
+      def find_by_key(key, options)
         context = options[:context]
         records = records(options)
 
@@ -65,7 +65,7 @@ def find_by_key(key, options = {})
       #
       # @param keys [Array<key>] Array of primary keys to find resources for
       # @option options [Hash] :context The context of the request, set in the controller
-      def find_by_keys(keys, options = {})
+      def find_by_keys(keys, options)
         context = options[:context]
         records = records(options)
         records = apply_includes(records, options)
@@ -80,7 +80,7 @@ def find_by_keys(keys, options = {})
       #
       # @param keys [Array<key>] Array of primary keys to find resources for
       # @option options [Hash] :context The context of the request, set in the controller
-      def find_to_populate_by_keys(keys, options = {})
+      def find_to_populate_by_keys(keys, options)
         records = records_for_populate(options).where(_primary_key => keys)
         resources_for(records, options[:context])
       end
@@ -97,7 +97,7 @@ def find_to_populate_by_keys(keys, options = {})
       # @return [Hash{ResourceIdentity => {identity: => ResourceIdentity, cache: cache_field}]
       #    the ResourceInstances matching the filters, sorting, and pagination rules along with any request
       #    additional_field values
-      def find_fragments(filters, options = {})
+      def find_fragments(filters, options)
         context = options[:context]
 
         sort_criteria = options.fetch(:sort_criteria) { [] }
@@ -208,7 +208,7 @@ def find_related_fragments_from_inverse(source, source_relationship, options, co
       #
       # @return [Integer] the count
 
-      def count_related(source, relationship, options = {})
+      def count_related(source, relationship, options)
         opts = options.except(:paginator)
 
         related_resource_records = source.public_send("records_for_#{relationship.name}",
@@ -229,7 +229,7 @@ def count_related(source, relationship, options = {})
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [ActiveRecord::Relation]
-      def records_base(_options = {})
+      def records_base(_options)
         _model_class.all
       end
 
@@ -239,7 +239,7 @@ def records_base(_options = {})
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [ActiveRecord::Relation]
-      def records(options = {})
+      def records(options)
         records_base(options)
       end
 
@@ -250,7 +250,7 @@ def records(options = {})
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [ActiveRecord::Relation]
-      def records_for_populate(options = {})
+      def records_for_populate(options)
         records_base(options)
       end
 
@@ -259,7 +259,7 @@ def records_for_populate(options = {})
       # @option options [Hash] :context The context of the request, set in the controller
       #
       # @return [ActiveRecord::Relation]
-      def records_for_source_to_related(options = {})
+      def records_for_source_to_related(options)
         records_base(options)
       end
 
@@ -481,7 +481,7 @@ def build_to_many(relationship, foreign_key, associated_records_method_name, rel
         end
       end
 
-      def resolve_relationship_names_to_relations(resource_klass, model_includes, options = {})
+      def resolve_relationship_names_to_relations(resource_klass, model_includes, options)
         case model_includes
         when Array
           return model_includes.map do |value|
@@ -501,7 +501,7 @@ def resolve_relationship_names_to_relations(resource_klass, model_includes, opti
         end
       end
 
-      def apply_includes(records, options = {})
+      def apply_includes(records, options)
         include_directives = options[:include_directives]
         if include_directives
           model_includes = resolve_relationship_names_to_relations(self, include_directives.model_includes, options)
@@ -615,7 +615,7 @@ def get_aliased_field(path_with_field, join_manager)
         concat_table_field(table_alias, field_segment.delegated_field_name)
       end
 
-      def apply_filter(records, filter, value, options = {})
+      def apply_filter(records, filter, value, options)
         strategy = _allowed_filters.fetch(filter.to_sym, Hash.new)[:apply]
 
         if strategy
@@ -629,7 +629,7 @@ def apply_filter(records, filter, value, options = {})
         records
       end
 
-      def apply_filters(records, filters, options = {})
+      def apply_filters(records, filters, options)
         # required_includes = []
 
         if filters
@@ -670,7 +670,7 @@ def construct_order_options(sort_params)
         end
       end
 
-      def sort_records(records, order_options, options = {})
+      def sort_records(records, order_options, options)
         apply_sort(records, order_options, options)
       end
 
@@ -679,7 +679,7 @@ def count_records(records)
         records.count(:all)
       end
 
-      def find_count(filters, options = {})
+      def find_count(filters, options)
         count_records(filter_records(records(options), filters, options))
       end