cpt_hook 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74f93a1da89cc4dc1b52ea059d17a148432734ae
-  data.tar.gz: 9e73cecbe75bf44df3b5e2c18490741d83c66b87
+  metadata.gz: 290b3737b4f793c6e0195069dd2619371151acb3
+  data.tar.gz: f3acdb2a5c73e36241291f692a3ffa947c066c00
 SHA512:
-  metadata.gz: '092e9dbbcd208b37cc42779ad2f6b2cc3f8fe613fae038acaaa13c4e2e9793281ceefdc2a12e098ad177af3d9049d8b1c88db5bcd5c9a01ef6ed44b925427597'
-  data.tar.gz: 235607f27dda02ec5777496e9f65c1d934bb2a59ea39d98a072e3fea541f025a699067c1e7cab5399bee998daeb334b90c712538b890cfbcffc47359fee1d5d3
+  metadata.gz: f23f687885beeed890c16b38251b6a6e3d1facca64c687607dd1784a40544c0f26634b89cf769bf66cf768ae08e51ca0e5e1243c1f05ba1a7cd9c878cc57b95a
+  data.tar.gz: 1961025f695ae8c109d83f1e973d6cc15f7c7b364b3941a7c2901c5cc5f0a9aa8fca325222b7dc0cb3b704893744651563f13978a28793dff865f05171cd1bfd

data/bin/console

@@ -2,13 +2,58 @@
 
 require "bundler/setup"
 require "cpt_hook"
+require "pry"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+my_hooks = CptHook.define_hooks do
+  # Simple case call one fn with args
+  before(:some_fn).call(:my_hook).with(:var1, :var2)
 
-require "irb"
-IRB.start(__FILE__)
+  # Complex case, add multiple calls to the fn block style
+  after(:some_other_fn) do
+    call(:my_other_hook).with(:var3, :var4)
+    call(:yet_another_hook)
+    call( lambda { | hooked_obj | hooked_obj.some_fn }).with(:self)
+  end
+
+  # Complex case, add multiple calls to the fn fluent style
+  before(:some_other_fn).call(:my_other_hook).with(:var3, :var4)
+                        .call(:yet_another_hook)
+                        .call( lambda { | hooked_obj | hooked_obj.some_fn }).with(:self)
+
+end
+
+
+class ResTest
+  def ext_res_fn
+    puts 'Resolved external context'
+  end
+end
+
+class TestClass
+  def res_fn
+    puts 'Resolved internal context'
+  end
+
+  def test_fn
+    puts 'test_fn'
+  end
+end
+
+external_context = ResTest.new
+
+c = TestClass.new
+
+test_hooks = CptHook.define_hooks do
+  before(:test_fn).call(:res_fn)
+end
+
+test_hooks2 = CptHook.define_hooks do
+  before(:test_fn).call(:res_fn).call(:ext_res_fn).using( lambda { return external_context })
+end
+
+hooked = CptHook::Hookable.new(c, test_hooks.merge!(test_hooks2))
+hooked.test_fn
+binding.pry
+
+puts 'Console exiting'  # This is just to ensure a line exists below the pry

data/cpt_hook.gemspec

@@ -23,4 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'pry-stack_explorer'
 end

data/lib/cpt_hook/dsl/hook_definition.rb

@@ -0,0 +1,42 @@
+module CptHook
+
+  module DSL
+
+    class HookDefinition
+      attr_reader :method, :hook_type, :call_chain
+
+      def initialize(method_to_hook, type)
+        @method     = method_to_hook
+        @hook_type  = type
+        @call_chain = []
+      end
+
+      def call(method_to_call)
+        @call_chain << MethodCall.new(method_to_call)
+        self
+      end
+
+      def with(*args)
+        @call_chain.last.with(*args)
+        self
+      end
+
+      def using(*args)
+        @call_chain.last.using(*args)
+        self
+      end
+
+      def contexts(*args)
+        @call_chain.last.contexts(*args)
+        self
+      end
+
+      def merge!(other)
+        other.call_chain.each do |cc|
+          @call_chain << cc unless @call_chain.any? { |c| c.method == cc.method }
+        end
+        self
+      end
+    end
+  end
+end

data/lib/cpt_hook/dsl/hook_definitions.rb

@@ -0,0 +1,47 @@
+module CptHook
+  module DSL
+    class HookDefinitions
+
+      def initialize
+        @hooks = []
+      end
+
+      def hooks(hook_type = nil)
+        hook_type.nil? ? @hooks : @hooks.select { |h| h.hook_type == hook_type }
+      end
+
+      def hooked_methods
+        @hooks.map { |h| h.method }.uniq
+      end
+
+      def before(method_to_hook, &block)
+        _hook_definition(method_to_hook, :before, &block)
+      end
+
+      def after(method_to_hook, &block)
+        _hook_definition(method_to_hook, :after, &block)
+      end
+
+      def merge!(other)
+        other.hooks.each do |hook|
+          my_hook = @hooks.find { |h| (h.method == hook.method) && (h.hook_type == hook.hook_type) }
+          if my_hook
+            my_hook.merge!(hook)
+          else
+            @hooks << hook
+          end
+        end
+        self
+      end
+
+      private
+
+      def _hook_definition(method_to_hook, hook_type, &block)
+        hook_def = HookDefinition.new(method_to_hook, hook_type)
+        @hooks << hook_def
+        hook_def.instance_eval(&block) if block_given?
+        hook_def
+      end
+    end
+  end
+end

data/lib/cpt_hook/dsl/method_call.rb

@@ -0,0 +1,21 @@
+module CptHook
+  module DSL
+    class MethodCall
+      attr_reader :method, :with, :contexts
+
+      def initialize(method_to_call)
+        @method = method_to_call
+        @contexts = []
+        @with = []
+      end
+
+      def with(*args)
+        @with = args
+      end
+
+      def using(*args)
+        @contexts = args
+      end
+    end
+  end
+end

data/lib/cpt_hook/dsl.rb

@@ -0,0 +1,3 @@
+require 'cpt_hook/dsl/method_call'
+require 'cpt_hook/dsl/hook_definition'
+require 'cpt_hook/dsl/hook_definitions'

data/lib/cpt_hook/hookable.rb

@@ -13,10 +13,9 @@ module CptHook
       _add_hooks(:before, method_hooks, additional_contexts)
       _add_hooks(:after, method_hooks, additional_contexts)
 
-      method_hooks.map {|h| h[:before] || h[:after]}.uniq.each do |method|
+      method_hooks.hooked_methods.each do |method|
         define_singleton_method(method) do |*args, &block|
           self.send("before_#{method}") if self.respond_to? "before_#{method}"
-          #val = __getobj__.send(method, *args, &block)
           val = super(*args, &block)
           self.send("after_#{method}") if self.respond_to? "after_#{method}"
           val
@@ -31,19 +30,18 @@ module CptHook
     private
 
     def _add_hooks(which, method_hooks, additional_contexts)
-      method_hooks.select {|hook| hook.key?(which)}.each do |hook|
-        hook[:contexts] = hook.fetch(:contexts, []).concat(additional_contexts)
-        define_singleton_method("#{which}_#{hook[which]}") do |*args, &block|
-          hook[:call_chain].each do |call_chain|
-            call_args = call_chain.fetch(:with, []).map { |ca| ca == :self ? self : ca }
-            
-            hook_fn = call_chain[:call]
-            if hook_fn.is_a?(Proc)
-              hook_fn.call(*call_args)
+      method_hooks.hooks(which).each do |hook|
+        define_singleton_method("#{which}_#{hook.method}") do |*args, &block|
+          hook.call_chain.each do |call_chain|
+            call_args = call_chain.with.map { |ca| ca == :self ? self : ca }
+            if call_chain.method.is_a?(Proc)
+              call_chain.method.call(*call_args)
             else
-              context = hook[:contexts].unshift(__getobj__).find {|c| c.respond_to?(hook_fn)}
-              raise "No context found for #{which} hook: #{hook_fn}" unless context
-              context.send(hook_fn, *call_args)
+              contexts = call_chain.contexts.concat(additional_contexts).unshift(__getobj__)
+              contexts.map!{ |c| c.is_a?(Proc) ? c.call : c }
+              context = contexts.find {|c| c.respond_to?(call_chain.method)}
+              raise "No context found for #{which} hook: #{call_chain.method}" unless context
+              context.send(call_chain.method, *call_args)
             end
           end
         end

data/lib/cpt_hook/version.rb

@@ -1,3 +1,3 @@
 module CptHook
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/cpt_hook.rb

@@ -1,6 +1,10 @@
 require 'cpt_hook/version'
 require 'cpt_hook/hookable'
-
+require 'cpt_hook/dsl'
 module CptHook
-  # Your code goes here...
+  def self.define_hooks(&block)
+    dsl = DSL::HookDefinitions.new
+    dsl.instance_eval(&block) if block_given?
+    dsl
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpt_hook
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - JDonavan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - donavan.stanley@gmail.com
@@ -78,6 +120,10 @@ files:
 - bin/setup
 - cpt_hook.gemspec
 - lib/cpt_hook.rb
+- lib/cpt_hook/dsl.rb
+- lib/cpt_hook/dsl/hook_definition.rb
+- lib/cpt_hook/dsl/hook_definitions.rb
+- lib/cpt_hook/dsl/method_call.rb
 - lib/cpt_hook/hookable.rb
 - lib/cpt_hook/version.rb
 homepage: https://github.com/Donavan/cpt_hook