flex-scopes 1.0.5 → 1.0.6

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/flex/scope.rb

@@ -15,14 +15,16 @@ module Flex
     end
 
     def respond_to?(meth, private=false)
-      super || is_template?(meth) || is_scope?(meth)
+      super || is_template?(meth) || is_context_scope?(meth) || is_self_scope?(meth)
     end
 
     def method_missing(meth, *args, &block)
       super unless respond_to?(meth)
       case
-      when is_scope?(meth)
+      when is_context_scope?(meth)
         deep_merge self[:context].send(meth, *args, &block)
+      when is_self_scope?(meth)
+        deep_merge self[:self_context].send(meth, *args, &block)
       when is_template?(meth)
         self[:context].send(meth, deep_merge(*args), &block)
       end
@@ -34,9 +36,14 @@ module Flex
       self[:context].respond_to?(:template_methods) && self[:context].template_methods.include?(name.to_sym)
     end
 
-    def is_scope?(name)
+    def is_context_scope?(name)
       self[:context].respond_to?(:scope_methods) && self[:context].scope_methods.include?(name.to_sym)
     end
 
+    # only used for AR scopes, when you namespace the scope module
+    def is_self_scope?(name)
+      self[:self_context].respond_to?(:scope_methods) && self[:self_context].scope_methods.include?(name.to_sym)
+    end
+
   end
 end

data/lib/flex/scopes.rb

@@ -41,7 +41,7 @@ module Flex
 
       # You can start with a non restricted Flex::Scope object
       def scoped
-        @scoped ||= Scope[:context => flex.context]
+        @scoped ||= Scope[:context => flex.context, :self_context => self]
       end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flex-scopes
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flex
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
 description: Provides an easy to use ruby API to search elasticsearch with ActiveRecord-like
   chainable and mergeables scopes.
 email: dd.nexus@gmail.com