datagrid 1.8.2 → 2.0.0

data/lib/datagrid/filters/ranged_filter.rb

@@ -1,56 +1,77 @@
-module Datagrid::Filters::RangedFilter
+# frozen_string_literal: true
 
-  def initialize(grid, name, options, &block)
-    super(grid, name, options, &block)
-    if range?
-      options[:multiple] = true
-    end
-  end
+module Datagrid
+  module Filters
+    module RangedFilter
+      SERIALIZED_RANGE = %r{\A(.*)\.{2,3}(.*)\z}
 
-  def parse_values(value)
-    result = super(value)
-    return result if !range? || result.nil?
-    # Simulate single point range
-    return [result, result] unless result.is_a?(Array)
-
-    case result.size
-    when 0
-      nil
-    when 1
-      result.first
-    when 2
-      if result.first && result.last && result.first > result.last
-        # If wrong range is given - reverse it to be always valid
-        result.reverse
-      elsif !result.first && !result.last
-        nil
-      else
-        result
+      def parse_values(value)
+        return super unless range?
+
+        case value
+        when String
+          if ["..", "..."].include?(value)
+            nil
+          elsif (match = value.match(SERIALIZED_RANGE))
+            to_range(match.captures[0], match.captures[1], value.include?("..."))
+          else
+            super
+          end
+        when Hash
+          parse_hash(value)
+        when Array
+          parse_array(value)
+        when Range
+          to_range(value.begin, value.end)
+        else
+          result = super
+          to_range(result, result)
+        end
       end
-    else
-      raise ArgumentError, "Can not create a date range from array of more than two: #{result.inspect}"
-    end
 
-  end
+      def range?
+        options[:range]
+      end
 
-  def range?
-    options[:range]
-  end
+      def default_filter_where(scope, value)
+        if range? && value.is_a?(Range)
+          scope = driver.greater_equal(scope, name, value.begin) if value.begin
+          scope = driver.less_equal(scope, name, value.end) if value.end
+          scope
+        else
+          super
+        end
+      end
 
-  def default_filter_where(scope, value)
-    if range? && value.is_a?(Array)
-      left, right = value
-      if left
-        scope = driver.greater_equal(scope, name, left)
+      protected
+
+      def parse_hash(result)
+        to_range(result[:from] || result["from"], result[:to] || result["to"])
       end
-      if right
-        scope = driver.less_equal(scope, name, right)
+
+      def to_range(from, to, exclusive = false)
+        from = parse(from)
+        to = parse(to)
+        return nil unless to || from
+
+        # If wrong range is given - reverse it to be always valid
+        from, to = to, from if from && to && from > to
+        exclusive ? from...to : from..to
       end
-      scope
-    else
-      super(scope, value)
-    end
-  end
 
+      def parse_array(result)
+        first = result.first
+        last = result.last
 
+        case result.size
+        when 0
+          nil
+        when 1, 2
+          to_range(first, last)
+        else
+          raise ArgumentError, "Can not create a range from array of more than two elements"
+        end
+      end
+    end
+  end
 end

data/lib/datagrid/filters/select_options.rb

@@ -1,57 +1,66 @@
-module Datagrid::Filters::SelectOptions
-  def select(object)
-    select = self.options[:select]
-    if select.is_a?(Symbol)
-      object.send(select)
-    elsif select.respond_to?(:call)
-      Datagrid::Utils.apply_args(object, &select)
-    else
-      select
-    end
-  end
+# frozen_string_literal: true
 
-  def select_values(object)
-    options = select(object)
-    groups_used = grouped_choices?(options)
-    options.map do |option|
-      if groups_used
-        option[1].map {|o| option_text_and_value(o)}
-      else
-        option_text_and_value(option)
+module Datagrid
+  module Filters
+    module SelectOptions
+      def select(object)
+        select = options[:select]
+        if select.is_a?(Symbol)
+          object.send(select)
+        elsif select.respond_to?(:call)
+          Datagrid::Utils.apply_args(object, &select)
+        else
+          select
+        end
       end
-    end.map(&:last)
-  end
 
-  def include_blank
-    unless prompt
-      options.has_key?(:include_blank) ?
-        Datagrid::Utils.callable(options[:include_blank]) : !multiple?
-    end
-  end
+      def select_values(object)
+        options = select(object)
+        groups_used = grouped_choices?(options)
+        options.map do |option|
+          if groups_used
+            option[1].map { |o| option_text_and_value(o) }
+          else
+            option_text_and_value(option)
+          end
+        end.map(&:last)
+      end
 
-  def prompt
-    options.has_key?(:prompt) ? Datagrid::Utils.callable(options[:prompt]) : false
-  end
+      def include_blank
+        return if prompt
 
-  protected
-
-  # Rails built-in method:
-  # https://github.com/rails/rails/blob/94e80269e36caf7b2d22a7ab68e6898d3a824122/actionview/lib/action_view/helpers/form_options_helper.rb#L789
-  # Code reuse is difficult, so it is easier to duplicate it
-  def option_text_and_value(option)
-    # Options are [text, value] pairs or strings used for both.
-    if !option.is_a?(String) && option.respond_to?(:first) && option.respond_to?(:last)
-      option = option.reject { |e| Hash === e } if Array === option
-      [option.first, option.last]
-    else
-      [option, option]
-    end
-  end
+        if options.key?(:include_blank)
+          Datagrid::Utils.callable(options[:include_blank])
+        else
+          !multiple?
+        end
+      end
+
+      def prompt
+        options.key?(:prompt) ? Datagrid::Utils.callable(options[:prompt]) : false
+      end
+
+      protected
 
-  # Rails built-in method:
-  # https://github.com/rails/rails/blob/f95c0b7e96eb36bc3efc0c5beffbb9e84ea664e4/actionview/lib/action_view/helpers/tags/select.rb#L36
-  # Code reuse is difficult, so it is easier to duplicate it
-  def grouped_choices?(choices)
-    !choices.blank? && choices.first.respond_to?(:last) && Array === choices.first.last
+      # Rails built-in method:
+      # https://github.com/rails/rails/blob/94e80269e36caf7b2d22a7ab68e6898d3a824122/actionview/lib/action_view/helpers/form_options_helper.rb#L789
+      # Code reuse is difficult, so it is easier to duplicate it
+      def option_text_and_value(option)
+        # Options are [text, value] pairs or strings used for both.
+        if !option.is_a?(String) && option.respond_to?(:first) && option.respond_to?(:last)
+          option = option.reject { |e| e.is_a?(Hash) } if option.is_a?(Array)
+          [option.first, option.last]
+        else
+          [option, option]
+        end
+      end
+
+      # Rails built-in method:
+      # https://github.com/rails/rails/blob/f95c0b7e96eb36bc3efc0c5beffbb9e84ea664e4/actionview/lib/action_view/helpers/tags/select.rb#L36
+      # Code reuse is difficult, so it is easier to duplicate it
+      def grouped_choices?(choices)
+        !choices.blank? && choices.first.respond_to?(:last) && choices.first.last.is_a?(Array)
+      end
+    end
   end
 end

data/lib/datagrid/filters/string_filter.rb

@@ -1,8 +1,13 @@
-class Datagrid::Filters::StringFilter < Datagrid::Filters::BaseFilter
+# frozen_string_literal: true
 
-  include Datagrid::Filters::RangedFilter
+module Datagrid
+  module Filters
+    class StringFilter < Datagrid::Filters::BaseFilter
+      include Datagrid::Filters::RangedFilter
 
-  def parse(value)
-    value.nil? ? nil : value.to_s
+      def parse(value)
+        value&.to_s
+      end
+    end
   end
 end