scopie 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bee02f08df53a4ada09a728fbba17acddc3edab
-  data.tar.gz: d57901f26a3758979ac6da8b0e2d16c6752df7c3
+  metadata.gz: 8624fb23637f827341df103cd643fdb673b72243
+  data.tar.gz: 2d5ee0f01a32c144a1cbe999953d014a9c284181
 SHA512:
-  metadata.gz: 4420ad199466801d4af7f85b639c448d97231b2e0d86b4c445930a30a8a2ee8ed2a6c9efc56019cfe36778a33b233aa7f3c04dfdd40f0a0c702605b1a07f2018
-  data.tar.gz: 19cbd4bb3c08a6e9ea0723424658870ba8060838bb239c2de9f0dd217c0cdd370ace7c2958e56944b3e10637893495213a6ece618b7fb62d936ff75c48e713a7
+  metadata.gz: 4c68743f9a944c1ca51ee5d84aafa5b6da7468cab63560a9e0956f6cb91df2687c721bfedf73ebde4cd4c2bad3a35083299cc31ea1920e4585c19c143ae8fbe0
+  data.tar.gz: e9c308c5a4646ec94437587dd97063ec6d8b512ab709728da6bd40dbacff63185d350abbbb335d5528d9d6ab556dedaf65f3735d524f065b1edc00abae9c46dd

data/lib/scopie/base.rb

@@ -57,7 +57,7 @@ class Scopie::Base
   end
 
   def apply_scopes(target, hash, method = nil)
-    current_scopes(hash, method).each do |scope_name, value|
+    current_scopes_values(hash, method).each do |scope_name, value|
       target = apply_scope(scope_name, target, value, hash)
     end
 
@@ -65,6 +65,15 @@ class Scopie::Base
   end
 
   def current_scopes(hash, method = nil)
+    hsh = current_scopes_values(hash, method)
+    hsh.update(hsh) do |_, value|
+      value.coerced
+    end
+  end
+
+  private
+
+  def current_scopes_values(hash, method)
     scopes = scopes_configuration.map do |scope_name, options|
       value = scope_value(scope_name, options, hash)
       next unless scope_applicable?(value, options, method)
@@ -76,8 +85,6 @@ class Scopie::Base
     scopes.to_h
   end
 
-  private
-
   def apply_scope(scope_name, target, value, hash)
     result = if respond_to?(scope_name)
                public_send(scope_name, target, value.coerced, hash)

data/lib/scopie/version.rb

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

metadata

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