filterameter 0.1.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0baada12bc6ad382e146635629a89c47f935e92f1e4c72597889440305c46ebf
-  data.tar.gz: 427ecf17bd6458fbe76af104ab5b1eb32a4edb2adc3c0b73ac4fb329f1eba0f9
+  metadata.gz: c5ff39d6e3e772f3943678ecc748ca3f9d9234417958fc9254071ee14764ed31
+  data.tar.gz: 22e0d442436d0cae884e60a60066eea859c7de22251d6471e05c289af50f3da1
 SHA512:
-  metadata.gz: 24ce1e8ca752befea919c57f5e79af75d80f77569d0171a052b1b1a14c65af5d0e6ad234127767e3f42bddb4d058feafdee58130cf38102cd4b10eef2bdc3ca9
-  data.tar.gz: 5e0ad2d3348d84df2d7198bc38611f0a3bb8ea52ce4882c61ca0289f48239afc11ec49f4b293fc79810cda25a92f8e236ad00b73bb3d4769e4d4912b99939651
+  metadata.gz: 67cd4b48cf4f50e0681e34003f0f9ebe7ae753b703f83121d017daaee7185c846c4e2e467d2b140fc14ced8e11b07f88b155a1dda4b6e0a9104906348f077a53
+  data.tar.gz: f80c40fcd3a438682bd95c7b3c282dae7cc199c57375372314d0720c234c53aa0b4609c47cccc2dcb85505a023f74e9ba6c6e2125714a5d48710c87bff20a6d5

data/README.md

@@ -1,15 +1,17 @@
 [![Gem Version](https://badge.fury.io/rb/filterameter.svg)](https://badge.fury.io/rb/filterameter)
 [![RuboCop](https://github.com/RockSolt/filterameter/workflows/RuboCop/badge.svg)](https://github.com/RockSolt/filterameter/actions?query=workflow%3ARuboCop)
+[![RSpec](https://github.com/RockSolt/filterameter/workflows/RSpec/badge.svg)](https://github.com/RockSolt/filterameter/actions?query=workflow%3ARSpec)
+[![Maintainability](https://api.codeclimate.com/v1/badges/d9d87f9ce8020eb6e656/maintainability)](https://codeclimate.com/github/RockSolt/filterameter/maintainability)
 
 # Filterameter
-Declarative Filter Parameters for Rails Controllers.
+Declarative filter parameters provide provide clean and clear filters for queries.
 
 ## Usage
-Declare filters at the top of controllers to increase readability and reduce boilerplate code. Filters can be declared for attributes, scopes, or attributes from singular associations (`belongs_to` or `has_one`). Validations can also be assigned.
+Declare filters in query classes or controllers to increase readability and reduce boilerplate code. Filters can be declared for attributes, scopes, or attributes from singular associations (`belongs_to` or `has_one`). Validations can also be assigned.
 
 ```ruby
   filter :color
-  filter :size, validates: { inclusion: { in: %w[Small Medium Large] }, unless: -> { size.is_a? Array } }
+  filter :size, validates: { inclusion: { in: %w[Small Medium Large], allow_multiple_values: true } }
   filter :brand_name, association: :brand, name: :name
   filter :on_sale, association: :price, validates: [{ numericality: { greater_than: 0 } },
                                                     { numericality: { less_than: 100 } }]
@@ -37,10 +39,15 @@ filter :manager_id, association: :department
 If the filter value should be validated, use the `validates` option along with [ActiveModel validations](https://api.rubyonrails.org/classes/ActiveModel/Validations/ClassMethods.html#method-i-validates). Here's an example of the inclusion validator being used to restrict sizes:
 
 ```ruby
-filter :size, validates: { inclusion: { in: %w[Small Medium Large] }, unless: -> { size.is_a? Array } }
+filter :size, validates: { inclusion: { in: %w[Small Medium Large] } }
+```
+
+The `inclusion` validator has been overridden to provide the additional option `allow_multiple_values`. When true, the value can be an array and each entry in the array will be validated. Use this when the filter can specify one or more values.
+
+```ruby
+filter :size, validates: { inclusion: { in: %w[Small Medium Large], allow_multiple_values: true } }
 ```
 
-Note that the `inclusion` validator does not allow arrays to be specified. If the filter should allow multiple values to be specified, then the validation needs to be disabled when the value an array.
 
 #### partial
 Specify the partial option if the filter should do a partial search (SQL's `LIKE`). The partial option accepts a hash to specify the search behavior. Here are the available options:
@@ -78,9 +85,41 @@ filter :sale_price, range: :max_only
 
 In the first example, query parameters could include <tt>price</tt>, <tt>price_min</tt>, and <tt>price_max</tt>.
 
-### Configuring Controllers
+### Query Classes
+
+Include module `Filterameter::DeclarativeFilters` in the query class. The model must be declared using `model`, and a default query can optionally be declared using `default_query`. If no default query is provided, then the default is `.all`.
+
+#### Example
+
+Here's what a query class for the Widgets model with filters on size and color might look like:
+
+```ruby
+class WidgetQuery
+  include Filterameter::DeclarativeFilters
+
+  model Widget
+  filter :size
+  filter :color
+end
+```
+
+Build the query using class method `build_query`. The method takes two parameters:
+
+- filter: the hash of filter parameters
+- starting_query: any scope to build on (if not provided, the default query is the starting point)
 
-Rails conventions are used to determine the controller's model as well as the name of the instance variable to apply the filters to. For example, the PhotosController will use the variable `@photos` to store a query against the Photo model. If the conventions do not provide the correct info, they can be overridden with the following two methods:
+Here's how the query might be invoked:
+
+```ruby
+filters = { size: 'large', color: 'blue' }
+widgets = WidgetQuery.build_query(filters, Widget.limit(10))
+```
+
+### Controllers
+
+Include module `Filterameter::DeclarativeControllerFilters` in the controller. Add before action callback `build_filtered_query` for controller actions that should build the query.
+
+Rails conventions are used to determine the controller's model as well as the name of the instance variable to apply the filters to. For example, the PhotosController will use the variable `@photos` to store a query against the Photo model. **If the conventions do not provide the correct info**, they can be overridden with the following two methods:
 
 #### filter_model
 Provide the name of the model. This method also allows the variable name to be optionally provided as the second parameter.
@@ -96,6 +135,24 @@ Provide the name of the instance variable. For example, if the query is stored a
 filter_query_var_name :data
 ```
 
+#### Example
+
+In the happy path, the WidgetsController serves Widgets and can filter on size and color. Here's what the controller might look like:
+
+```ruby
+class WidgetController < ApplicationController
+  include Filterameter::DeclarativeControllerFilters
+  before_action :build_filtered_query, only: :index
+
+  filter :size
+  filter :color
+
+  def index
+    render json: @widgets
+  end
+end
+```
+
 ## Installation
 Add this line to your application's Gemfile:
 

data/lib/filterameter/coordinators/base.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'filterameter/filter_declaration'
+require 'filterameter/filter_factory'
+require 'filterameter/filter_registry'
+require 'filterameter/log_subscriber'
+require 'filterameter/parameters_base'
+require 'filterameter/query_builder'
+
+module Filterameter
+  module Coordinators
+    # = Coordinators Base
+    #
+    # The main responsibility of the Coordinators classes is to keep the namespace clean for controllers and query
+    # objects that implement filter parameters. The coordinators encapsulate references to the Query Builder and
+    # Filter Registry.
+    class Base
+      attr_reader :model_class
+
+      delegate :add_filter, to: :registry
+      delegate :build_query, to: :query_builder
+
+      def model_class=(model_class)
+        @model_class = model_class.is_a?(String) ? model_class.constantize : model_class
+      end
+
+      def query_builder
+        @query_builder ||= Filterameter::QueryBuilder.new(default_query, registry)
+      end
+
+      private
+
+      def default_query
+        model_class.all
+      end
+
+      # lazy so that model_class can be optionally set
+      def registry
+        @registry ||= Filterameter::FilterRegistry.new(Filterameter::FilterFactory.new(model_class))
+      end
+    end
+  end
+end

data/lib/filterameter/coordinators/controller_coordinator.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'active_support/inflector'
+
+require 'active_support/rails'
+require 'action_dispatch'
+require 'action_controller/metal/live'
+require 'action_controller/metal/strong_parameters'
+
+require 'filterameter/coordinators/base'
+
+module Filterameter
+  module Coordinators
+    # = Controller Filters
+    #
+    # Class ControllerFilters stores the configuration declared via class-level method calls such as the list of
+    # filters and the optionally declared model class. Each controller will have one instance of the controller
+    # declarations stored as a class variable.
+    class ControllerCoordinator < Filterameter::Coordinators::Base
+      attr_writer :query_variable_name
+
+      def initialize(controller_name, controller_path)
+        @controller_name = controller_name
+        @controller_path = controller_path
+        super()
+      end
+
+      def query_variable_name
+        @query_variable_name ||= model_class.model_name.plural
+      end
+
+      private
+
+      def model_class
+        @model_class ||= @controller_name.classify.safe_constantize ||
+                         @controller_path.classify.safe_constantize ||
+                         raise(Filterameter::Exceptions::CannotDetermineModelError.new(@controller_name,
+                                                                                       @controller_path))
+      end
+    end
+  end
+end

data/lib/filterameter/coordinators/query_coordinator.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Filterameter
+  module Coordinators
+    # = Query Coordinator
+    #
+    # Class QueryCoordinator coordinates the filter logic for query classes.
+    class QueryCoordinator < Filterameter::Coordinators::Base
+      attr_writer :default_query
+
+      private
+
+      def default_query
+        @default_query || super
+      end
+    end
+  end
+end

data/lib/filterameter/declarative_controller_filters.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'filterameter/filterable'
+require 'filterameter/coordinators/controller_coordinator'
+
+module Filterameter
+  # = Declarative Controller Filters
+  #
+  # Mixin DeclarativeControllerFilters can included in controllers to enable the filter DSL.
+  module DeclarativeControllerFilters
+    extend ActiveSupport::Concern
+    include Filterameter::Filterable
+
+    class_methods do
+      def filter_model(model_class, query_var_name = nil)
+        filter_coordinator.model_class = model_class
+        filter_query_var_name(query_var_name) if query_var_name.present?
+      end
+
+      def filter_query_var_name(query_variable_name)
+        filter_coordinator.query_variable_name = query_variable_name
+      end
+
+      def filter_coordinator
+        @filter_coordinator ||= Filterameter::Coordinators::ControllerCoordinator.new(controller_name, controller_path)
+      end
+    end
+
+    private
+
+    def build_filtered_query
+      var_name = "@#{self.class.filter_coordinator.query_variable_name}"
+      instance_variable_set(
+        var_name,
+        self.class.filter_coordinator.build_query(params.to_unsafe_h.fetch(:filter, {}),
+                                                  instance_variable_get(var_name))
+      )
+    end
+  end
+end

data/lib/filterameter/declarative_filters.rb

@@ -1,79 +1,31 @@
 # frozen_string_literal: true
 
-require 'filterameter/controller_filters'
+require 'filterameter/coordinators/query_coordinator'
+require 'filterameter/filterable'
+require 'filterameter/query_builder'
 
 module Filterameter
   # = Declarative Filters
   #
-  # module DeclarativeFilters provides a controller DSL to declare filters along with any validations.
+  # Mixin DeclarativeFilters is included to build query classes using the filter DSL.
   module DeclarativeFilters
     extend ActiveSupport::Concern
+    include Filterameter::Filterable
 
     class_methods do
-      def filter_model(model_class, query_var_name = nil)
-        controller_filters.model_class = model_class
-        filter_query_var_name(query_var_name) if query_var_name.present?
-      end
-
-      def filter_query_var_name(query_variable_name)
-        controller_filters.query_variable_name = query_variable_name
-      end
+      delegate :build_query, to: :filter_coordinator
 
-      # Declares a filter that can be read from the parameters and applied to the ActiveRecord query. The <tt>name</tt>
-      # identifies the name of the parameter and is the default value to determine the criteria to be applied. The name
-      # can be either an attribute or a scope.
-      #
-      # === Options
-      #
-      # [:name]
-      #   Specify the attribute or scope name if the parameter name is not the same. The default value
-      #   is the parameter name, so if the two match this can be left out.
-      #
-      # [:association]
-      #   Specify the name of the association if the attribute or scope is nested.
-      #
-      # [:validates]
-      #   Specify a validation if the parameter value should be validated. This uses ActiveModel validations;
-      #   please review those for types of validations and usage.
-      #
-      # [:partial]
-      #   Specify the partial option if the filter should do a partial search (SQL's `LIKE`). The partial
-      #   option accepts a hash to specify the search behavior. Here are the available options:
-      #   - match: anywhere (default), from_start, dynamic
-      #   - case_sensitive: true, false (default)
-      #
-      #   There are two shortcuts: : the partial option can be declared with `true`, which just uses the
-      #   defaults; or the partial option can be declared with the match option directly,
-      #   such as `partial: :from_start`.
-      #
-      # [:range]
-      #   Specify a range option if the filter also allows ranges to be searched. The range option accepts
-      #   the following options:
-      #   - true: enables two additional parameters with attribute name plus suffixes <tt>_min</tt> and <tt>_max</tt>
-      #   - :min_only: enables additional parameter with attribute name plus suffix <tt>_min</tt>
-      #   - :max_only: enables additional parameter with attribute name plus suffix <tt>_max</tt>
-      def filter(name, options = {})
-        controller_filters.add_filter(name, options)
+      def model(model_class)
+        filter_coordinator.model_class = model_class
       end
 
-      def filters(*names)
-        names.each { |name| filter(name) }
+      def default_query(query)
+        filter_coordinator.default_query = query
       end
 
-      def controller_filters
-        @controller_filters ||= Filterameter::ControllerFilters.new(controller_name, controller_path)
+      def filter_coordinator
+        @filter_coordinator ||= Filterameter::Coordinators::QueryCoordinator.new
       end
     end
-
-    private
-
-    def build_filtered_query
-      var_name = "@#{self.class.controller_filters.query_variable_name}"
-      instance_variable_set(
-        var_name,
-        self.class.controller_filters.build_query(params.to_unsafe_h.fetch(:filter, {}),
-                                                  instance_variable_get(var_name))
-      )
-    end
   end
 end

data/lib/filterameter/exceptions/cannot_determine_model_error.rb

@@ -10,7 +10,7 @@ module Filterameter
     class CannotDetermineModelError < FilterameterError
       def initialize(name, path)
         super "Cannot determine model name from controller name #{value_and_classify(name)} " \
-          "or path #{value_and_classify(path)}. Declare the model explicitly with filter_model."
+              "or path #{value_and_classify(path)}. Declare the model explicitly with filter_model."
       end
 
       private

data/lib/filterameter/exceptions/undeclared_parameter_error.rb

@@ -7,14 +7,15 @@ module Filterameter
     # Class UndeclaredParameterError is raised when a request contains filter parameters that have not been declared.
     # Configuration setting `action_on_undeclared_parameters` determines whether or not the exception is raised.
     class UndeclaredParameterError < FilterameterError
-      attr_reader :keys
+      attr_reader :key
 
-      def initialize(keys)
-        @keys = keys
+      def initialize(key)
+        super
+        @key = key
       end
 
       def message
-        "The following filter parameter(s) have not been declared: #{keys}"
+        "The following filter parameter has not been declared: #{key}"
       end
     end
   end

data/lib/filterameter/exceptions/validation_error.rb

@@ -10,6 +10,7 @@ module Filterameter
       attr_reader :errors
 
       def initialize(errors)
+        super
         @errors = errors
       end
 

data/lib/filterameter/filter_registry.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Filterameter
+  # Filters
+  #
+  # Class FilterRegistry is a collection of the filters. It captures the filter declarations when classes are loaded,
+  # then uses the injected FilterFactory to build the filters on demand as they are needed.
+  class FilterRegistry
+    attr_reader :ranges
+
+    def initialize(filter_factory)
+      @filter_factory = filter_factory
+      @declarations = {}
+      @ranges = {}
+      @filters = {}
+    end
+
+    def add_filter(parameter_name, options)
+      name = parameter_name.to_s
+      @declarations[name] = Filterameter::FilterDeclaration.new(name, options).tap do |fd|
+        add_declarations_for_range(fd, options, name) if fd.range_enabled?
+      end
+    end
+
+    def fetch(parameter_name)
+      name = parameter_name.to_s
+      @filters.fetch(name) do
+        raise Filterameter::Exceptions::UndeclaredParameterError, name unless @declarations.keys.include?(name)
+
+        @filters[name] = @filter_factory.build(@declarations[name])
+      end
+    end
+
+    def filter_declarations
+      @declarations.values
+    end
+
+    private
+
+    # if range is enabled, then in addition to the attribute filter this also adds min and/or max filters
+    def add_declarations_for_range(attribute_declaration, options, parameter_name)
+      add_range_minimum(parameter_name, options) if attribute_declaration.range? || attribute_declaration.minimum?
+      add_range_maximum(parameter_name, options) if attribute_declaration.range? || attribute_declaration.maximum?
+      capture_range_declaration(parameter_name) if attribute_declaration.range?
+    end
+
+    def add_range_minimum(parameter_name, options)
+      parameter_name_min = "#{parameter_name}_min"
+      @declarations[parameter_name_min] = Filterameter::FilterDeclaration.new(parameter_name_min,
+                                                                              options.merge(range: :min_only))
+    end
+
+    def add_range_maximum(parameter_name, options)
+      parameter_name_min = "#{parameter_name}_max"
+      @declarations[parameter_name_min] = Filterameter::FilterDeclaration.new(parameter_name_min,
+                                                                              options.merge(range: :max_only))
+    end
+
+    def capture_range_declaration(name)
+      @ranges[name] = { min: "#{name}_min", max: "#{name}_max" }
+    end
+  end
+end

data/lib/filterameter/filterable.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Filterameter
+  # = Declarative Filters
+  #
+  # Mixin Filterable provides class methods <tt>filter</tt> and <tt>filters</tt>.
+  module Filterable
+    extend ActiveSupport::Concern
+
+    class_methods do
+      # Declares a filter that can be read from the parameters and applied to the ActiveRecord query. The <tt>name</tt>
+      # identifies the name of the parameter and is the default value to determine the criteria to be applied. The name
+      # can be either an attribute or a scope.
+      #
+      # === Options
+      #
+      # [:name]
+      #   Specify the attribute or scope name if the parameter name is not the same. The default value
+      #   is the parameter name, so if the two match this can be left out.
+      #
+      # [:association]
+      #   Specify the name of the association if the attribute or scope is nested.
+      #
+      # [:validates]
+      #   Specify a validation if the parameter value should be validated. This uses ActiveModel validations;
+      #   please review those for types of validations and usage.
+      #
+      # [:partial]
+      #   Specify the partial option if the filter should do a partial search (SQL's `LIKE`). The partial
+      #   option accepts a hash to specify the search behavior. Here are the available options:
+      #   - match: anywhere (default), from_start, dynamic
+      #   - case_sensitive: true, false (default)
+      #
+      #   There are two shortcuts: : the partial option can be declared with `true`, which just uses the
+      #   defaults; or the partial option can be declared with the match option directly,
+      #   such as `partial: :from_start`.
+      #
+      # [:range]
+      #   Specify a range option if the filter also allows ranges to be searched. The range option accepts
+      #   the following options:
+      #   - true: enables two additional parameters with attribute name plus suffixes <tt>_min</tt> and <tt>_max</tt>
+      #   - :min_only: enables additional parameter with attribute name plus suffix <tt>_min</tt>
+      #   - :max_only: enables additional parameter with attribute name plus suffix <tt>_max</tt>
+      def filter(name, options = {})
+        filter_coordinator.add_filter(name, options)
+      end
+
+      # Declares a list of filters that can be read from the parameters and applied to the query. The name can be either
+      # an attribute or a scope. Declare filters individually with <tt>filter</tt> if more options are required.
+      def filters(*names)
+        names.each { |name| filter(name) }
+      end
+    end
+  end
+end

data/lib/filterameter/options/partial_options.rb

@@ -22,11 +22,12 @@ module Options
       @match = 'anywhere'
       @case_sensitive = false
 
-      if options.is_a?(TrueClass)
+      case options
+      when TrueClass
         nil
-      elsif options.is_a? Hash
+      when Hash
         evaluate_hash(options)
-      elsif options.is_a?(String) || options.is_a?(Symbol)
+      when String, Symbol
         assign_match(options)
       end
     end

data/lib/filterameter/parameters_base.rb

@@ -2,6 +2,7 @@
 
 require 'active_model/attribute_assignment'
 require 'active_model/validations'
+require 'filterameter/validators/inclusion_validator'
 
 module Filterameter
   # = Parameters
@@ -9,6 +10,7 @@ module Filterameter
   # Class Parameters is sub-classed to provide controller-specific validations.
   class ParametersBase
     include ActiveModel::Validations
+    include Filterameter::Validators
 
     def self.build_sub_class(declarations)
       Class.new(self).tap do |sub_class|

data/lib/filterameter/query_builder.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Filterameter
+  # = Query Builder
+  #
+  # Class Query Builder turns filter parameters into a query.
+  class QueryBuilder
+    def initialize(default_query, filter_registry)
+      @default_query = default_query
+      @registry = filter_registry
+    end
+
+    def build_query(filter_params, starting_query = nil)
+      valid_filters(filter_params.stringify_keys)
+        .tap { |parameters| convert_min_and_max_to_range(parameters) }
+        .reduce(starting_query || @default_query) do |query, (name, value)|
+        add_filter_parameter_to_query(query, name, value)
+      end
+    end
+
+    private
+
+    def add_filter_parameter_to_query(query, filter_name, parameter_value)
+      @registry.fetch(filter_name).apply(query, parameter_value)
+    rescue Filterameter::Exceptions::UndeclaredParameterError => e
+      handle_undeclared_parameter(e)
+      query
+    end
+
+    def valid_filters(filter_params)
+      remove_invalid_values(filter_params)
+    end
+
+    # if both min and max are present in the query parameters, replace with range
+    def convert_min_and_max_to_range(parameters)
+      @registry.ranges.each do |attribute_name, min_max_names|
+        next unless min_max_names.values.all? { |min_max_name| parameters[min_max_name].present? }
+
+        parameters[attribute_name] = Range.new(parameters.delete(min_max_names[:min]),
+                                               parameters.delete(min_max_names[:max]))
+      end
+    end
+
+    def handle_undeclared_parameter(exception)
+      action = Filterameter.configuration.action_on_undeclared_parameters
+      return unless action
+
+      case action
+      when :log
+        ActiveSupport::Notifications.instrument('undeclared_parameters.filterameter', key: exception.key)
+      when :raise
+        raise exception
+      end
+    end
+
+    def remove_invalid_values(filter_params)
+      validator = validator_class.new(filter_params)
+      return filter_params if validator.valid?
+
+      case Filterameter.configuration.action_on_validation_failure
+      when :log
+        ActiveSupport::Notifications.instrument('validation_failure.filterameter', errors: validator.errors)
+      when :raise
+        raise Filterameter::Exceptions::ValidationError, validator.errors
+      end
+
+      filter_params.except(*invalid_attributes(validator.errors).map(&:to_s))
+    end
+
+    def invalid_attributes(errors)
+      if errors.respond_to? :attribute_names
+        errors.attribute_names
+      else # pre rails 6.1
+        errors.keys
+      end
+    end
+
+    def validator_class
+      @validator_class ||= Filterameter::ParametersBase.build_sub_class(@registry.filter_declarations)
+    end
+  end
+end

data/lib/filterameter/validators/inclusion_validator.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Filterameter
+  module Validators
+    # = Inclusion Validator
+    #
+    # Class InclusionValidator extends ActiveModel::Validations::InclusionValidator to enable validations of multiple
+    # values.
+    #
+    # == Example
+    #
+    #   validates: { inclusion: { in: %w[Small Medium Large], allow_multiple_values: true } }
+    #
+    class InclusionValidator < ActiveModel::Validations::InclusionValidator
+      def validate_each(record, attribute, value)
+        return super unless allow_multiple_values?
+
+        # any? just provides a mechanism to stop after first error
+        Array.wrap(value).any? { |v| super(record, attribute, v) }
+      end
+
+      private
+
+      def allow_multiple_values?
+        @options.fetch(:allow_multiple_values, false)
+      end
+    end
+  end
+end

data/lib/filterameter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Filterameter
-  VERSION = '0.1.4'
+  VERSION = '0.3.0'
 end

data/lib/filterameter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'filterameter/configuration'
+require 'filterameter/declarative_controller_filters'
 require 'filterameter/declarative_filters'
 require 'filterameter/exceptions'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterameter
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Todd Kummer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.2
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: 1.31.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.31.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: 2.15.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
-description: Enable filter parameters to be declared in controllers.
+description: Enable filter parameters to be declared in query classes or controllers.
 email:
 - todd@rockridgesolutions.com
 executables: []
@@ -134,7 +162,10 @@ files:
 - Rakefile
 - lib/filterameter.rb
 - lib/filterameter/configuration.rb
-- lib/filterameter/controller_filters.rb
+- lib/filterameter/coordinators/base.rb
+- lib/filterameter/coordinators/controller_coordinator.rb
+- lib/filterameter/coordinators/query_coordinator.rb
+- lib/filterameter/declarative_controller_filters.rb
 - lib/filterameter/declarative_filters.rb
 - lib/filterameter/exceptions.rb
 - lib/filterameter/exceptions/cannot_determine_model_error.rb
@@ -142,6 +173,8 @@ files:
 - lib/filterameter/exceptions/validation_error.rb
 - lib/filterameter/filter_declaration.rb
 - lib/filterameter/filter_factory.rb
+- lib/filterameter/filter_registry.rb
+- lib/filterameter/filterable.rb
 - lib/filterameter/filters/arel_filter.rb
 - lib/filterameter/filters/attribute_filter.rb
 - lib/filterameter/filters/conditional_scope_filter.rb
@@ -153,6 +186,8 @@ files:
 - lib/filterameter/log_subscriber.rb
 - lib/filterameter/options/partial_options.rb
 - lib/filterameter/parameters_base.rb
+- lib/filterameter/query_builder.rb
+- lib/filterameter/validators/inclusion_validator.rb
 - lib/filterameter/version.rb
 homepage: https://github.com/RockSolt/filterameter
 licenses:
@@ -173,8 +208,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
-summary: Declarative Filter Parameters for Rails Controllers
+summary: Declarative Filter Parameters
 test_files: []

data/lib/filterameter/controller_filters.rb

@@ -1,148 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/inflector'
-
-require 'active_support/rails'
-require 'action_dispatch'
-require 'action_controller/metal/live'
-require 'action_controller/metal/strong_parameters'
-
-require 'filterameter/filter_factory'
-require 'filterameter/filter_declaration'
-require 'filterameter/log_subscriber'
-require 'filterameter/parameters_base'
-
-module Filterameter
-  # = Controller Filters
-  #
-  # Class ControllerFilters stores the configuration declared via class-level method calls such as the list of
-  # filters and the optionally declared model class. Each controller will have one instance of the controller
-  # declarations stored as a class variable.
-  class ControllerFilters
-    attr_writer :query_variable_name
-
-    def initialize(controller_name, controller_path)
-      @controller_name = controller_name
-      @controller_path = controller_path
-      @declarations = {}
-      @ranges = {}
-      @filters = Hash.new { |hash, key| hash[key] = filter_factory.build(@declarations[key]) }
-    end
-
-    def model_class=(model_class)
-      @model_class = model_class.is_a?(String) ? model_class.constantize : model_class
-    end
-
-    def add_filter(parameter_name, options)
-      @declarations[parameter_name.to_s] =
-        Filterameter::FilterDeclaration.new(parameter_name, options).tap do |fd|
-          add_declarations_for_range(fd, options, parameter_name) if fd.range_enabled?
-        end
-    end
-
-    def query_variable_name
-      @query_variable_name ||= model_class.model_name.plural
-    end
-
-    def build_query(filter_params, starting_query)
-      valid_filters(filter_params)
-        .tap { |parameters| convert_min_and_max_to_range(parameters) }
-        .reduce(starting_query || model_class.all) do |query, (name, value)|
-        @filters[name].apply(query, value)
-      end
-    end
-
-    private
-
-    def model_class
-      @model_class ||= @controller_name.classify.safe_constantize ||
-                       @controller_path.classify.safe_constantize ||
-                       raise(Filterameter::Exceptions::CannotDetermineModelError.new(@controller_name,
-                                                                                     @controller_path))
-    end
-
-    # lazy so that model_class can be optionally set
-    def filter_factory
-      @filter_factory ||= Filterameter::FilterFactory.new(model_class)
-    end
-
-    def valid_filters(filter_params)
-      remove_invalid_values(
-        remove_undeclared_filters(filter_params)
-      )
-    end
-
-    # if both min and max are present in the query parameters, replace with range
-    def convert_min_and_max_to_range(parameters)
-      @ranges.each do |attribute_name, min_max_names|
-        next unless min_max_names.values.all? { |min_max_name| parameters[min_max_name].present? }
-
-        parameters[attribute_name] = Range.new(parameters.delete(min_max_names[:min]),
-                                               parameters.delete(min_max_names[:max]))
-      end
-    end
-
-    def remove_undeclared_filters(filter_params)
-      filter_params.slice(*declared_parameter_names).tap do |declared_parameters|
-        handle_undeclared_parameters(filter_params) if declared_parameters.size != filter_params.size
-      end
-    end
-
-    def handle_undeclared_parameters(filter_params)
-      action = Filterameter.configuration.action_on_undeclared_parameters
-      return unless action
-
-      undeclared_parameter_names = filter_params.keys - declared_parameter_names
-      case action
-      when :log
-        ActiveSupport::Notifications.instrument('undeclared_parameters.filterameter', keys: undeclared_parameter_names)
-      when :raise
-        raise Filterameter::Exceptions::UndeclaredParameterError, undeclared_parameter_names
-      end
-    end
-
-    def remove_invalid_values(filter_params)
-      validator = validator_class.new(filter_params)
-      return filter_params if validator.valid?
-
-      case Filterameter.configuration.action_on_validation_failure
-      when :log
-        ActiveSupport::Notifications.instrument('validation_failure.filterameter', errors: validator.errors)
-      when :raise
-        raise Filterameter::Exceptions::ValidationError, validator.errors
-      end
-
-      filter_params.except(*validator.errors.keys.map(&:to_s))
-    end
-
-    def declared_parameter_names
-      @declared_parameter_names ||= @declarations.keys
-    end
-
-    def validator_class
-      @validator_class ||= Filterameter::ParametersBase.build_sub_class(@declarations.values)
-    end
-
-    # if range is enabled, then in addition to the attribute filter this also adds min and/or max filters
-    def add_declarations_for_range(attribute_declaration, options, parameter_name)
-      add_range_minimum(parameter_name, options) if attribute_declaration.range? || attribute_declaration.minimum?
-      add_range_maximum(parameter_name, options) if attribute_declaration.range? || attribute_declaration.maximum?
-      capture_range_declaration(parameter_name) if attribute_declaration.range?
-    end
-
-    def add_range_minimum(parameter_name, options)
-      @declarations["#{parameter_name}_min"] = Filterameter::FilterDeclaration.new(parameter_name,
-                                                                                   options.merge(range: :min_only))
-    end
-
-    def add_range_maximum(parameter_name, options)
-      @declarations["#{parameter_name}_max"] = Filterameter::FilterDeclaration.new(parameter_name,
-                                                                                   options.merge(range: :max_only))
-    end
-
-    # memoizing these makes it easier to spot and replace ranges in query parameters; see convert_min_and_max_to_range
-    def capture_range_declaration(name)
-      @ranges[name] = { min: "#{name}_min", max: "#{name}_max" }
-    end
-  end
-end