query_filter 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f281a64c42dfafb2f5478b7dc850e4d09fbc177357d85590a45e2abaa55b91ea
-  data.tar.gz: c9823c4351c0757a97eeb0d851e22980da495ecdc13784002f6e2ef3390f6403
+  metadata.gz: d494a5d272040d6af4d93d4ae5c4457e31ca829453a8c028520e1c9079cd8235
+  data.tar.gz: c919733a7462306bde459d6b64a7108ad3b22d51504ff03a69aea9acc1c36881
 SHA512:
-  metadata.gz: 38bdd2e28381998445c90a2c86fff1f0d3513df6b995ffbafc1399cf3b3460d5fb25b462602ff3b48426597e0a1aba0951e2adcc4cc3eb4c42ca943bf0c0bff8
-  data.tar.gz: a1aeac38a34238ecb73269246e716501e01897f420181c1a1cdd632a2b5b803a976d26c6d6e012389e9ca2e7b681f573081835df489ed9acbe85959aae928cc8
+  metadata.gz: c7c4a0f4477fd7d160d9c2b014b11f49acf1acbd2fcef96309c4fe0da68c21995b33d357d6aa375ae69cc82351d65277309235691ab7c826bdd3be01ddcbc12b
+  data.tar.gz: 99a9a8edb1391c95152c4612f4928294e5188862011c12c2fd67560b46448eb8fe3a1171db95819fdb148309eb2205603a9ccc9035fc444542b90d936591359a

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  NewCops: disable
+  TargetRubyVersion: 2.5.5
 
 ##################### Styles ##################################
 
@@ -21,7 +22,7 @@ Lint/AmbiguousBlockAssociation:
 
 ##################### Metrics ##################################
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 110
 
 Metrics/ClassLength:
@@ -36,11 +37,3 @@ Metrics/BlockLength:
   Max: 50
   Exclude:
     - "**/*_spec.rb"
-
-##################### Rails ##################################
-
-Rails:
-  Enabled: true
-
-Rails/SkipsModelValidations:
-  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.5.5
+3.1.2

data/Gemfile.lock

@@ -1,96 +1,57 @@
 PATH
   remote: .
   specs:
-    query_filter (0.2.0)
+    query_filter (0.2.3)
       activesupport (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activesupport (5.2.3)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    ffi (1.10.0)
-    formatador (0.2.5)
-    guard (2.15.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.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 (1.6.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    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.13)
-    method_source (0.9.2)
-    minitest (5.11.3)
-    nenv (0.3.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    mini_portile2 (2.8.1)
+    minitest (5.18.0)
+    rake (13.0.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    ruby_dep (1.5.0)
-    shellany (0.0.1)
-    sqlite3 (1.4.1)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    sqlite3 (1.6.2)
+      mini_portile2 (~> 2.8.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (>= 4.0)
-  bundler (~> 1.15)
-  guard-rspec (~> 4.7, >= 4.7.3)
+  bundler
   query_filter!
-  rake (~> 10.0)
-  rb-fsevent (= 0.9.8)
-  rspec (~> 3.0)
-  sqlite3 (~> 1.3, >= 1.3.13)
+  rake
+  rspec (>= 3.0)
+  sqlite3 (>= 1.3.13)
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/README.md

@@ -236,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/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/range.rb

@@ -7,8 +7,7 @@ module QueryFilter
     class Range < Scope
       def initialize(keys, options = {})
         @key = Array(keys).first
-        @keys = [key_from, key_to]
-        @options = options
+        super([key_from, key_to], options)
       end
 
       def name

data/lib/query_filter/utils/scope_range.rb

@@ -35,11 +35,11 @@ module QueryFilter
 
       def query(column)
         if value_from.present? && value_to.present?
-          ["#{column} BETWEEN ? AND ?", value_from, value_to]
+          ["#{column} BETWEEN ? AND ?", value_from.to_f, value_to.to_f]
         elsif value_from.present?
-          ["#{column} >= ?", value_from]
+          ["#{column} >= ?", value_from.to_f]
         elsif value_to.present?
-          ["#{column} <= ?", value_to]
+          ["#{column} <= ?", value_to.to_f]
         end
       end
     end

data/lib/query_filter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module QueryFilter
-  VERSION = '0.2.0'
+  VERSION = '0.2.3'
 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,13 +22,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  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_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '>= 3.0'
+  spec.add_development_dependency 'sqlite3', '>= 1.3.13'
 
   spec.add_dependency 'activesupport', '>= 4.0'
 end

metadata

@@ -1,113 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: query_filter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Igor Galeta
 - Igor Malinovskiy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2023-03-31 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
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: '0'
   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
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '0'
 - !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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.13
@@ -115,9 +78,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.13
@@ -147,7 +107,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -158,6 +117,7 @@ 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
@@ -173,7 +133,7 @@ homepage: https://github.com/psyipm/query_filter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -188,9 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: ActiveRecord query filter gem
 test_files: []

data/.travis.yml

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