scopie 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4dc1d9c52050baf32e9de66d52508da37b2b6d2
-  data.tar.gz: 6c5abc0c7f5a27e0784db9607cb1e9331c757788
+  metadata.gz: 9763d1719a699707d18532d4dac445432d0dc72a
+  data.tar.gz: e07cd13548d2a8936bb148133db3e51b0e8f5922
 SHA512:
-  metadata.gz: 86efafe4d7843c496ce6dd6c1b6e13f5600184cec5773e4dd90f087f4edf61df0e1cebf94429f4adb5ee4af62b219e34f8609966ec963428a892383f39e191d1
-  data.tar.gz: ded02f636fa57c71e24bf0bdc70b17d9ceafa0f58d7f5372db265e1887430cbc9d5f785a3d65dad83fb6a23e46fc730fa0b55a1161d005689663b8bdf2d5bb10
+  metadata.gz: 3f920328cb50abe0e4131762311b0111a203b730c5ff40ae909e51b4f8a5265a5c51ee7516ec7be01cdb55249d52f55de49aac612a4b2c57ab3c84a7bcf1b1ee
+  data.tar.gz: 8fea91b733869caaa7b4940249a009c16fb73993253401728b84883d128f94123d1fbaec051ae5aa1ffe3c7edc52032a2b9997f0f621d320c4abe1dcb57fa382

data/lib/scopie/base.rb

@@ -7,6 +7,10 @@ class Scopie::Base
     instance_variable_get(:@scopes_configuration) || {}
   end
 
+  def scopes_configuration
+    self.class.scopes_configuration
+  end
+
   def self.has_scope(*scopes, **options)
     @scopes_configuration ||= {}
 
@@ -15,13 +19,28 @@ class Scopie::Base
     end
   end
 
-  def apply_scope(scope_name, options, target, hash, method = nil)
-    hash ||= {}
+  def apply_scopes(target, hash, method = nil)
+    current_scopes(hash, method).each do |scope_name, value|
+      target = apply_scope(scope_name, target, value, hash)
+    end
 
-    return target unless scope_applicable?(scope_name, options, hash, method)
+    target
+  end
 
-    value = scope_value(scope_name, options, hash)
+  def current_scopes(hash, method = nil)
+    scopes = scopes_configuration.map do |scope_name, options|
+      next unless scope_applicable?(scope_name, options, hash, method)
+      value = scope_value(scope_name, options, hash)
+      [scope_name, value]
+    end
 
+    scopes.compact!
+    scopes
+  end
+
+  private
+
+  def apply_scope(scope_name, target, value, hash)
     if respond_to?(scope_name)
       public_send(scope_name, target, value, hash)
     else
@@ -29,8 +48,6 @@ class Scopie::Base
     end
   end
 
-  private
-
   def key_name(scope_name, options)
     key_name = scope_name
     key_name = options[:as] if options.key?(:as)

data/lib/scopie/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Scopie
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/scopie.rb

@@ -5,11 +5,7 @@ module Scopie
   require 'scopie/base'
 
   def self.apply_scopes(target, hash, method: nil, scopie: Scopie::Base.new)
-    scopie.class.scopes_configuration.each do |scope_name, options|
-      target = scopie.apply_scope(scope_name, options, target, hash, method)
-    end
-
-    target
+    scopie.apply_scopes(target, hash, method)
   end
 
 end

metadata

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