filterable-by 0.4.0 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e533d4d75b6d63e5fb7618d137ea0d3c74b33556
-  data.tar.gz: c2b26115a0d7c1a035230914d54aa47fa9d4de16
+  metadata.gz: 4e6e0dec80e50b96215a9ca532e623ce4607baa4
+  data.tar.gz: 550ac202cfcbe7796ec880a5e7be5b3b01295a25
 SHA512:
-  metadata.gz: 5e3720c7264c8ca31db45f5393778f3f3795c655e5f440bc5e49cda15bdf7c50988e1bccf48ed7871b3fc80d286b4181bf8f3c0228a854acb987e76ef32b4655
-  data.tar.gz: 78c319fb3bd03c79094f72268dfaa589930985809e5ff2bcd524420980e01f30ebd2fb9e10e2174e2dee93fec50dcf2c499e0d27bde165256ff044a0b451e0c4
+  metadata.gz: e14820b29652c048576fb26a937728005a33de161b19671214127166e024b08aa3b7878d1f16977966b246c35f8aa0cbd2eec9c7c9967579a06b7790dda70e36
+  data.tar.gz: 668d68342c9ae54b22b390a09749bc83a5269c9d527b327af407c7ffa8d45c2134be2964ccc6f316483b978a4264e52e495487c832a98fae35dc8db0dfaf171d

data/Gemfile.lock

@@ -1,61 +1,47 @@
 PATH
   remote: .
   specs:
-    filterable-by (0.4.0)
+    filterable-by (0.4.6)
       activerecord
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
     builder (3.2.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.8.2)
-    parser (2.2.2.5)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.32.0)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
-    sqlite3 (1.3.10)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    sqlite3 (1.3.11)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -68,8 +54,7 @@ DEPENDENCIES
   filterable-by!
   rake
   rspec
-  rubocop
   sqlite3
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/Rakefile

@@ -1,9 +1,7 @@
 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, :rubocop]
+task default: [:spec]

data/filterable-by.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'filterable-by'
-  s.version     = '0.4.0'
+  s.version     = '0.4.6'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate white-listed filter scopes from URL parameter values'
@@ -20,6 +20,5 @@ Gem::Specification.new do |s|
   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

@@ -6,9 +6,13 @@ module ActiveRecord
   module FilterableByHelper
     extend ActiveSupport::Concern
 
-    included do
-      class_attribute :_filterable_by_scope_options, instance_accessor: false
-      self._filterable_by_scope_options = {}
+    def self.normalize(value)
+      case value
+      when String, Numeric
+        value
+      when Array
+        value.select { |v| normalize(v) }
+      end
     end
 
     module ClassMethods
@@ -28,14 +32,20 @@ module ActiveRecord
         _filterable_by_scope_options.each do |name, block|
           next unless hash.key?(name)
 
-          value = hash[name]
-          next unless (value.is_a?(String) && value.present?) || value.is_a?(Numeric)
+          value = FilterableByHelper.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
 

data/spec/filterable_by_spec.rb

@@ -9,7 +9,9 @@ describe ActiveRecord::FilterableByHelper do
   let(:bpost) { POSTS[:bobs] }
 
   it 'should have config' do
-    expect(Comment._filterable_by_scope_options.size).to eq(3)
+    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)
   end
 
   it 'should ignore bad inputs' do
@@ -23,12 +25,18 @@ describe ActiveRecord::FilterableByHelper do
   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('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_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(Rating.filter_by('author_id' => alice.id).count).to eq(0)
+    expect(Rating.filter_by('author_id' => bob.id).count).to eq(1)
+
+    expect(Post.filter_by('author_id' => bob.id).count).to eq(1)
   end
 
   it 'should generate combined scopes' do
@@ -36,6 +44,9 @@ describe ActiveRecord::FilterableByHelper do
     expect(Comment.filter_by('author_id' => alice.id, 'post_id' => bpost.id).pluck(:title)).to match_array(['AB'])
     expect(Comment.filter_by('author_id' => bob.id, 'post_id' => apost.id).pluck(:title)).to match_array(['BA'])
     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'])
   end
 
   it 'should combine with other scopes' do
@@ -43,4 +54,10 @@ describe ActiveRecord::FilterableByHelper do
     expect(scope.pluck(:title)).to match_array(['AA'])
   end
 
+  it 'should ignore invalid scopes' do
+    expect(Comment.filter_by('invalid' => 1).count).to eq(4)
+    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

@@ -11,8 +11,10 @@ ActiveRecord::Base.connection.instance_eval do
   create_table :posts do |t|
     t.integer :author_id, null: false
   end
-  create_table :comments do |t|
-    t.string  :title, null: false
+  create_table :feedbacks do |t|
+    t.string  :type, null: false
+    t.string  :title
+    t.integer :stars, null: false, default: 0
     t.integer :post_id, null: false
     t.integer :author_id, null: false
   end
@@ -23,18 +25,26 @@ end
 
 class Post < ActiveRecord::Base
   belongs_to :author
+
+  filterable_by :author_id
 end
 
-class Comment < ActiveRecord::Base
+class Feedback < ActiveRecord::Base
   belongs_to :author
   belongs_to :post
 
   filterable_by :post_id, :author_id
+end
+
+class Comment < Feedback
   filterable_by :post_author_id do |scope, value|
     scope.joins(:post).where(Post.arel_table[:author_id].eq(value))
   end
 end
 
+class Rating < Feedback
+end
+
 AUTHORS = {
   alice: Author.create!,
   bob:   Author.create!,
@@ -50,4 +60,5 @@ COMMENTS = {
   bob_on_alice:   Comment.create!(title: 'BA', post_id: POSTS[:alices].id, author_id: AUTHORS[:bob].id),
   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),
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterable-by
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.6
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,20 +80,6 @@ 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
@@ -116,8 +102,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -148,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate white-listed filter scopes from URL parameter values

data/.rubocop.yml

@@ -1,7 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-Style/Documentation:
-  Enabled: false
-
-Metrics/LineLength:
-  Max: 120

data/.rubocop_todo.yml

@@ -1,40 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-10-29 12:58:41 +0000 using RuboCop version 0.32.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundBlockBody:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundModuleBody:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: Exclude.
-Style/FileName:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SingleSpaceBeforeFirstArg:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
-Style/WordArray:
-  MinSize: 2