execution_deadline 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab73aac3e9d983dcbeae9b4ecfee3260588c84a73bc5371168f49702e54f9f01
-  data.tar.gz: f9b60401c580d89763e9e56be22494169d8706056b4b0a8300fb482b3c9f4390
+  metadata.gz: 982f5c8deaa2d7dd9cfec996423887315caeeda3e3933ef0ec0eb8bfdce7676f
+  data.tar.gz: c2b2e6b4d63b8ad17c6ddf06fec10c791db4f883f7a4befef14ea738e6dacc74
 SHA512:
-  metadata.gz: 877beba2aab5d7e4098dd574cd5fd1fa8a666e01263657c20bf90ef2a5c6a6505d1404ff82404e3e614296e91283a7b8afdd4e94d9aff4aa6630d00b1015f5ff
-  data.tar.gz: 40a4e52623b308287683dbe5a58901bd252ba2ed13ac0e5c11259abf91353231e1d32a761e9cb783e1a0ca5bae0a07bc9cdcf5bcc3a0e1942aeafc44b66cc0af
+  metadata.gz: 541f8a0246f5ede73be6ffb85b20c3787e983a5e22f5b96eafd91b939184bd00e032f2150d37208c281e8cc090c2de2b1ba43d8503c71f75387b1b99915816b8
+  data.tar.gz: 3a73e2da652259b95eae09ceaa393dfa3167f1123cd86a23d1cd757b6dc613d64a115ca92facbfc7b2edff73a637d4fd60ebd13fa9d2ae5d0977d4a80d3d6640

data/lib/execution_deadline.rb

@@ -20,4 +20,12 @@ module ExecutionDeadline
     !current_deadline &&
       Thread.current[:deadline] = Deadline.new(expires_at: expires_at, raises: raises)
   end
+
+  def self.extended(other)
+    other.extend(Helpers)
+  end
+
+  def self.included(other)
+    other.extend(Helpers)
+  end
 end

data/lib/execution_deadline/deadliner.rb

@@ -0,0 +1,35 @@
+module ExecutionDeadline
+  module Deadliner
+    WRAPPED_METHOD = Proc.new do |options|
+      Proc.new do |*args, **kwargs, &blk|
+        set_deadline = options[:in]  && ExecutionDeadline.set_deadline(
+          expires_at: Time.now + options[:in],
+          raises: options[:raises]
+        )
+
+        ExecutionDeadline.current_deadline&.require_seconds_left!(options[:runs_for]) if options[:runs_for]
+        super(*args, **kwargs, &blk).tap do
+          ExecutionDeadline.current_deadline&.check_deadline_expiration!
+        end
+      ensure
+        ExecutionDeadline.clear_deadline! if set_deadline
+      end
+    end
+
+    def inspect
+      "ExecutionDeadline::#{@_execution_deadline_built_for}Proxy"
+    end
+
+    def _execution_deadline_built_for
+      @_execution_deadline_built_for
+    end
+
+    def _execution_deadline_built_for=(val)
+      @_execution_deadline_built_for = val
+    end
+
+    def wrap_implementation(method_name, config)
+      define_method(method_name, &WRAPPED_METHOD.call(config))
+    end
+  end
+end

data/lib/execution_deadline/helpers.rb

@@ -2,26 +2,10 @@
 
 require 'execution_deadline/version'
 require 'execution_deadline/deadline'
+require 'execution_deadline/method_proxy'
 
 module ExecutionDeadline
   module Helpers
-    UNWRAPPED_METHOD_NAME_SUFFIX = "_without_deadline"
-    WRAPPED_METHOD = Proc.new do |options|
-      Proc.new do |*args, &blk|
-        set_deadline = options[:in]  && ExecutionDeadline.set_deadline(
-          expires_at: Time.now + options[:in],
-          raises: options[:raises]
-        )
-
-        ExecutionDeadline.current_deadline&.require_seconds_left!(options[:runs_for]) if options[:runs_for]
-        send(options[:aliased_method_name], *args, &blk).tap do
-          ExecutionDeadline.current_deadline&.check_deadline_expiration!
-        end
-      ensure
-        ExecutionDeadline.clear_deadline! if set_deadline
-      end
-    end
-
     def deadline(options = {})
       options[:in] ||
         options[:runs_for] ||
@@ -31,28 +15,25 @@ module ExecutionDeadline
     end
 
     def method_added(method_name)
-      return super unless _has_deadline_config?
+      super
 
-      options = _fetch_and_reset_deadline_config
-      options[:aliased_method_name] ||= "_#{method_name}#{UNWRAPPED_METHOD_NAME_SUFFIX}".to_sym
+      return unless _has_deadline_config?
 
-      alias_method options[:aliased_method_name], method_name
+      ExecutionDeadline::MethodProxy
+        .for_class(self)
+        .wrap_implementation(method_name, _fetch_and_reset_deadline_config)
 
-      define_method(method_name, &WRAPPED_METHOD.call(options))
+      super
     end
 
     def singleton_method_added(method_name)
-      return super unless _has_deadline_config?
-
-      options = _fetch_and_reset_deadline_config
+      super
 
-      options[:aliased_method_name] ||= "_#{method_name}#{UNWRAPPED_METHOD_NAME_SUFFIX}".to_sym
+      return unless _has_deadline_config?
 
-      singleton_class.class_eval do
-        alias_method options[:aliased_method_name], method_name
-      end
-
-      define_singleton_method(method_name, &WRAPPED_METHOD.call(options))
+      ExecutionDeadline::MethodProxy
+        .for_class(singleton_class)
+        .wrap_implementation(method_name, _fetch_and_reset_deadline_config)
     end
 
     private
@@ -64,9 +45,5 @@ module ExecutionDeadline
     def _fetch_and_reset_deadline_config
       @last_deadline_config.tap { @last_deadline_config = nil }
     end
-
-    def _add_deadlined_method(method_name, options)
-    end
-
   end
 end

data/lib/execution_deadline/method_proxy.rb

@@ -0,0 +1,28 @@
+require 'execution_deadline/deadliner'
+
+module ExecutionDeadline
+  module MethodProxy
+    def self.for_class(klass)
+      find_for_class(klass) || install_on_class(klass)
+    end
+
+    def self.find_for_class(klass)
+      klass.ancestors.detect do |a|
+        a.is_a?(Deadliner) &&
+          a._execution_deadline_built_for == klass
+      end
+    end
+
+    def self.install_on_class(klass)
+      construct_for_class(klass).tap do |m|
+        klass.prepend(m)
+      end
+    end
+
+    def self.construct_for_class(klass)
+      Module.new do
+        extend Deadliner
+      end.tap { |m| m._execution_deadline_built_for = klass }
+    end
+  end
+end

data/lib/execution_deadline/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExecutionDeadline
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: execution_deadline
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Malinconico
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,8 +72,10 @@ files:
 - execution_deadline.gemspec
 - lib/execution_deadline.rb
 - lib/execution_deadline/deadline.rb
+- lib/execution_deadline/deadliner.rb
 - lib/execution_deadline/errors.rb
 - lib/execution_deadline/helpers.rb
+- lib/execution_deadline/method_proxy.rb
 - lib/execution_deadline/version.rb
 homepage: https://github.com/arjes/execution_deadline
 licenses: