filterable-by 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e6e0dec80e50b96215a9ca532e623ce4607baa4
-  data.tar.gz: 550ac202cfcbe7796ec880a5e7be5b3b01295a25
+SHA256:
+  metadata.gz: 7c170888a73dbeca47de324efe3056b63112936dd4b0ebd4b5952b44a48727a0
+  data.tar.gz: d63ac1513cb002bc12ba106abe5f99c2e90f91c9d5a8696397a52e8f5bf7c732
 SHA512:
-  metadata.gz: e14820b29652c048576fb26a937728005a33de161b19671214127166e024b08aa3b7878d1f16977966b246c35f8aa0cbd2eec9c7c9967579a06b7790dda70e36
-  data.tar.gz: 668d68342c9ae54b22b390a09749bc83a5269c9d527b327af407c7ffa8d45c2134be2964ccc6f316483b978a4264e52e495487c832a98fae35dc8db0dfaf171d
+  metadata.gz: 01e287700b6bec04c0a53319de330b113cad3466d9a00288206ed0e60c9fbc35de8cb6089d976590dfe808b7b9e06e344b0d1378a1f60a7fb232de8f9430019b
+  data.tar.gz: 447d4907f3e7876d878d4fdb8a070214cd6804dfa40c67277639f172ba8a17b067d48f7ae96d1c43d90734d60e0dd8287aab5d1fb52e73de2779f9d4bba72a46

data/Gemfile.lock

@@ -1,50 +1,63 @@
 PATH
   remote: .
   specs:
-    filterable-by (0.4.6)
+    filterable-by (0.4.7)
       activerecord
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
-      builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
-      arel (~> 6.0)
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.9.0)
-    rake (11.1.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    arel (9.0.0)
+    ast (2.4.0)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.1)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.55.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    unicode-display_width (1.3.2)
 
 PLATFORMS
   ruby
@@ -54,7 +67,8 @@ DEPENDENCIES
   filterable-by!
   rake
   rspec
+  rubocop
   sqlite3
 
 BUNDLED WITH
-   1.11.2
+   1.16.1

data/README.md

@@ -35,28 +35,3 @@ Comment.filter_by({ "user_id" => "2", "ignored" => "3" })
 Comment.filter_by({ "post_author_id" => "5" })
 # => JOINS posts ON posts.id = comments.post_id WHERE posts.author_id = 5
 ```
-
-## LICENCE
-
-```
-Copyright (c) 2015 Black Square Media
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```

data/Rakefile

@@ -1,7 +1,9 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop)
 
-task default: [:spec]
+task default: %i[spec rubocop]

data/filterable-by.gemspec

@@ -1,7 +1,7 @@
-# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name        = 'filterable-by'
-  s.version     = '0.4.6'
+  s.version     = '0.4.7'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate white-listed filter scopes from URL parameter values'
@@ -12,13 +12,14 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.2'
 
-  s.add_dependency 'activesupport'
   s.add_dependency 'activerecord'
+  s.add_dependency 'activesupport'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rubocop'
   s.add_development_dependency 'sqlite3'
 end

data/lib/filterable_by.rb

@@ -3,9 +3,7 @@ require 'active_support/concern'
 require 'set'
 
 module ActiveRecord
-  module FilterableByHelper
-    extend ActiveSupport::Concern
-
+  module FilterableBy
     def self.normalize(value)
       case value
       when String, Numeric
@@ -16,10 +14,20 @@ module ActiveRecord
     end
 
     module ClassMethods
+      def self.extended(base) # :nodoc:
+        base.class_attribute :_filterable_by_config, instance_accessor: false, instance_predicate: false
+        base._filterable_by_config = {}
+        super
+      end
+
+      def inherited(base) # :nodoc:
+        base._filterable_by_config = _filterable_by_config.deep_dup
+        super
+      end
 
       def filterable_by(*names, &block)
         names.each do |name|
-          _filterable_by_scope_options[name.to_s] = block || ->(scope, v) { scope.where(name.to_sym => v) }
+          _filterable_by_config[name.to_s] = block || ->(scope, v) { scope.where(name.to_sym => v) }
         end
       end
 
@@ -29,27 +37,20 @@ module ActiveRecord
         scope = all
         return scope unless hash.is_a?(Hash)
 
-        _filterable_by_scope_options.each do |name, block|
+        _filterable_by_config.each do |name, block|
           next unless hash.key?(name)
 
-          value = FilterableByHelper.normalize(hash[name])
+          value = FilterableBy.normalize(hash[name])
           next if value.blank?
 
           scope = block.call(scope, value)
         end
         scope
       end
-
-      protected
-
-        def _filterable_by_scope_options
-          @_filterable_by_scope_options ||= superclass == Object ? {} : superclass.send(:_filterable_by_scope_options).dup
-        end
-
     end
   end
 
   class Base
-    include FilterableByHelper
+    extend FilterableBy::ClassMethods
   end
 end

data/spec/filterable_by_spec.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe ActiveRecord::FilterableByHelper do
-
+describe ActiveRecord::FilterableBy do
   let(:alice) { AUTHORS[:alice] }
   let(:bob)   { AUTHORS[:bob] }
 
@@ -9,9 +8,9 @@ describe ActiveRecord::FilterableByHelper do
   let(:bpost) { POSTS[:bobs] }
 
   it 'should have config' do
-    expect(Comment.send(:_filterable_by_scope_options).count).to eq(3)
-    expect(Rating.send(:_filterable_by_scope_options).count).to eq(2)
-    expect(Post.send(:_filterable_by_scope_options).count).to eq(1)
+    expect(Comment.send(:_filterable_by_config).count).to eq(3)
+    expect(Rating.send(:_filterable_by_config).count).to eq(2)
+    expect(Post.send(:_filterable_by_config).count).to eq(1)
   end
 
   it 'should ignore bad inputs' do
@@ -23,15 +22,15 @@ describe ActiveRecord::FilterableByHelper do
   end
 
   it 'should generate simple scopes' do
-    expect(Comment.filter_by('author_id' => alice.id).pluck(:title)).to match_array(['AA', 'AB'])
-    expect(Comment.filter_by('author_id' => bob.id).pluck(:title)).to match_array(['BA', 'BB'])
-    expect(Comment.filter_by('author_id' => [alice.id, '']).pluck(:title)).to match_array(['AA', 'AB'])
+    expect(Comment.filter_by('author_id' => alice.id).pluck(:title)).to match_array(%w[AA AB])
+    expect(Comment.filter_by('author_id' => bob.id).pluck(:title)).to match_array(%w[BA BB])
+    expect(Comment.filter_by('author_id' => [alice.id, '']).pluck(:title)).to match_array(%w[AA AB])
 
-    expect(Comment.filter_by('post_id' => apost.id).pluck(:title)).to match_array(['AA', 'BA'])
-    expect(Comment.filter_by('post_id' => bpost.id).pluck(:title)).to match_array(['AB', 'BB'])
+    expect(Comment.filter_by('post_id' => apost.id).pluck(:title)).to match_array(%w[AA BA])
+    expect(Comment.filter_by('post_id' => bpost.id).pluck(:title)).to match_array(%w[AB BB])
 
-    expect(Comment.filter_by('post_author_id' => alice.id).pluck(:title)).to match_array(['AA', 'BA'])
-    expect(Comment.filter_by('post_author_id' => bob.id).pluck(:title)).to match_array(['AB', 'BB'])
+    expect(Comment.filter_by('post_author_id' => alice.id).pluck(:title)).to match_array(%w[AA BA])
+    expect(Comment.filter_by('post_author_id' => bob.id).pluck(:title)).to match_array(%w[AB BB])
 
     expect(Rating.filter_by('author_id' => alice.id).count).to eq(0)
     expect(Rating.filter_by('author_id' => bob.id).count).to eq(1)
@@ -46,7 +45,7 @@ describe ActiveRecord::FilterableByHelper do
     expect(Comment.filter_by('author_id' => bob.id, 'post_id' => bpost.id).pluck(:title)).to match_array(['BB'])
 
     scope = Comment.filter_by('author_id' => [alice.id, bob.id], 'post_id' => bpost.id)
-    expect(scope.pluck(:title)).to match_array(['AB', 'BB'])
+    expect(scope.pluck(:title)).to match_array(%w[AB BB])
   end
 
   it 'should combine with other scopes' do
@@ -59,5 +58,4 @@ describe ActiveRecord::FilterableByHelper do
     expect(Post.filter_by('post_id' => bpost.id).count).to eq(2)
     expect(Rating.filter_by('post_author_id' => bob.id).count).to eq(1)
   end
-
 end

data/spec/spec_helper.rb

@@ -48,12 +48,12 @@ end
 AUTHORS = {
   alice: Author.create!,
   bob:   Author.create!,
-}
+}.freeze
 
 POSTS = {
   alices: Post.create!(author_id: AUTHORS[:alice].id),
   bobs:   Post.create!(author_id: AUTHORS[:bob].id),
-}
+}.freeze
 
 COMMENTS = {
   alice_on_alice: Comment.create!(title: 'AA', post_id: POSTS[:alices].id, author_id: AUTHORS[:alice].id),
@@ -61,4 +61,4 @@ COMMENTS = {
   alice_on_bob:   Comment.create!(title: 'AB', post_id: POSTS[:bobs].id, author_id: AUTHORS[:alice].id),
   bob_on_bob:     Comment.create!(title: 'BB', post_id: POSTS[:bobs].id, author_id: AUTHORS[:bob].id),
   boa_rating:     Rating.create!(stars: 5, post_id: POSTS[:alices].id, author_id: AUTHORS[:bob].id),
-}
+}.freeze

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: filterable-by
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -132,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Generate white-listed filter scopes from URL parameter values