scopable 1.1.1 → 1.1.3

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 gemspec
-gem 'codeclimate-test-reporter', group: :test, require: nil
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end

data/README.md

@@ -1,11 +1,12 @@
+[![RubyGems](https://img.shields.io/gem/dt/scopable.svg)](https://rubygems.org/gems/scopable)
+[![Build](https://img.shields.io/travis/haggen/scopable.svg)](https://travis-ci.org/haggen/scopable)
+[![Code Climate](https://img.shields.io/codeclimate/github/haggen/scopable.svg)](https://codeclimate.com/github/haggen/scopable)
+[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/haggen/scopable.svg)](https://codeclimate.com/github/haggen/scopable/coverage)
+
 # Scopable
 
 > Apply or skip model scopes based on options and request parameters.
 
-[![Code Climate](https://codeclimate.com/github/haggen/scopable/badges/gpa.svg?1)](https://codeclimate.com/github/haggen/scopable)
-[![Test Coverage](https://codeclimate.com/github/haggen/scopable/badges/coverage.svg?1)](https://codeclimate.com/github/haggen/scopable/coverage)
-[![Build](https://travis-ci.org/haggen/scopable.svg)](https://travis-ci.org/haggen/scopable)
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -116,6 +117,10 @@ Key         | Description
 `:except`   | The scope will be applied to all actions except these.
 `&block`    | Block will be called in the context of the action and will be given the current relation and evaluated value.
 
+## License
+
+See [LICENSE](LICENSE).
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/scopable/fork )
@@ -123,7 +128,3 @@ Key         | Description
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
-
-## License
-
-See [LICENSE.txt](LICENSE.txt).

data/lib/scopable/version.rb

@@ -1,3 +1,3 @@
 module Scopable
-  VERSION = "1.1.1"
+  VERSION = "1.1.3"
 end

data/lib/scopable.rb

@@ -60,10 +60,11 @@ module Scopable
 
       # For advanced scopes that require more than a method call on the model.
       # When a block is given, it is ran no matter the scope value.
-      # The proc will be given the model being scoped and the resulting value from the options above, and it'll be executed inside the context of the controller's action.
+      # The proc will be given the model being scoped and the resulting value from the
+      # options above, and it'll be executed inside the context of the controller's action.
       block = options[:block]
 
-      if block.nil? && value.nil?
+      if block.nil? && value.blank?
         next relation
       end
 

data/scopable.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '>= 3.2'
-  # spec.add_runtime_dependency 'railties', '>= 4.2.0', '< 5.1'
+  spec.required_ruby_version = '>= 2.2.2'
+
+  spec.add_runtime_dependency 'activesupport', '>= 3.2', '<= 5.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3.5'
 end

data/spec/scopable_spec.rb

@@ -18,7 +18,7 @@ describe Scopable do
   end
 
   #
-  # Test single scope, no options, with and without matching parameters.
+  # Test single scope, no options.
   #
   describe 'with one optional scope' do
     let :controller do
@@ -27,7 +27,7 @@ describe Scopable do
       end
     end
 
-    context 'without matching parameters' do
+    context 'with the parameter absent' do
       subject :action do
         controller.new
       end
@@ -37,7 +37,7 @@ describe Scopable do
       end
     end
 
-    context 'with one matching parameter' do
+    context 'with the parameter present' do
       subject :action do
         controller.new(nil, search: 'test')
       end
@@ -46,6 +46,16 @@ describe Scopable do
         expect(action.relation.scopes).to include(search: 'test')
       end
     end
+
+    context 'with the parameter present but blank' do
+      subject :action do
+        controller.new(nil, search: '')
+      end
+
+      it 'should skip the scope' do
+        expect(action.relation.scopes).to be_empty
+      end
+    end
   end
 
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopable
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Arthur Corenzan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +62,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 description: 
 email:
 - arthur@corenzan.com
@@ -79,7 +85,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - lib/scopable.rb
@@ -101,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="