scopable 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c29d86060f15ebc79b4031ecd53b44234585a9f3
-  data.tar.gz: 789ccdcd4939f931e812985c4200c5186f6a8f88
+SHA256:
+  metadata.gz: 5a3bcc2de0db35befe93021d9db35d31618e6040bfada9e0b3a2073290503280
+  data.tar.gz: 22eb8fc269eef1a7ea07e8902d5ac4dc6af46663a6bdeecedd77ff95e969fe2d
 SHA512:
-  metadata.gz: 0f2f1e1824aaab0f0c99e0e9c8b2aab3d249d06457e49fd931d7fcb5b4d70bd642d13f4ec107d7e17ad0384187321b59565a30c0b09e1cc0fdb9bc03740646e4
-  data.tar.gz: 366235082940386af0c0e0ee9787032a9de403d285111dd4bd9d72a176a324a60199dd5687fb25a5b82b74186dd956a9807bce2cdcb37b9035fa866e4e085d3d
+  metadata.gz: 51a2bd239421d72d8180f8137d0aec49eaaf68f5f7815c41ad204f6ccbb3158e9eb3dbe02fea4f6c5af4188a0004c4664a82272366fda4eb80dac59e5c6c5f9d
+  data.tar.gz: 336818370d75470b375595be0494a2dfcc6aa3ec24d6efc47c26fad209f6f2dc945027279a3b0f59d760f54d83133d7b2d20072d305bd88ace12e7b3aab057d1

data/.codeclimate.yml

@@ -1,13 +1,14 @@
-engines:
+version: "2"
+plugins:
   rubocop:
     enabled: true
-  duplication:
+checks:
+  method-lines:
     enabled: true
     config:
-      languages:
-      - ruby
-ratings:
-  paths:
-  - "lib/**.rb"
-exclude_paths:
-- test/**/*
+      threshold: 40
+  method-complexity:
+    config:
+      threshold: 40
+exclude_patterns:
+- "test/"

data/.travis.yml

@@ -4,7 +4,7 @@ env:
     - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
 language: ruby
 rvm:
-  - 2.4.1
+  - 2.5.1
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter

data/README.md

@@ -1,7 +1,7 @@
-[![RubyGems](https://img.shields.io/gem/dt/scopable.svg?style=flat)](https://rubygems.org/gems/scopable)
-[![Build](https://img.shields.io/travis/corenzan/scopable.svg?style=flat)](https://travis-ci.org/corenzan/scopable)
-[![Code Climate](https://img.shields.io/codeclimate/github/corenzan/scopable.svg?style=flat)](https://codeclimate.com/github/corenzan/scopable)
-[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/corenzan/scopable.svg?style=flat)](https://codeclimate.com/github/corenzan/scopable/coverage)
+[![RubyGems](https://img.shields.io/gem/dt/scopable.svg?style=flat-square)](https://rubygems.org/gems/scopable)
+[![Build](https://img.shields.io/travis/corenzan/scopable.svg?style=flat-square)](https://travis-ci.org/corenzan/scopable)
+[![Maintainability](https://img.shields.io/codeclimate/maintainability/corenzan/scopable.svg?style=flat-square)](https://codeclimate.com/github/corenzan/scopable/maintainability)
+[![Test Coverage](https://img.shields.io/codeclimate/c/corenzan/scopable.svg?style=flat-square)](https://codeclimate.com/github/corenzan/scopable/test_coverage)
 
 # Scopable
 
@@ -99,7 +99,7 @@ Key         | Description
 `:required` | Calls `#none` on the model if parameter is absent (blank or nil) and there's no default value set.
 `:if`       | ...
 `:unless`   | ...
-`&block`    | Block will be used to produce the resulting relation with two parameters: the relation at this step and the scope value from params.
+`&block`    | Block will be executed in the context of the relation plus two local methods `value` and `params`.
 
 ## Collaboration
 

data/lib/scopable.rb

@@ -62,6 +62,9 @@ class Scopable
         next relation if delegator(relation, value, params).instance_exec(&options[:unless])
       end
 
+      # Bail if the value is false or nil.
+      next relation if !value
+
       # When a block is present, use that, otherwise call the scope method.
       if options[:block].present?
         delegator(relation, value, params).instance_exec(&options[:block])

data/lib/scopable/version.rb

@@ -1,3 +1,3 @@
 class Scopable
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/scopable.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'minitest', '~> 5.10'
   spec.add_development_dependency 'rubocop', '~> 0.49'
   spec.add_development_dependency 'simplecov', '~> 0.14'

data/test/scopable_test.rb

@@ -74,7 +74,7 @@ class ScopableTest < Minitest::Test
     refute_scope(scopable.resolve, :fuzzy)
   end
 
-  test 'matching param with true-like value' do
+  test 'matching param with truthy value' do
     model = Model.new
     scopable = Scopable.new(model, fuzzy: {})
     assert_scope(scopable.resolve(fuzzy: 'on'), :fuzzy, true)
@@ -82,12 +82,12 @@ class ScopableTest < Minitest::Test
     assert_scope(scopable.resolve(fuzzy: 'true'), :fuzzy, true)
   end
 
-  test 'matching param with false-like value' do
+  test 'matching param with falsey value' do
     model = Model.new
     scopable = Scopable.new(model, fuzzy: {})
-    assert_scope(scopable.resolve(fuzzy: 'no'), :fuzzy, false)
-    assert_scope(scopable.resolve(fuzzy: 'off'), :fuzzy, false)
-    assert_scope(scopable.resolve(fuzzy: 'false'), :fuzzy, false)
+    refute_scope(scopable.resolve(fuzzy: 'no'), :fuzzy)
+    refute_scope(scopable.resolve(fuzzy: 'off'), :fuzzy)
+    refute_scope(scopable.resolve(fuzzy: 'false'), :fuzzy)
   end
 
   test 'param option' do
@@ -137,10 +137,34 @@ class ScopableTest < Minitest::Test
     assert_scope(scopable.resolve(params), :fuzzy, 'fuzzy')
   end
 
-  test 'block option' do
+  test 'block option matching' do
     model = Model.new
     scopable = Scopable.new(model, fuzzy: { block: -> { jumbo(value) } })
     params = { fuzzy: 'fuzzy' }
     assert_scope(scopable.resolve(params), :jumbo, 'fuzzy')
   end
+
+  test 'block option miss' do
+    model = Model.new
+    scopable = Scopable.new(model, fuzzy: { block: -> { jumbo(value) } })
+    params = {}
+    refute_scope(scopable.resolve(params), :jumbo)
+  end
+
+  test 'block option with falsey value' do
+    model = Model.new
+    scopable = Scopable.new(model, fuzzy: { block: -> { jumbo(value) } })
+    params = { fuzzy: false }
+    refute_scope(scopable.resolve(params), :jumbo)
+  end
+
+  test 'block delegator' do
+    model = Model.new
+    params = { fuzzy: 'fuzzy' }
+    scopable = Scopable.new(model, {})
+    delegator = scopable.delegator(model, 'fuzzy', params)
+    assert_respond_to(delegator, :all)
+    assert_equal('fuzzy', delegator.value)
+    assert_equal(params, delegator.params)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopable
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Arthur Corenzan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Easy parametric query building in Rails.