scopable 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db1ac9caa504b39e2c3bd583a410c40cbe822c5a
-  data.tar.gz: a06474713343b047e5bd2b3004fe356a6c19d0f2
+  metadata.gz: 8489a22edabcb084113a419241d84225a8f054e4
+  data.tar.gz: 4ec1c76ec10aaa7fbd19f5394700d354489bb8e1
 SHA512:
-  metadata.gz: 8e90dc92efeed46a6def9c9ed3efe173e998f37618283d8fd2a2113eb2e1af6a7d74dbf65373e2a41b25817f68b6c3ca17f65296eb8b9e3a6bd498f4f633d4c8
-  data.tar.gz: f28f405579fe0e12c3dcde190e9fc3d1951e4ef1eb65277c9da13e054fa0b52e1fce7fc5efe4e11ee5037153434e54ee51a8d3e04885e19a125188482995f65d
+  metadata.gz: 12ccb068f7e55bafd9d517f8ae620e5dc6121c61950eb704699231510fc5abd9c88ac014bb3ce071f7557c89edad07f08efdd0c9a4bda5c3b8bf518aea36a12c
+  data.tar.gz: 82ca0836921ed85397ba15108e3e5bb0844926902b9f9e458cc066cef57e2b4836fe402e9bde69332311e072a3bfacd4acb68130b666303d6a23a0df1149c487

data/lib/scopable.rb

@@ -7,48 +7,48 @@ module Scopable
 
   def scoped(model, params)
     scopes.reduce(model) do |relation, scope|
-      name, scope = *scope
+      name, options = *scope
 
       # Controller actions where this scope should be applied.
       # Accepts either a literal value or a lambda. nil with disable the option.
-      only = scope[:only]
+      only = options[:only]
       only = instance_exec(&only) if only.respond_to?(:call)
 
       # Enfore :only option.
-      break relation unless only.nil? || Array.wrap(only).map(&:to_s).include?(action_name)
+      next relation unless only.nil? || Array.wrap(only).map(&:to_s).include?(action_name)
 
       # Controller actions where this scope should be ignored.
       # Accepts either a literal value or a lambda. nil with disable the option.
-      except = scope[:except]
+      except = options[:except]
       except = instance_exec(&except) if except.respond_to?(:call)
 
       # Enfore :except option.
-      break relation if except.present? && Array.wrap(except).map(&:to_s).include?(action_name)
+      next relation if except.present? && Array.wrap(except).map(&:to_s).include?(action_name)
 
       # Name of the request parameters which value will be used in this scope.
       # Defaults to the name of the scope.
-      param = scope.fetch(:param, name)
+      param = options.fetch(:param, name)
 
       # Use the value from the request parameter or fall back to the default.
       value = params[param]
 
       # If parameter is not present use the :default option.
       # Accepts either a literal value or a lambda.
-      value = scope[:default] if value.nil?
+      value = options[:default] if value.nil?
 
       # Forces the scope to use the given value given in the :force option.
       # Accepts either a literal value or a lambda.
-      value = scope[:force] if scope.key?(:force)
+      value = options[:force] if options.key?(:force)
 
       # If either :default or :force options were procs, evaluate them.
       value = instance_exec(&value) if value.respond_to?(:call)
 
       # The :required option makes sure there's a value present, otherwise return an empty scope (Model#none).
-      required = scope[:required]
+      required = options[:required]
       required = instance_exec(&required) if required.respond_to?(:call)
 
       # Enforce the :required option.
-      return relation.none if required && value.nil?
+      break relation.none if required && value.nil?
 
       # Parses values like 'on/off', 'true/false', and 'yes/no' to an actual boolean value.
       case value.to_s
@@ -61,10 +61,10 @@ 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.
-      block = scope[:block]
+      block = options[:block]
 
       if block.nil? && value.nil?
-        break relation
+        next relation
       end
 
       case

data/lib/scopable/version.rb

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

data/spec/scopable_spec.rb

@@ -51,43 +51,54 @@ describe Scopable do
   #
   # Test two optional scopes, with 0, 1, and 2 matching parameters.
   #
-  describe 'with two optional scope' do
+  describe 'with two optional scopes' do
     let :controller do
       Class.new(Controller) do
-        scope :search
-        scope :page
+        scope :color
+        scope :size
       end
     end
 
-    context 'with no matching parameters' do
+    context 'without parameters' do
       subject :action do
         controller.new
       end
 
-      it 'should skip the scope' do
+      it 'should skip the scopes' do
         expect(action.relation.scopes).to be_empty
       end
     end
 
-    context 'with one matching parameter' do
+    context 'with parameter matching the first scope' do
       subject :action do
-        controller.new(nil, search: 'test')
+        controller.new(nil, color: 'black')
       end
 
-      it 'should apply one of the scopes' do
+      it 'should apply only the first scope' do
         expect(action.relation.scopes.size).to eq(1)
-        expect(action.relation.scopes).to include(search: 'test')
+        expect(action.relation.scopes).to include(color: 'black')
+      end
+    end
+
+    context 'with parameter matching the second scope' do
+      subject :action do
+        controller.new(nil, size: 'm')
+      end
+
+      it 'should apply only the second scope' do
+        expect(action.relation.scopes.size).to eq(1)
+        expect(action.relation.scopes).to include(size: 'm')
       end
     end
 
-    context 'with two matching parameters' do
+    context 'with parameters matching both scopes' do
       subject :action do
-        controller.new(nil, search: 'test', page: 2)
+        controller.new(nil, size: 'm', color: 'black')
       end
 
       it 'should apply both scopes' do
         expect(action.relation.scopes.size).to eq(2)
-        expect(action.relation.scopes).to include(search: 'test', page: 2)
+        expect(action.relation.scopes).to include(size: 'm', color: 'black')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scopable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Arthur Corenzan
@@ -14,56 +14,56 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !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
   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'
 description: 
@@ -73,11 +73,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .codeclimate.yml
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".codeclimate.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -99,17 +99,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Apply or skip model scopes based on options and request parameters.