rhook 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rhook.rb

@@ -30,13 +30,16 @@ module RHook
     end
     
     def hack(name, opt = {}, &block)
+      success = false
       if Class === @obj
         klass = @obj
-        klass._rhook.on_method(name)
+        success |= klass._rhook.on_method(name, :ifdef => true)
       end
       
       klass = @obj.instance_eval("class << self; self; end")
-      klass._rhook.on_method(name)
+      success |= klass._rhook.on_method(name, :ifdef => true)
+      
+      success or raise(NameError, "Method #{name} is defined in neither class nor object-specific class.")
       
       bind(name, opt, &block)
     end
@@ -96,20 +99,27 @@ module RHook
       inv.proceed()
     end
     
-    def on_method(*names)
+    def on_method(*names_and_opt)
+      success = true
+      
+      names = names_and_opt
       Class === @obj or raise("Cannot use on_method on non-Class.")
-      code = ""
+      opt = (Hash === names[-1]) ? names.pop : {}
       for method_name in names
-        # Skip if method is not defined.
-        @obj.method_defined?(method_name) or next
-        
         real_method_name = "#{method_name}__rhook_real".to_sym
         @obj.method_defined?(real_method_name) and next
         
-        code << "alias #{real_method_name} #{method_name}\n"
-        code << "def #{method_name}(*args, &block); _rhook.call_method(:#{method_name}, :#{real_method_name}, args, block); end\n"
+        begin
+          @obj.module_eval "alias #{real_method_name} #{method_name}", __FILE__, __LINE__
+        rescue NameError
+          # When method_is not defined:
+          opt[:ifdef] and (success = false; next)
+          raise NameError, "[Tried to on_method for undefined method] #{$!}"
+        end
+        @obj.module_eval "def #{method_name}(*args, &block); _rhook.call_method(:#{method_name}, :#{real_method_name}, args, block); end", __FILE__, __LINE__
       end
-      @obj.module_eval(code)
+      
+      success
     end
     
     # ================================================================

data/rhook.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rhook}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kaoru Kobo"]
-  s.date = %q{2010-11-11}
+  s.date = %q{2010-11-12}
   s.description = %q{You can provide hook point in your code, and can customize its behavior from outside. Also you can 'hack' (== injecting hook point from outside) any methods in existing code.}
   s.email = %q{}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/rhook.rb",
      "rhook.gemspec",
+     "spec/rhook_minor_spec.rb",
      "spec/rhook_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -35,7 +36,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Easily drive AOP & hacking existing library with Ruby}
   s.test_files = [
-    "spec/rhook_spec.rb",
+    "spec/rhook_minor_spec.rb",
+     "spec/rhook_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/rhook_minor_spec.rb

@@ -0,0 +1,91 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+# ================================================================
+describe "rhook (minor specifications / behavior, and bugs)" do
+  class Target
+    
+  end
+  
+  before :each do
+    Target._rhook.unbind_all()
+  end
+  
+  # ================================================================
+  describe "hack" do
+    # ================================================================
+    describe "Can hack on private method" do 
+      class Target
+        def call_private
+          test_private
+        end
+        
+        private
+        def test_private
+        "foo"
+        end
+      end #/Target
+      
+      example do
+        Target._rhook.hack(:test_private) do |inv|
+        "bar"
+        end
+        t = Target.new
+        t.call_private.should == "bar"
+      end
+    end 
+    # ================================================================
+    
+    # ================================================================
+    describe "Raises error on hack to non-existent method" do
+      class Target
+        def hack_err1
+        end
+        
+        def self.hack_err2
+        end
+      end
+      
+      example do
+        Target._rhook.hack(:hack_err1) do |inv|
+          
+        end
+        Target._rhook.hack(:hack_err2) do |inv|
+          
+        end
+        proc {
+          Target._rhook.hack(:hack_err_nonexistent_method) do |inv|
+            
+          end
+        }.should raise_error(/defined in neither/)
+      end
+    end
+  end
+  
+  # ================================================================
+  describe "on_method" do
+    # ================================================================
+    describe "to non-existent method" do
+      
+      class Target
+        def on_method_test_non_existent
+          
+        end
+      end
+      
+      example "raises error" do
+        proc {
+          Target._rhook.on_method(:nonexistent_method)
+        }.should raise_error(/Tried to on_method/)
+      end
+      
+      example "to ignore error, set :ifdef => true" do
+        result = Target._rhook.on_method(:nonexistent_method, :ifdef => true)
+        result.should == false
+        
+        # if success, it returns true
+        result = Target._rhook.on_method(:on_method_test_non_existent, :ifdef => true)
+        result.should == true
+      end
+    end
+  end
+end

data/spec/rhook_spec.rb

@@ -220,6 +220,7 @@ end
 
 # ================================================================
 describe "rhook (behavior)" do
+  # ================================================================
   describe "Super class's hook" do
     class Target
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Kaoru Kobo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +09:00
+date: 2010-11-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - VERSION
 - lib/rhook.rb
 - rhook.gemspec
+- spec/rhook_minor_spec.rb
 - spec/rhook_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -86,5 +87,6 @@ signing_key:
 specification_version: 3
 summary: Easily drive AOP & hacking existing library with Ruby
 test_files: 
+- spec/rhook_minor_spec.rb
 - spec/rhook_spec.rb
 - spec/spec_helper.rb