ragot 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c216474c3222f72271de2c6018be7b6b2332ca07
-  data.tar.gz: 6a429decec07ff3889b96d80769a14a90c23c1e0
+  metadata.gz: 99aa743259857da300cabe7e3598eeee6fda7a93
+  data.tar.gz: 324dba4e829981e7de9b213a283778165c9268dd
 SHA512:
-  metadata.gz: 7ce756577cd34a40b6be973a80323043c79be8cf57b7869d191385a59213bc63e1beb6ec3b0d670d074dfa2d14a0c6b1bb197c32430fbaa769ccd725c73c0d18
-  data.tar.gz: 7bbe3ff6aeed846184820acf7ebca8c8da956b422224ea200189ea3caa981a05562e132629f5464cd3b0823999012936376cb887e05ff09bb09db0fd8bc28489
+  metadata.gz: 195ebf5a2d7ed91abce895340bf795061905cdf4e74ae4293356c388750cd3af9840fc83fb302464216832439db39eca5b657c62f39c07d3cdedac312b930249
+  data.tar.gz: 7eebfcfcdcfef56ffa1e5f0775fbc75f876a78658a97d25f31f93e14476fc2599e1d59333a77c5934f9c79b349a03ed4f4889c3f775c8fda42d2082b41506e20

data/lib/ragot.rb

@@ -82,24 +82,28 @@ module Ragot
     def __incept_ragot(meth, blk, options)
       o = { hook: :after, failsafe: FAILSAFE[Ragot.env], env: Ragot.env }.merge(options)
       k = o[:class] ? @klass.singleton_class : @klass
-      @i[k][meth] ||= { before: [], after: [], stamp: [] }
+      f = (fp = o[:filter_params]) && o[:filter_params].is_a?(Proc) && o[:filter_params]
+      i ||= @i[k][meth] ||= { before: [], after: [], filter: nil, inherit: o[:inherit] }
 
       return unless Array(o[:env]).map(&:to_s).include? Ragot.env
       return unless (k.instance_methods + k.private_instance_methods).include? meth.to_sym
 
-      @i[k][meth][ :stamp ] << [ o[:failsafe], default_hook(meth, :before) ] if o[:stamp]
-      @i[k][meth][o[:hook]] << [ o[:failsafe], blk || default_hook(meth,  o[:hook]) ]
-      @i[k][meth][:alias] ||= redefine k, meth, @i[k][meth]
+      i[:alias] ||= redefine k, meth, @i[k][meth], self.class
+      i[:filter] = [ o[:failsafe], f || default_hook(i[:alias], nil, FILTER_HOOK) ] if fp
+      i[:before].unshift [ o[:failsafe], default_hook(meth, :before) ] if o[:stamp]
+      i[o[:hook]] << [ o[:failsafe], blk || default_hook(meth,  o[:hook]) ]
     end
 
-    def redefine(klass, meth, i)
-      klass.send :alias_method, "__ragot_inception_#{meth}", meth
+    def redefine(klass, meth, i, d)
+      klass.send :alias_method, orig = "__ragot_inception_#{meth}", meth
       klass.send :define_method, meth, ->(*_, &b) {
-        (i[:stamp] + i[:before]).each { |exe| Declaration.exec_hook self, *exe, *_ }
-        r = send "__ragot_inception_#{meth}", *_, &b
-        i[:after].each { |exe| Declaration.exec_hook self, *exe, r, *_ }
+        own =  i[:inherit] || self.class == klass || singleton_class == klass
+        own && (i[:before]).each { |exe| d.exec_hook self, *exe, *_ }
+        r = send i[:alias], *(i[:filter] && own ? d.exec_hook(self, *i[:filter], *_) : _), &b
+        own && i[:after].each { |exe| d.exec_hook self, *exe, r, *_ }
         r
       }
+      orig
     end
 
     MESSAGE = { before: "Entered %s, with params %s,%s at %s .%s",
@@ -112,8 +116,10 @@ module Ragot
       ragot_talk MESSAGE[hook] % [meth, _.to_s, result, *time]
     }
 
-    def default_hook(meth, hook)
-      ->(*_) { instance_exec hook, meth, _.shift, *_, &DEFAULT_HOOK }
+    FILTER_HOOK = ->(h, meth, *_) { _.shift method(meth).parameters.size }
+
+    def default_hook(meth, hook, exe=DEFAULT_HOOK)
+      ->(*_) { instance_exec hook, meth, _.shift, *_, &exe }
     end
 
   end

data/lib/ragot/version.rb

@@ -1,3 +1,3 @@
 module Ragot
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - lacravate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry