scopie 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39d4358a795eed7bb94f8b10f07fce8aac27e9d6
-  data.tar.gz: a016a71aa93ed9407397599b2a707fe83df9346f
+  metadata.gz: 8bee02f08df53a4ada09a728fbba17acddc3edab
+  data.tar.gz: d57901f26a3758979ac6da8b0e2d16c6752df7c3
 SHA512:
-  metadata.gz: 33709ce61f55381b29028f45181d870c6dd27cf9c757fb74986b772f642fa9af16e64d9b346565a741529191ac25f7dc6b0ac9abd67e04d3516cda0298ac048e
-  data.tar.gz: 24656a8c4825c1a0cf7e11e82e242348fea8e3aad961bb54f686e68d75e906b223f5068a4d35cba27b38ce3d977dde650ac2aa86f422b2b0334f6194a902033b
+  metadata.gz: 4420ad199466801d4af7f85b639c448d97231b2e0d86b4c445930a30a8a2ee8ed2a6c9efc56019cfe36778a33b233aa7f3c04dfdd40f0a0c702605b1a07f2018
+  data.tar.gz: 19cbd4bb3c08a6e9ea0723424658870ba8060838bb239c2de9f0dd217c0cdd370ace7c2958e56944b3e10637893495213a6ece618b7fb62d936ff75c48e713a7

data/README.md

@@ -147,6 +147,6 @@ Scopie supports several options:
 
 ## Thanks
 
-Scopie was inspired by [has_scope](http://github.com/plataformatec/has_scope) and [pundit](http://github.com/elabs/pubdit).
+Scopie was inspired by [has_scope](http://github.com/plataformatec/has_scope) and [pundit](http://github.com/elabs/pundit).
 
 Thanks to both.

data/lib/scopie/base.rb

@@ -69,7 +69,7 @@ class Scopie::Base
       value = scope_value(scope_name, options, hash)
       next unless scope_applicable?(value, options, method)
 
-      [scope_name, value.coerced]
+      [scope_name, value]
     end
 
     scopes.compact!
@@ -80,9 +80,11 @@ class Scopie::Base
 
   def apply_scope(scope_name, target, value, hash)
     result = if respond_to?(scope_name)
-               public_send(scope_name, target, value, hash)
+               public_send(scope_name, target, value.coerced, hash)
              else
-               target.public_send(scope_name, value)
+               args = [scope_name]
+               args << value.coerced if value.present? || value.allow_blank?
+               target.public_send(*args)
              end
 
     if Scopie::RESULTS_TO_IGNORE.include?(result)
@@ -109,7 +111,7 @@ class Scopie::Base
     return false unless method_applicable?(method, options)
     return false unless value.given?
 
-    value.present? || !!options[:allow_blank]
+    true
   end
 
   def reduced_hash(hash, options)

data/lib/scopie/value.rb

@@ -27,6 +27,10 @@ class Scopie::Value
     value.respond_to?(:empty?) ? !value.empty? : !!value
   end
 
+  def allow_blank?
+    @options[:allow_blank]
+  end
+
   private
 
   def fetch_type

data/lib/scopie/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Scopie
-  VERSION = '1.0.6'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scopie
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Yury Kotov