pretender 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36cb9bc71fad9818f10c20ffe60bfc902cad923f
-  data.tar.gz: 228d7b9633467284d37e210369492f28069c97df
+  metadata.gz: fc80b6979512a9246224aa4d68f4dbda8b0c70f8
+  data.tar.gz: 71aadf8f167f0f0350f0c0c3b89743753fe8ef78
 SHA512:
-  metadata.gz: ad6b5a8dd18a8821a7ebb4798043e91caea257c403297d3d6df7ee1757c174567bc8d24a2c3650987c22beb90185172ebd4dec41476c9d87c7924870377ebae8
-  data.tar.gz: 0d4940d8440b364b9211d26f75e75e9b62d97229d0fc2e8fd2e4006639733d9481d6f832ae520ac2376b9e7bca327d5906287a1f973a42a0b616ddd9f0ac3631
+  metadata.gz: c6e774897e0fc2b2b7a4bb2044ce22c6ea32d6263d20cf9ab441dc5a7d83dc6b218fcce333b661076a06c669047ec951671aa9c47f0bdf30c6b833465e60e080
+  data.tar.gz: 503223df0e48c6afce6e0d830a28ffac72bf55965e0db6ac7d4c8a439ef422a46bad0bbce06a6cfaae560a540c2ded2788f5919c81eec9c3f91dc595f5d94abd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.1
+
+- Fixed `stack level too deep` error
+
 ## 0.3.0
 
 - Fixed compatibility with Clearance

data/lib/pretender/version.rb

@@ -1,3 +1,3 @@
 module Pretender
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/pretender.rb

@@ -4,55 +4,57 @@ require "active_support"
 module Pretender
   class Error < StandardError; end
 
-  def impersonates(scope = :user, opts = {})
-    impersonated_method = opts[:method] || :"current_#{scope}"
-    impersonate_with = opts[:with] || proc { |id|
-      klass = scope.to_s.classify.constantize
-      primary_key = klass.respond_to?(:primary_key) ? klass.primary_key : :id
-      klass.find_by(primary_key => id)
-    }
-    true_method = :"true_#{scope}"
-    session_key = :"impersonated_#{scope}_id"
-    impersonated_var = :"@impersonated_#{scope}"
+  module Methods
+    def impersonates(scope = :user, opts = {})
+      impersonated_method = opts[:method] || :"current_#{scope}"
+      impersonate_with = opts[:with] || proc { |id|
+        klass = scope.to_s.classify.constantize
+        primary_key = klass.respond_to?(:primary_key) ? klass.primary_key : :id
+        klass.find_by(primary_key => id)
+      }
+      true_method = :"true_#{scope}"
+      session_key = :"impersonated_#{scope}_id"
+      impersonated_var = :"@impersonated_#{scope}"
 
-    # define methods
-    if method_defined?(impersonated_method) || private_method_defined?(impersonated_method)
-      alias_method true_method, impersonated_method
-    else
-      define_method true_method do
-        # TODO handle private methods
-        superclass = self.class.superclass
-        raise Pretender::Error, "#{impersonated_method} must be defined before the impersonates method" unless superclass.method_defined?(impersonated_method)
-        superclass.instance_method(impersonated_method).bind(self).call
+      # define methods
+      if method_defined?(impersonated_method) || private_method_defined?(impersonated_method)
+        alias_method true_method, impersonated_method
+      else
+        sc = superclass
+        define_method true_method do
+          # TODO handle private methods
+          raise Pretender::Error, "#{impersonated_method} must be defined before the impersonates method" unless sc.method_defined?(impersonated_method)
+          sc.instance_method(impersonated_method).bind(self).call
+        end
       end
-    end
-    helper_method(true_method) if respond_to?(:helper_method)
+      helper_method(true_method) if respond_to?(:helper_method)
 
-    define_method impersonated_method do
-      unless instance_variable_get(impersonated_var)
-        # only fetch impersonation if user is logged in and impersonation_id exists
-        true_resource = send(true_method)
-        if session[session_key] && !true_resource
-          session[session_key] = nil
+      define_method impersonated_method do
+        unless instance_variable_get(impersonated_var)
+          # only fetch impersonation if user is logged in and impersonation_id exists
+          true_resource = send(true_method)
+          if session[session_key] && !true_resource
+            session[session_key] = nil
+          end
+          value = (session[session_key] && impersonate_with.call(session[session_key])) || true_resource
+          instance_variable_set(impersonated_var, value) if value
         end
-        value = (session[session_key] && impersonate_with.call(session[session_key])) || true_resource
-        instance_variable_set(impersonated_var, value) if value
+        instance_variable_get(impersonated_var)
       end
-      instance_variable_get(impersonated_var)
-    end
 
-    define_method :"impersonate_#{scope}" do |resource|
-      instance_variable_set(impersonated_var, resource)
-      session[session_key] = resource.id
-    end
+      define_method :"impersonate_#{scope}" do |resource|
+        instance_variable_set(impersonated_var, resource)
+        session[session_key] = resource.id
+      end
 
-    define_method :"stop_impersonating_#{scope}" do
-      instance_variable_set(impersonated_var, nil)
-      session[session_key] = nil
+      define_method :"stop_impersonating_#{scope}" do
+        instance_variable_set(impersonated_var, nil)
+        session[session_key] = nil
+      end
     end
   end
 end
 
 ActiveSupport.on_load(:action_controller) do
-  extend Pretender
+  extend Pretender::Methods
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pretender
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2017-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack