query_filter 0.1.5 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3be0d7ad318960b8718eb59befce928685961643
-  data.tar.gz: a78a2e95239421f221293bd64539c2b7112e1dbb
+SHA256:
+  metadata.gz: 6fe7cf9e804b940444eefcf3fbced4b24099d52d32f71d896bcb401fcb1e9e43
+  data.tar.gz: e61f5e207c0a6c7fccae4d44a6a5990cde48f2432d0f520ea47767a417323504
 SHA512:
-  metadata.gz: f0a67510e6629f6f188c388ecdcdb70adf8527f2f43a14a23d4c364e6805dfc9a9d6f9a7092e98008c1c1df6b188aedd2e0a6a3fd006fd90f69d0387ce0e032d
-  data.tar.gz: 929fdde8fb5003292a4eb85d3af88d3eb361ba9628abcdfc89e27d75cb8658a39bf96639cdce79727b53a89718d7a5b2c8cae3c7316c2986c73419302ebf786c
+  metadata.gz: caa899332d0b1034baf784a418c1788d70220380d783069edf8b653729d47bdacd67016828546dfe41a078e0000e72b54379b5f60a67f5bf1e4823f4e8e72862
+  data.tar.gz: 931eed522f0e6d00cab63631967f70729f5d22067016d12a89220d34ee38513213c47ced8090c1062e10f9d0001490dffdc9913b9cc3a0dc84c4395e3bd4e2b0

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 .rspec_status
+pkg

data/.ruby-version

@@ -0,0 +1 @@
+2.5.5

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.4
+  - 2.5.5
 before_install: gem install bundler -v 1.15.1

data/Gemfile.lock

@@ -1,84 +1,47 @@
 PATH
   remote: .
   specs:
-    query_filter (0.1.5)
+    query_filter (0.2.2)
       activesupport (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.2)
-      activesupport (= 5.1.2)
-    activerecord (5.1.2)
-      activemodel (= 5.1.2)
-      activesupport (= 5.1.2)
-      arel (~> 8.0)
-    activesupport (5.1.2)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (8.0.0)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    ffi (1.9.18)
-    formatador (0.2.5)
-    guard (2.14.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    i18n (0.8.4)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
-    method_source (0.8.2)
-    minitest (5.10.2)
-    nenv (0.3.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.5.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.4.2)
+    i18n (1.8.3)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    ruby_dep (1.5.0)
-    shellany (0.0.1)
-    slop (3.6.0)
-    sqlite3 (1.3.13)
-    thor (0.19.4)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    sqlite3 (1.4.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -86,12 +49,10 @@ PLATFORMS
 DEPENDENCIES
   activerecord (>= 4.0)
   bundler (~> 1.15)
-  guard-rspec (~> 4.7, >= 4.7.3)
   query_filter!
-  rake (~> 10.0)
-  rb-fsevent (= 0.9.8)
+  rake (>= 12.3.3)
   rspec (~> 3.0)
   sqlite3 (~> 1.3, >= 1.3.13)
 
 BUNDLED WITH
-   1.15.1
+   1.17.3

data/README.md

@@ -26,6 +26,37 @@ class Order < ActiveRecord::Base
 end
 ```
 
+Where OrderFilter class looks like:
+
+```ruby
+# app/filters/order_filter.rb
+#
+class OrderFilter < QueryFilter::Base
+  scope :customer_id
+  scope :service
+
+  range :total
+
+  date_range :completed_at
+
+  def scope_customer_id(value)
+    query.where(customer_id: value)
+  end
+
+  def scope_service(value)
+    query.where(service_id: value.to_i)
+  end
+
+  def range_total(range)
+    query.where(range.query('orders.total'))
+  end
+
+  def date_range_completed_at(period)
+    query.where(completed_at: period.range_original)
+  end
+end
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -94,6 +125,23 @@ This gem support next types of filter params:
     orders.created_at BETWEEN '2017-06-24 04:00:00.000000' AND '2017-07-01 03:59:59.999999'
     ```
 
+    When we have date with custom time:
+    ```ruby
+    date_range :range, format: '%m/%d/%Y %H:%M'
+
+    def date_range_range(period)
+      query.where(created_at: period.range)
+    end
+    ```
+
+    `period.range` will ignore time and always return time start_of_day and end_of_day, but the method `period.range_original` will return dates without time modification
+
+    ```ruby
+    def date_range_range(period)
+      query.where(created_at: period.range_original)
+    end
+    ```
+
 * order by
     ```ruby
       order_by :sort_column, via: :sort_mode
@@ -188,6 +236,62 @@ QueryFilter.setup do |config|
 end
 ```
 
+## Testing
+
+query_filter gem defines some custom RSpec matchers. Include them to your project:
+
+```ruby
+# spec/support/query_filter.rb
+
+require "query_filter/rspec_matchers"
+
+RSpec.configure do |config|
+  config.include QueryFilter::RSpecMatchers, type: :query_filter
+end
+```
+
+Custom matchers will be available to use in specs:
+
+```ruby
+# spec/filters/order_filter_spec.rb
+
+describe OrderFilter, type: :query_filter do
+  context "scope deleted" do
+    it "performs query" do
+      expect { filter(deleted: true) }.to perform_query(deleted: true)
+    end
+
+    it "doesn't perform query with wrong params" do
+      expect { filter(deleted: "invalid_param") }.to_not perform_query
+    end
+  end
+
+  it "performs query by state" do
+    expect(relation).to receive(:with_state).with(:pending)
+    filter(state: :pending)
+  end
+
+  it "reorders by sort_column" do
+    expect { filter(sort_column: :id, sort_mode: :desc) }
+      .to reorder.by("orders.id DESC NULLS LAST")
+  end
+
+  context "query against the database" do
+    let(:order) { create(:order, state: :pending) }
+
+    # relation is a double by default, but can be redefined to an actual ActiveRecord::Relation:
+    before do
+      relation Order.all
+    end
+
+    it "finds the order" do
+      expect(filter(state: :pending)).to contain_exactly(order)
+      expect(filter(state: :invalid_state)).to be_empty
+    end
+  end
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/query_filter.rb

@@ -17,6 +17,7 @@ module QueryFilter
   end
 
   module Utils
+    autoload :DateNormalizer, 'query_filter/utils/date_normalizer'
     autoload :DatePeriod, 'query_filter/utils/date_period'
     autoload :ScopeRange, 'query_filter/utils/scope_range'
     autoload :UserConditions, 'query_filter/utils/user_conditions'
@@ -30,6 +31,18 @@ module QueryFilter
   mattr_accessor :date_period_splitter
   self.date_period_splitter = 'to'
 
+  mattr_accessor :date_display_format
+  self.date_display_format = '%Y-%m-%d %H:%M'
+
+  mattr_accessor :datetime_formats
+  self.datetime_formats = %w[
+    %Y-%m-%dT%H:%M:%S.%L%z
+    %Y-%m-%dT%H:%M:%S%z
+    %Y-%m-%d %H:%M:%S
+    %Y-%m-%d %H:%M
+    %Y-%m-%d
+  ]
+
   # Default way to setup QueryFilter
   # @example
   #   QueryFilter.setup do |config|

data/lib/query_filter/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Build select query based on params hash
 #
 module QueryFilter

data/lib/query_filter/rspec_matchers.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  module QueryFilter::RSpecMatchers
+    extend RSpec::Matchers::DSL
+
+    def relation(override = nil)
+      @relation ||= override || double('ActiveRecord::Relation')
+    end
+
+    def filter(params)
+      described_class.new(relation, params).to_query
+    end
+
+    # Usage:
+    #
+    # expect { filter(username: "joe") }.to perform_query(users: { username: "joe" })
+    # expect { filter(field: :invalid_value) }.to_not perform_query
+    #
+    matcher :perform_query do |*params_for_where|
+      def supports_block_expectations?
+        true
+      end
+
+      match do |block|
+        expect(relation).to receive(:where).with(*params_for_where)
+        block.call
+      end
+
+      match_when_negated do |block|
+        expect(relation).to_not receive(:where)
+        block.call
+      end
+    end
+
+    # Usage:
+    #
+    # expect { filter(sort: :asc) }.to reorder.by("users.created_at" => "asc")
+    # expect { filter(sort: :invalid_value) }.to_not reorder
+    #
+    matcher :reorder do
+      def supports_block_expectations?
+        true
+      end
+
+      match do |block|
+        expect(relation).to receive(:reorder).with(@params_for_reorder)
+        block.call
+      end
+
+      match_when_negated do |block|
+        expect(relation).to_not receive(:reorder)
+        block.call
+      end
+
+      chain :by do |conditions|
+        @params_for_reorder = conditions
+      end
+    end
+  end
+
+  config.after do
+    @relation = nil
+  end
+end

data/lib/query_filter/rules/date_range.rb

@@ -1,42 +1,47 @@
+# frozen_string_literal: true
+
 # Parse date range params
 #
 #  date_range :created_at, keys: [:start_date, :end_date]
 #
 #  date_range :last_login_date
 #
-module QueryFilter::Rules
-  class DateRange < Scope
-    def name
-      'date_range'.freeze
-    end
+module QueryFilter
+  module Rules
+    class DateRange < Scope
+      def name
+        'date_range'
+      end
 
-    def valid?(values)
-      period = build_period_from_params(values)
-      !(period.nil? || period.default?)
-    end
+      def valid?(values)
+        period = build_period_from_params(values)
+        !(period.nil? || period.default?)
+      end
 
-    def normalize_params(values)
-      build_period_from_params(values)
-    end
+      def normalize_params(values)
+        build_period_from_params(values)
+      end
 
-    protected
+      protected
 
-    def build_period_from_params(params)
-      if params[key].present?
-        QueryFilter::Utils::DatePeriod.parse_from_string(params[key], @options[:format])
-      elsif keys_start_end_dates_exists?(params)
-        QueryFilter::Utils::DatePeriod.new(*values_start_end_dates(params))
+      def build_period_from_params(params)
+        if params[key].present?
+          QueryFilter::Utils::DatePeriod.parse_from_string(params[key], @options[:format])
+        elsif keys_start_end_dates_exists?(params)
+          QueryFilter::Utils::DatePeriod.new(*values_start_end_dates(params), @options[:format])
+        end
       end
-    end
 
-    def keys_start_end_dates_exists?(params)
-      values = values_start_end_dates(params)
-      !values.nil? && values.size == 2
-    end
+      def keys_start_end_dates_exists?(params)
+        values = values_start_end_dates(params)
+        !values.nil? && values.size == 2
+      end
+
+      def values_start_end_dates(params)
+        return unless @options[:keys]
 
-    def values_start_end_dates(params)
-      return if @options[:keys].nil?
-      params.values_at(*@options[:keys])
+        params.values_at(*@options[:keys])
+      end
     end
   end
 end

data/lib/query_filter/rules/order_by.rb

@@ -1,23 +1,27 @@
+# frozen_string_literal: true
+
 # Define order by filter rule
 #
-module QueryFilter::Rules
-  class OrderBy < Scope
-    DIRECTIONS = %w[asc desc].freeze
+module QueryFilter
+  module Rules
+    class OrderBy < Scope
+      DIRECTIONS = %w[asc desc].freeze
 
-    def name
-      'order_by'.freeze
-    end
+      def name
+        'order_by'
+      end
 
-    def valid?(params)
-      params[key].present? && DIRECTIONS.include?(params[direction_key].try(:downcase))
-    end
+      def valid?(params)
+        params[key].present? && DIRECTIONS.include?(params[direction_key].try(:downcase))
+      end
 
-    def direction_key
-      @direction_key ||= (@options[:via] || 'sort_direction').to_sym
-    end
+      def direction_key
+        @direction_key ||= (@options[:via] || 'sort_direction').to_sym
+      end
 
-    def normalize_params(values)
-      [values[key], values[direction_key]]
+      def normalize_params(values)
+        [values[key], values[direction_key]]
+      end
     end
   end
 end

data/lib/query_filter/rules/range.rb

@@ -1,38 +1,42 @@
+# frozen_string_literal: true
+
 # Define range filter rule
 #
-module QueryFilter::Rules
-  class Range < Scope
-    def initialize(keys, options = {})
-      @key = Array(keys).first
-      @keys = [key_from, key_to]
-      @options = options
-    end
+module QueryFilter
+  module Rules
+    class Range < Scope
+      def initialize(keys, options = {})
+        @key = Array(keys).first
+        @keys = [key_from, key_to]
+        @options = options
+      end
 
-    def name
-      'range'.freeze
-    end
+      def name
+        'range'
+      end
 
-    def valid?(values)
-      filter = build_range_from_params(values)
-      filter.valid?
-    end
+      def valid?(values)
+        filter = build_range_from_params(values)
+        filter.valid?
+      end
 
-    def normalize_params(values)
-      build_range_from_params(values)
-    end
+      def normalize_params(values)
+        build_range_from_params(values)
+      end
 
-    protected
+      protected
 
-    def build_range_from_params(params)
-      QueryFilter::Utils::ScopeRange.new(key, params)
-    end
+      def build_range_from_params(params)
+        QueryFilter::Utils::ScopeRange.new(key, params)
+      end
 
-    def key_from
-      @key_from ||= "#{key}_from".to_sym
-    end
+      def key_from
+        @key_from ||= "#{key}_from".to_sym
+      end
 
-    def key_to
-      @key_to ||= "#{key}_to".to_sym
+      def key_to
+        @key_to ||= "#{key}_to".to_sym
+      end
     end
   end
 end

data/lib/query_filter/rules/scope.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Define filter rules
 #
 module QueryFilter
@@ -33,7 +35,7 @@ module QueryFilter
       end
 
       def name
-        'scope'.freeze
+        'scope'
       end
 
       def key

data/lib/query_filter/rules/splitter_range.rb

@@ -1,44 +1,49 @@
-module QueryFilter::Rules
-  class SplitterRange < Scope
-    class RangeParam
-      SPLITTER = /[;-]/
+# frozen_string_literal: true
 
-      def initialize(value)
-        @value = value
-      end
+module QueryFilter
+  module Rules
+    class SplitterRange < Scope
+      class RangeParam
+        SPLITTER = /[;-]/.freeze
 
-      def valid?
-        @value.present? && items.size == 2
-      end
+        def initialize(value)
+          @value = value
+        end
+
+        def valid?
+          @value.present? && items.size == 2
+        end
 
-      def range
-        ::Range.new(*items)
+        def range
+          ::Range.new(*items)
+        end
+
+        def items
+          @items ||= @value.split(SPLITTER).map(&:strip).map(&:to_i)
+        end
       end
 
-      def items
-        @items ||= @value.split(SPLITTER).map(&:strip).map(&:to_i)
+      def name
+        'splitter_range'
       end
-    end
 
-    def name
-      'splitter_range'.freeze
-    end
+      def valid?(values)
+        period = build_period_from_params(values)
+        !period.nil?
+      end
 
-    def valid?(values)
-      period = build_period_from_params(values)
-      !period.nil?
-    end
+      def normalize_params(values)
+        build_period_from_params(values)
+      end
 
-    def normalize_params(values)
-      build_period_from_params(values)
-    end
+      protected
 
-    protected
+      def build_period_from_params(values)
+        param = RangeParam.new(values[key])
+        return unless param.valid?
 
-    def build_period_from_params(values)
-      param = RangeParam.new(values[key])
-      return unless param.valid?
-      param
+        param
+      end
     end
   end
 end

data/lib/query_filter/utils/date_normalizer.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module QueryFilter
+  module Utils
+    class DateNormalizer
+      PG_MIN_YEAR = -4713
+      PG_MAX_YEAR = 294_276
+
+      attr_reader :date, :format
+
+      def initialize(date, format = nil)
+        @date = date
+        @format = format
+      end
+
+      def parsed_value
+        @parsed_value ||= parse
+      end
+
+      def normalize
+        valid?(parsed_value) ? parsed_value : default_date
+      end
+
+      private
+
+      def date?
+        date.is_a?(Time) || date.is_a?(DateTime)
+      end
+
+      def valid?(value)
+        return false unless Date.valid_date?(value.year, value.month, value.day)
+
+        value.year > PG_MIN_YEAR && value.year < PG_MAX_YEAR
+      end
+
+      def parse
+        return date if date?
+        return default_date if date.blank?
+
+        [@format].concat(QueryFilter.datetime_formats).compact.each do |format|
+          value = safe_parse_date(date, format)
+          return value if value
+        end
+
+        default_date
+      end
+
+      def safe_parse_date(string, format)
+        DateTime.strptime(string, format)
+      rescue ArgumentError => _e
+        nil
+      end
+
+      def default_date
+        Time.zone.today
+      end
+    end
+  end
+end

data/lib/query_filter/utils/date_period.rb

@@ -3,33 +3,48 @@
 module QueryFilter
   module Utils
     class DatePeriod
-      attr_reader :date_from, :date_to, :format
-
-      TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+      attr_reader :date_from_raw, :date_to_raw
 
       def initialize(date_from = nil, date_to = nil, format = nil)
-        @format = (format.blank? ? QueryFilter.date_period_format : format)
         @date_from_raw = date_from
         @date_to_raw = date_to
-
-        @date_from = normalize_date(date_from).beginning_of_day
-        @date_to = normalize_date(date_to).end_of_day
+        @format = format
       end
 
       def range
         @range ||= date_from..date_to
       end
 
+      def range_original
+        @range_original ||= date_from_original..date_to_original
+      end
+
+      def date_from
+        @date_from ||= date_from_original.beginning_of_day
+      end
+
+      def date_to
+        @date_to ||= date_to_original.end_of_day
+      end
+
+      def date_from_original
+        @date_from_original ||= normalize_date(@date_from_raw)
+      end
+
+      def date_to_original
+        @date_to_original ||= normalize_date(@date_to_raw)
+      end
+
       def title
         @title ||= to_human
       end
 
       def datefrom
-        @datefrom ||= I18n.l(@date_from, format: @format)
+        @datefrom ||= I18n.l(date_from, format: date_display_format)
       end
 
       def dateto
-        @dateto ||= I18n.l(@date_to, format: @format)
+        @dateto ||= I18n.l(date_to, format: date_display_format)
       end
 
       def to_param
@@ -55,25 +70,21 @@ module QueryFilter
         return value if value.is_a?(DatePeriod)
 
         if value.blank?
-          new(nil, nil, format)
+          new
         else
           dates = value.to_s.split(QueryFilter.date_period_splitter).map(&:strip)
-          new(dates[0], dates[1], format)
+          new(dates[0], dates[1], format || QueryFilter.date_period_format)
         end
       end
 
       private
 
+      def date_display_format
+        @format || QueryFilter.date_display_format
+      end
+
       def normalize_date(date)
-        return date if date.is_a?(Time) || date.is_a?(DateTime)
-        return Time.zone.today if date.blank?
-
-        begin
-          time = DateTime.strptime(date, @format)
-          Time.zone.parse(time.strftime(TIME_FORMAT))
-        rescue ArgumentError => _e
-          Time.zone.today
-        end
+        QueryFilter::Utils::DateNormalizer.new(date, @format).normalize
       end
     end
   end

data/lib/query_filter/utils/scope_range.rb

@@ -1,42 +1,46 @@
-module QueryFilter::Utils
-  # Usage:
-  #
-  #   range = Utils::ScopeRange.new(:orders, { orders_from: 1, orders_to: 44 })
-  #   range.query('orders_count')
-  #
-  class ScopeRange
-    def initialize(name, options = {})
-      @name = name
-      @options = options
-    end
+# frozen_string_literal: true
 
-    def name_from
-      @name_from ||= "#{@name}_from".to_sym
-    end
+module QueryFilter
+  module Utils
+    # Usage:
+    #
+    #   range = Utils::ScopeRange.new(:orders, { orders_from: 1, orders_to: 44 })
+    #   range.query('orders_count')
+    #
+    class ScopeRange
+      def initialize(name, options = {})
+        @name = name
+        @options = options
+      end
 
-    def name_to
-      @name_to ||= "#{@name}_to".to_sym
-    end
+      def name_from
+        @name_from ||= "#{@name}_from".to_sym
+      end
 
-    def value_from
-      @options[name_from]
-    end
+      def name_to
+        @name_to ||= "#{@name}_to".to_sym
+      end
 
-    def value_to
-      @options[name_to]
-    end
+      def value_from
+        @options[name_from]
+      end
 
-    def valid?
-      @options && (value_from.present? || value_to.present?)
-    end
+      def value_to
+        @options[name_to]
+      end
+
+      def valid?
+        @options && (value_from.present? || value_to.present?)
+      end
 
-    def query(column)
-      if value_from.present? && value_to.present?
-        ["#{column} BETWEEN ? AND ?", value_from, value_to]
-      elsif value_from.present?
-        ["#{column} >= ?", value_from]
-      elsif value_to.present?
-        ["#{column} <= ?", value_to]
+      def query(column)
+        if value_from.present? && value_to.present?
+          ["#{column} BETWEEN ? AND ?", value_from, value_to]
+        elsif value_from.present?
+          ["#{column} >= ?", value_from]
+        elsif value_to.present?
+          ["#{column} <= ?", value_to]
+        end
       end
     end
   end

data/lib/query_filter/utils/user_conditions.rb

@@ -15,8 +15,8 @@ module QueryFilter
 
       def passed?
         return true if empty?
-        value = target.params
 
+        value = target.params
         conditions_lambdas.all? { |c| c.call(target, value) }
       end
 
@@ -35,8 +35,8 @@ module QueryFilter
 
       private
 
-      def invert_lambda(l)
-        ->(*args, &blk) { !l.call(*args, &blk) }
+      def invert_lambda(lblock)
+        ->(*args, &blk) { !lblock.call(*args, &blk) }
       end
 
       # Filters support:
@@ -61,6 +61,7 @@ module QueryFilter
         if filter.arity > 1
           lambda do |target, _, &block|
             raise ArgumentError unless block
+
             target.instance_exec(target, block, &filter)
           end
         elsif filter.arity <= 0

data/lib/query_filter/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module QueryFilter
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.2.2'
 end

data/query_filter.gemspec

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-# coding: utf-8
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'query_filter/version'
 
@@ -23,12 +22,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'activerecord', '>= 4.0'
   spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'guard-rspec', '~> 4.7', '>= 4.7.3'
-  spec.add_development_dependency 'rb-fsevent', '0.9.8'
-  spec.add_development_dependency 'activerecord', '>= 4.0'
   spec.add_development_dependency 'sqlite3', '~> 1.3', '>= 1.3.13'
 
   spec.add_dependency 'activesupport', '>= 4.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.2
 platform: ruby
 authors:
 - Igor Galeta
@@ -9,98 +9,64 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +112,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -157,11 +124,13 @@ files:
 - bin/setup
 - lib/query_filter.rb
 - lib/query_filter/base.rb
+- lib/query_filter/rspec_matchers.rb
 - lib/query_filter/rules/date_range.rb
 - lib/query_filter/rules/order_by.rb
 - lib/query_filter/rules/range.rb
 - lib/query_filter/rules/scope.rb
 - lib/query_filter/rules/splitter_range.rb
+- lib/query_filter/utils/date_normalizer.rb
 - lib/query_filter/utils/date_period.rb
 - lib/query_filter/utils/scope_range.rb
 - lib/query_filter/utils/user_conditions.rb
@@ -187,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord query filter gem