interloper 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36d127b88f17a8225278ae3b5ad85bd5e2527dfa
-  data.tar.gz: aa9558b14180c9116da68f1f043fb7cba20e1a19
+  metadata.gz: 5cb36dfc9e08e0e172e7ac3f0de7bd0c34f46a93
+  data.tar.gz: f29ca06378acd3da798d29772e2db4c2b4ce5e84
 SHA512:
-  metadata.gz: 85dd025740b1013c4825c9142110f9812fd335dcc038a93ef38e830c727279b01132362180d35e46b4313bbd6e02d18970397147a9d5b3a26c109e1634abd713
-  data.tar.gz: 41ab9cee231c8c7271d73c3173b56759876e7d66facbfdc918e4b26f995186407923a3d27155a375d4c3e5a4885a79aeb4d225c7c40c780314b6d51fe33e3d2c
+  metadata.gz: 936220a5ed55ef83bc124bf30a27bad78f6dbc9acd0e1fe4f1e3b56a5e52b0f170a6537823fb3a762257e3e084547d044cceada31d2612874c913ea3a66324c0
+  data.tar.gz: 1d8b52e6d03765526b8b36ea1af14176e21c1d7424b8484ecf98870f251324dba4fa2dd768e9fc9db6d7fcf338681f6d8cd78ebb5acb5640359ba55bc94db920

data/lib/interloper/version.rb

@@ -1,3 +1,3 @@
 module Interloper
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/interloper.rb

@@ -3,7 +3,7 @@ require "interloper/version"
 module Interloper
 
   def interloper_module
-    self.class.interloper_module
+    @interloper_module ||= self.class.interloper_module
   end
 
   def Interloper.included(base)
@@ -12,17 +12,25 @@ module Interloper
 
   module ClassMethods
 
-    # Generates an Interloper module that is namespeced under the including
+    def interloper_const_name
+      if self.name
+        "#{self.name}Interloper"
+      else
+        "AnonymousInterloper#{self.object_id}"
+      end.to_sym
+    end
+
+    # Generates an Interloper module that is namespaced under the including
     # class, if one does not already exist. Then prepends the Interloper
     # module to the including class.
     # @return Module the Interloper module that was prepended to the including
     #   class.
     def interloper_module
-      # Create the Interloper module if it doesn't exist already
-      const_set(:Interloper, generate_interloper_module) unless self.constants.include? :Interloper
-      # Prepend the interloper module
-      prepend const_get(:Interloper)
-      const_get(:Interloper)
+      unless self.constants.include? interloper_const_name
+        const_set(interloper_const_name, generate_interloper_module)
+        prepend const_get(interloper_const_name)
+      end
+      const_get(interloper_const_name)
     end
 
     def generate_interloper_module
@@ -77,14 +85,18 @@ module Interloper
             end
           end
 
-          def define_interloper_methods(*method_names)
+          def define_interloper_methods(*method_names, interloper_module_name)
             method_names.each do |method_name|
-              define_method(method_name) do |*args, &block|
-                called_method = __method__
-                interloper_module.run_callbacks(:before, called_method, self, *args, &block)
-                return_val = super(*args,&block)
-                interloper_module.run_callbacks(:after, called_method, self, *args, &block)
-                return_val
+              unless instance_methods.include? method_name
+                module_eval do
+                  eval <<-CODE
+                    def #{method_name}(*args, &block)
+                      self.class.const_get(:#{interloper_module_name}).run_callbacks(:before, :#{method_name}, self, *args, &block)
+                      super(*args, &block)
+                      self.class.const_get(:#{interloper_module_name}).run_callbacks(:after, :#{method_name}, self, *args, &block)
+                    end
+                  CODE
+                end
               end
             end
           end
@@ -93,12 +105,12 @@ module Interloper
     end
 
     def before(*method_names, &callback)
-      interloper_module.define_interloper_methods(*method_names)
+      interloper_module.define_interloper_methods(*method_names, interloper_const_name)
       interloper_module.add_callbacks(:before, *method_names, &callback)
     end
 
     def after(*method_names, &callback)
-      interloper_module.define_interloper_methods(*method_names)
+      interloper_module.define_interloper_methods(*method_names, interloper_const_name)
       interloper_module.add_callbacks(:after, *method_names, &callback)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interloper
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Myers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-22 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler