scopie 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e88a1e28002e7703b57a5af79c849b6be6025c0
-  data.tar.gz: df07ff4f5041d6287c94f772b4e40acf49954987
+  metadata.gz: 07a442d7fcafdca554a27f70362aa4e4cbc7009a
+  data.tar.gz: 831d1f902262956da4adab6441436c116136ad6d
 SHA512:
-  metadata.gz: 4c0b0ca8f6e5e55adc2e3515f8edd7d49df20ddd13340dc9cbf0c25c14f000c066a0980f63fc97ced2bb2fdbfb8e0e63494622b12d2426c06142687d99774126
-  data.tar.gz: 9864f9cdb067aa60ceccfe151254fee9a6854db4235cfc5b02efbffbfa53c93e9ef67b784d3f9dfecaa300fbac60bc768e5382b8a097001858bf6a94250ab1f0
+  metadata.gz: 34e66bf2569a688a1f59cbf14124fc7dac843969d9b7ad27777b0a3bf92b5e1cafcff6c060bef7ce13b2fd7e5047f39dd70e45e7191745d9c77083404700b4be
+  data.tar.gz: 1c269de633a5197d4a014750272ba284346347075443102aa57629be5775ea0a09c337d7c922a331ea62c263af13fa30b3ef9b8d688db8a257823f08110076c1

data/README.md

@@ -80,6 +80,8 @@ Scopie supports several options:
 
 * `:as` - The key in the params hash expected to find the scope. Defaults to the scope name.
 
+* `:in` - The key in the params hash expected to contain a hash holding scope name as a value.
+
 * `:default` - Default value for the scope. Whenever supplied the scope is always called.
 
 ## Thanks

data/lib/scopie/base.rb

@@ -57,7 +57,9 @@ class Scopie::Base
 
   def scope_value(scope_name, options, hash)
     key_name = key_name(scope_name, options)
-    return coerce_value_type(hash[key_name], options[:type]) if hash.key?(key_name)
+    reduced_hash = reduced_hash(hash, options)
+
+    return coerce_value_type(reduced_hash[key_name], options[:type]) if reduced_hash.key?(key_name)
     options[:default]
   end
 
@@ -71,16 +73,27 @@ class Scopie::Base
   end
 
   def scope_applicable?(scope_name, options, hash, method)
+    return false unless method_applicable?(method, options)
+
+    key_name = key_name(scope_name, options)
+    reduced_hash(hash, options).key?(key_name) || options.key?(:default)
+  end
+
+  def reduced_hash(hash, options)
+    return hash unless options.key?(:in)
+    hash.fetch(options[:in], {})
+  end
+
+  def method_applicable?(method, options)
+    return true unless method
+
     methods_white_list = Array(options[:only])
     methods_black_list = Array(options[:except])
 
-    if method
-      return false if methods_black_list.include?(method)
-      return false if methods_white_list.any? && !methods_white_list.include?(method)
-    end
+    return false if methods_black_list.include?(method)
+    return false if methods_white_list.any? && !methods_white_list.include?(method)
 
-    key_name = key_name(scope_name, options)
-    hash.key?(key_name) || options.key?(:default)
+    true
   end
 
   def self.reset_scopes_configuration!

data/lib/scopie/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopie
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Yury Kotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec