lazy_methods 1.0.5 → 1.0.6

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lazy_methods.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lazy_methods}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Durand"]
-  s.date = %q{2011-01-19}
+  s.date = %q{2011-01-24}
   s.description = %q{Gem that adds lazy method wrapping to every object. Preceding any method with lazy_ will defer the invocation until the result is actually needed. This pattern is useful when used with caching systems.}
   s.email = %q{brian@embellishedvisions.com}
   s.extra_rdoc_files = [

data/lib/lazy_methods/lazy_methods.rb

@@ -14,7 +14,8 @@ module LazyMethods
       method = method.to_s
       if method[0, 5] == 'lazy_'
         method = method.to_s
-        return Proxy.new(self, method[5, method.length], args, &block)
+        called_method = method[5, method.length]
+        return Proxy.new(self, called_method, args, &block)
       else
         # Keep track of the current missing method calls to keep out of an infinite loop
         stack = Thread.current[:lazy_method_missing_methods] ||= []
@@ -23,6 +24,10 @@ module LazyMethods
         begin
           stack.push(sig)
           return method_missing_without_lazy(method, *args, &block)
+        rescue Exception => e
+          # Strip this method from the stack trace as it adds confusion
+          e.backtrace.reject!{|line| line.include?(__FILE__)}
+          raise e
         ensure
           stack.pop
         end
@@ -41,7 +46,7 @@ module LazyMethods
     end
     
     def eql? (sig)
-      sig.kind_of(MethodSignature) and sig.object == @object and sig.method == @method
+      sig.kind_of(MethodSignature) && sig.object == @object && sig.method == @method
     end
     
   end
@@ -49,18 +54,18 @@ module LazyMethods
   # The proxy object does all the heavy lifting.
   class Proxy
     # These methods we don't want to override. All other existing methods will be redefined.
-    PROTECTED_METHODS = %w(initialize __proxy_result__ __proxy_loaded__ method_missing __send__ object_id)
+    PROTECTED_METHODS = %w(initialize method_missing __proxy_result__ __proxy_loaded__ __send__ __id__ object_id)
+    
+    # Override already defined methods on Object to proxy them to the result object
+    instance_methods.each do |m|
+      undef_method(m) unless PROTECTED_METHODS.include?(m.to_s)
+    end
     
     def initialize (obj, method, args = nil, &block)
       @object = obj
       @method = method
       @args = args || []
       @block = block
-      
-      # Override already defined methods on Object to proxy them to the result object
-      methods.each do |m|
-        eval "def self.#{m} (*args, &block); __proxy_result__.send(:#{m}, *args, &block); end" unless PROTECTED_METHODS.include?(m.to_s)
-      end
     end
     
     # Get the result of the original method call. The original method will only be called once.

data/spec/lazy_method_spec.rb

@@ -17,6 +17,16 @@ describe LazyMethods::InstanceMethods do
     proxy.__proxy_loaded__.should == false
   end
   
+  it "should remove itself from stacktraces thrown in method_missing" do
+    begin
+      "object".call_a_missing_method_that_does_not_exist
+      raise "should not get here"
+    rescue => e
+      async_source_file = File.expand_path("../../lib/lazy_methods/lazy_methods.rb", __FILE__)
+      File.exist?(async_source_file).should == true
+      e.backtrace.join("\n").should_not include(async_source_file)
+    end
+  end
 end
 
 describe LazyMethods::Proxy do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lazy_methods
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Brian Durand
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -06:00
+date: 2011-01-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency