rinterceptor 0.1.0 → 0.2.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+Changes in version 0.2.0 (2009-03-9)
+-------------------------------------
+refactory about class
+
 Changes in version 0.1.0 (2009-03-9)
 -------------------------------------
 initial release

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake/gempackagetask'
 PKG_NAME = "rinterceptor"
-PKG_VERSION = "0.1.0"
+PKG_VERSION = "0.2.0"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/rinterceptor.rb

@@ -21,6 +21,7 @@ end
 #you can refer to example_rinterceptor.rb
 =end
 #TODO nested interceptor
+require 'rinterceptor_helper'
 module Rinterceptor
   def self.included(base)
     raise 'Class can not include me directly, only accept Module to include me' if base.is_a?(Class)
@@ -56,12 +57,12 @@ module Rinterceptor
         base.ancestors[1..-1].reverse.each {|p| base.extend(p::ClassMethods) if p.respond_to?(:rinter_here?)}
         include_s_methods = base.include_s_methods || []
         include_i_methods = base.include_i_methods || []
-        include_s_methods = RinterceptorUtil.process_include_methods(include_s_methods)
-        include_i_methods = RinterceptorUtil.process_include_methods(include_i_methods)
+        include_s_methods = RinterceptorHelper.process_include_methods(include_s_methods)
+        include_i_methods = RinterceptorHelper.process_include_methods(include_i_methods)
         exclude_s_methods = (base.exclude_s_methods || []) + [/^rinter_/, /include_[is]_methods/, /exclude_[is]_methods/]
         exclude_i_methods = (base.exclude_i_methods || []) + [/^rinter_/, /include_[is]_methods/, /exclude_[is]_methods/]
-        s_methods = (base.private_methods + base.singleton_methods).delete_if{|m| ! RinterceptorUtil.match_method?(m, include_s_methods, exclude_s_methods) }
-        i_methods = (base.private_instance_methods + base.instance_methods).delete_if{|m| ! RinterceptorUtil.match_method?(m, include_i_methods, exclude_i_methods) }
+        s_methods = (base.private_methods + base.singleton_methods).delete_if{|m| ! RinterceptorHelper.match_method?(m, include_s_methods, exclude_s_methods) }
+        i_methods = (base.private_instance_methods + base.instance_methods).delete_if{|m| ! RinterceptorHelper.match_method?(m, include_i_methods, exclude_i_methods) }
         s_methods.each{|m| rinter_generate_proxy(base, m, include_s_methods.is_a?(Hash) ? include_s_methods : nil, true)}
         i_methods.each{|m| rinter_generate_proxy(base, m, include_i_methods.is_a?(Hash) ? include_i_methods : nil)}
         rinter_after_include_class(base)  #only available in last module for preparing data of Class which will include it
@@ -88,6 +89,7 @@ module Rinterceptor
         end
         obj.class_eval %{
         #{"class << self" if singleton}
+        require "rinterceptor_invocation"
         alias_method :old4rinter_#{method}, :#{method} unless method_defined?(:old4rinter_#{method})
         def #{method}(*args)
           return old4rinter_#{method}(*args) if rinter_skip?
@@ -133,46 +135,3 @@ module Rinterceptor
       end
     end
   end
-  
-  module RinterceptorUtil
-    def self.match_method?(method, includes, excludes)
-      excludes.each {|i| return false if method =~ i}
-      real_includes = includes.is_a?(Array) ? includes : [] 
-      if includes.is_a?(Hash)
-        includes.each{|k, v| real_includes += v}
-      end
-      real_includes.each {|i| return true if method =~ i}
-      false
-    end
-    def self.process_include_methods(methods)
-      if methods.is_a?(Hash)
-        methods.each do |k, v|
-          if v.is_a?(String) || v.is_a?(Symbol)
-            v = Regexp.new("^#{v}$")
-          elsif v.is_a?(Array)
-            v.each_index{|i| v[i] = Regexp.new("^#{v[i]}$") if v[i].is_a?(String) || v[i].is_a?(Symbol)}
-          end
-          v = [v] if v.is_a?(Regexp)
-          methods[k] = v
-        end
-      end
-      methods
-    end
-  end
-  
-  class RinterceptorInvocation
-    attr_accessor :object, :method, :args, :options
-    def initialize(object, method, *args)
-      @object = object
-      @method = method
-      @args = args
-      @options = {}
-    end
-    def invoke(*args)
-      unless @options.nil? || @options.empty?
-        @args = @args + [@options]
-        @options = nil
-      end
-      @object.send("old4rinter_#{@method}".to_sym, *(args.empty? ? @args : args))
-    end
-  end

data/lib/{example_rinterceptor.rb → rinterceptor_example.rb}

@@ -1,46 +1,46 @@
 #!/usr/bin/env ruby
 require 'rinterceptor'
-module ExampleRinterceptor
+module RinterceptorExample
   def rinter_before(method, *args)
-    p "instance before -- method: #{method}, args: #{args} in ExampleRinterceptor"
+    p "instance before -- method: #{method}, args: #{args} in RinterceptorExample"
   end
-  def rinter_after(method, result, e, *args)
-    p "instance after -- method: #{method}, result: #{result}, e: #{e}, args: #{args} in ExampleRinterceptor"
+  def rinter_after(method, result, exception, *args)
+    p "instance after -- method: #{method}, result: #{result}, exception: #{exception}, args: #{args} in RinterceptorExample"
     result
   end
 
   module ClassMethods
     def rinter_before(method, *args)
-      p "singleton before -- method: #{method}, args: #{args} in ExampleRinterceptor"
+      p "singleton before -- method: #{method}, args: #{args} in RinterceptorExample"
     end
-    def rinter_after(method, result, e, *args)
-      p "singleton after -- method: #{method}, result: #{result}, e: #{e}, args: #{args} in ExampleRinterceptor"
+    def rinter_after(method, result, exception, *args)
+      p "singleton after -- method: #{method}, result: #{result}, exception: #{exception}, args: #{args} in RinterceptorExample"
     end
   end
   include Rinterceptor
 end
 
-module SubExampleRinterceptor
+module SubRinterceptorExample
   def self.rinter_before_include_class(base)
-    p "before_include_class in SubExampleRinterceptor"
+    p "before_include_class in SubRinterceptorExample"
     #set interceptor rules of instance methods, the variable can also be defined in class before include this module 
     base.instance_variable_set(:@include_i_methods, {nil => [/^i2_/, /^i3_/], :handler_it => /^i1_/})
   end
   def self.rinter_after_include_class(base)
-    p "after_include_class in SubExampleRinterceptor"
+    p "after_include_class in SubRinterceptorExample"
   end
   def rinter_handler_it_around(invocation)
-    p "instance handler_it around begin -- method: #{invocation.method}, args: #{invocation.args} in SubExampleRinterceptor"
+    p "instance handler_it around begin -- method: #{invocation.method}, args: #{invocation.args} in SubRinterceptorExample"
     result = invocation.invoke("inter", "ddddd")
-    p "instance handler_it around end -- method: #{invocation.method}, args: #{invocation.args} in SubExampleRinterceptor"
+    p "instance handler_it around end -- method: #{invocation.method}, args: #{invocation.args} in SubRinterceptorExample"
     result
   end
   module ClassMethods
     def rinter_before(method, *args)
-      p "singleton before -- method: #{method}, args: #{args}  in SubExampleRinterceptor"
+      p "singleton before -- method: #{method}, args: #{args}  in SubRinterceptorExample"
     end
   end
-  include ExampleRinterceptor
+  include RinterceptorExample
 end
 
 
@@ -60,20 +60,23 @@ class TestRinterceptor
   def self.s_test(x, y)
     p "s_test x:#{x} y:#{y}"
   end
-  #set interceptor rules of singleton methods, an alternative way is demonstrated in "self.rinter_before_include_class" of SubExampleRinterceptor
+  #set interceptor rules of singleton methods, an alternative way is demonstrated in "self.rinter_before_include_class" of SubRinterceptorExample
   #@include_s_methods value example: 
   #String(for exactly match)
   #Regexp
   #[Regexp]
   #{} (unless key.nil? use rinter_#{key}_around to handle it, otherwise same behavior as before)
-  #refor to SubExampleRinterceptor
+  #refor to SubRinterceptorExample
   @include_s_methods = [/^s_/] 
-  include SubExampleRinterceptor
+  include SubRinterceptorExample
 end
-
+p "--------call TestRinterceptor.new.i1_test -------------------------------------"
 TestRinterceptor.new.i1_test("xxx", "yyy")
+p "--------call TestRinterceptor.new.i2_test -------------------------------------"
 TestRinterceptor.new.i2_test("xxx", "yyy")
+p "--------call TestRinterceptor.new.i3_test -------------------------------------"
 TestRinterceptor.new.i3_test("xxx", "yyy")
+p "--------call TestRinterceptor.s_test -------------------------------------"
 TestRinterceptor.s_test("xxx", "yyy")
 end
 

data/lib/rinterceptor_helper.rb

@@ -0,0 +1,25 @@
+module RinterceptorHelper
+  def self.match_method?(method, includes, excludes)
+    excludes.each {|i| return false if method =~ i}
+    real_includes = includes.is_a?(Array) ? includes : []
+    if includes.is_a?(Hash)
+      includes.each{|k, v| real_includes += v}
+    end
+    real_includes.each {|i| return true if method =~ i}
+    false
+  end
+  def self.process_include_methods(methods)
+    if methods.is_a?(Hash)
+      methods.each do |k, v|
+        if v.is_a?(String) || v.is_a?(Symbol)
+          v = Regexp.new("^#{v}$")
+        elsif v.is_a?(Array)
+          v.each_index{|i| v[i] = Regexp.new("^#{v[i]}$") if v[i].is_a?(String) || v[i].is_a?(Symbol)}
+        end
+        v = [v] if v.is_a?(Regexp)
+        methods[k] = v
+      end
+    end
+    methods
+  end
+end

data/lib/rinterceptor_invocation.rb

@@ -0,0 +1,16 @@
+class RinterceptorInvocation
+  attr_accessor :object, :method, :args, :options
+  def initialize(object, method, *args)
+    @object = object
+    @method = method
+    @args = args
+    @options = {}
+  end
+  def invoke(*args)
+    unless @options.nil? || @options.empty?
+      @args = @args + [@options]
+      @options = nil
+    end
+    @object.send("old4rinter_#{@method}".to_sym, *(args.empty? ? @args : args))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rinterceptor
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Leon Li
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 +08:00
+date: 2009-03-16 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -25,8 +25,10 @@ files:
 - MIT-LICENSE
 - Rakefile
 - CHANGELOG
+- lib/rinterceptor_helper.rb
+- lib/rinterceptor_invocation.rb
 - lib/rinterceptor.rb
-- lib/example_rinterceptor.rb
+- lib/rinterceptor_example.rb
 has_rdoc: false
 homepage: http://rinter.rubyforge.org/
 post_install_message: