local_eval 0.2.2 → 0.2.4

data/README.markdown

@@ -40,10 +40,10 @@ example: capture
 
 Since `local_eval` does not alter the `self` inside a block,
 all methods with an implied receiver will be invoked with respect to
-this self. This means that all mutator methods defined on the receiver
+this local self. This means that all mutator methods defined on the receiver
 will modify state on the block's self rather than on the receiver's
 self. This is unlikely to be the desired behaviour; and so
-using the `capture` method we can redirect the method lookup to
+we can use the `capture` method  to redirect method lookup to
 the actual receiver. All code captured by the `capture` block
 will be `instance_eval`'d against the actual receiver of the method.
      

data/Rakefile

@@ -19,7 +19,7 @@ def apply_spec_defaults(s)
   s.description = s.summary
   s.require_path = 'lib'
   s.add_dependency("remix",">=0.4.9")
-  s.add_dependency("object2module",">=0.4.5")
+  s.add_dependency("object2module",">=0.5.0")
   s.homepage = "http://banisterfiend.wordpress.com"
   s.has_rdoc = 'yard'
   s.files = Dir["ext/**/extconf.rb", "ext/**/*.h", "ext/**/*.c", "lib/**/*.rb",

data/lib/local_eval.rb

@@ -40,7 +40,6 @@ module LocalEval
       # mix the anonymous module into the block context
       context.temp_extend functionality, &block
     end
-    private :local_eval_with
 
     # Performs a `local_eval` on the block with respect to the
     # receiver.

data/lib/local_eval/version.rb

@@ -1,3 +1,3 @@
 module LocalEval
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/test/helper1.rb

@@ -6,6 +6,19 @@ Reset = proc do
   O = Object.new
   O2 = Object.new
   O3 = Object.new
+
+  class C1
+    def c1
+      :c1
+    end
+  end
+
+  class C2 < C1
+    def c2
+      :c2
+    end
+  end
+  
   class A
     def self.a
       :a

data/test/helper1_flymake.rb

@@ -6,6 +6,7 @@ Reset = proc do
   O = Object.new
   O2 = Object.new
   O3 = Object.new
+
   class A
     def self.a
       :a

data/test/test.rb

@@ -36,6 +36,25 @@ describe LocalEval do
       local_eval(&C.build_proc).should == :love
       self.singleton_class.remove_method(:love)
     end
+
+    it 'should not segfault when inspecting self inside a local_eval' do
+      O2.local_eval { self }.should.not == nil
+      O2.local_eval { self }.should.not == nil
+    end
+
+    it 'should mix in entire object inheritance chain, including singleton' do
+      c = C2.new
+      def c.sing
+        :sing
+      end
+
+      c.local_eval { c1.should == :c1; c2.should == :c2; sing.should == :sing }
+
+      lambda { c1 }.should.raise NameError
+      lambda { sing }.should.raise NameError
+      lambda { c2 }.should.raise NameError
+    end
+
   end
 
   describe 'local_eval_with' do
@@ -148,6 +167,9 @@ describe LocalEval do
         instance_variable_get(:@ivar3).should == :ivar3
       end
     end
+
+      
+    
   end
   
   describe 'mixing in a module' do

data/test/test_flymake.rb

@@ -36,6 +36,11 @@ describe LocalEval do
       local_eval(&C.build_proc).should == :love
       self.singleton_class.remove_method(:love)
     end
+
+    it 'should not segfault when inspecting self inside a local_eval' do
+      O2.local_eval { self.inspect }
+    end
+
   end
 
   describe 'local_eval_with' do
@@ -77,9 +82,9 @@ describe LocalEval do
 
     it 'should make the method set a local ivar' do
       instance_variable_defined?(:@v).should == false
-      lambda { ivar_set }.should.raise NameError
-      O.local_eval { ivar_set(:@v, 10) }
-      lambda { ivar_set }.should.raise NameError
+      lambda { ivar_set1 }.should.raise NameError
+      O.local_eval { ivar_set1(:@v, 10) }
+      lambda { ivar_set1 }.should.raise NameError
       @v.should == 10
     end
       
@@ -140,6 +145,17 @@ describe LocalEval do
       remove_instance_variable(:@ivar3)
     end
 
+    it 'should work in an instance_eval' do
+      o = Object.new
+      o.instance_eval do
+        O3.local_eval { receiver_ivar_set3 }
+        O3.instance_variable_get(:@receiver_ivar3).should == :receiver3
+        instance_variable_get(:@ivar3).should == :ivar3
+      end
+    end
+
+      
+    
   end
   
   describe 'mixing in a module' do

data/test/test_segfault.rb

@@ -16,11 +16,14 @@ end
 # C.hello
 # puts @goodbye
 
+k = C.singleton_class.singleton_class.singleton_class
+
 o = Object.new
 o.instance_eval {
-  C.local_eval { hello }
+  k.local_eval { puts self; puts self.singleton_class.ancestors }
   puts @goodbye
   puts C.instance_variable_get(:@hello)
-  #  puts @hello
-  puts self.object_id
 }
+
+V = Class.new
+puts V.ancestors

data/test/test_segfault2.rb

@@ -5,4 +5,4 @@ require 'object2module'
 o = Object.new
 o.gen_extend Module.new.singleton_class
 puts o.singleton_class.ancestors
-o.singleton_class.ready_remix
+o.ready_remix

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - John Mair (banisterfiend)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +13:00
+date: 2010-11-17 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,9 +42,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 4
         - 5
-        version: 0.4.5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id002
 description: instance_eval without changing self
@@ -59,18 +59,16 @@ files:
 - lib/local_eval/version.rb
 - lib/local_eval/version_flymake.rb
 - lib/local_eval.rb
-- lib/local_eval_flymake.rb
 - test/helper1.rb
 - test/helper1_flymake.rb
 - test/test.rb
 - test/test_flymake.rb
 - test/test_segfault.rb
 - test/test_segfault2.rb
-- test/test_segfault_flymake.rb
 - CHANGELOG
 - README.markdown
 - Rakefile
-has_rdoc: true
+has_rdoc: yard
 homepage: http://banisterfiend.wordpress.com
 licenses: []
 

data/lib/local_eval_flymake.rb

@@ -1,133 +0,0 @@
-direc = File.dirname(__FILE__)
-
-require "#{direc}/local_eval/version"
-require 'remix'
-require 'object2module'
-
-module LocalEval
-  module ClassExtensions
-    
-    # Find the instance associated with the singleton class
-    # @return [Object] Instance associated with the singleton class
-    def __attached__
-      ObjectSpace.each_object(self).first
-    end
-  end
-  
-  module ObjectExtensions
-
-    # A more general version of `local_eval`.
-    # `local_eval_with` allows you to inject arbitrary functionality
-    # from any number of objects into the block. Methods that use a
-    # `capture` block are invoked on the object that defines the
-    # method (and not the local context).
-    # @param [Array] objs The objects to provide functionality to the block
-    # @return The value of the block
-    # @example
-    #   class A; def self.a; puts "a"; end; end
-    #   class B; def self.b; puts "b"; end; end
-    #   class C; def self.c; puts "c"; end; end
-    #   local_eval_with(A, B, C) { a; b; c }
-    #   #=> "a"
-    #   #=> "b"
-    #   #=> "c"
-    def local_eval_with(*objs, &block)
-      raise "need a block" if !block_given?
-      
-      objs = Array(self) if objs.empty?
-      context = eval('self', block.binding)
-
-      # if the receiver is the same as the block context then don't
-      # mix in anything, as functionality is already present.
-      if objs.include?(context)
-        objs.delete(context)
-        return yield if objs.empty?
-      end
-
-      # add functionality to anonymous module to ease mixing and unmixing
-      functionality = Module.new.gen_include *objs.map { |o| o.is_a?(Module) ? o.singleton_class : o }
-      
-      # mix the anonymous module into the block context
-      context.temp_extend functionality, &block
-    end
-    private :local_eval_with
-
-    # Performs a `local_eval` on the block with respect to the
-    # receiver.
-    # `local_eval` has some advantages over `instance_eval` in that it
-    # does not change `self`. Instead, the functionality in the local
-    # context is supplemented by the functionality in the
-    # receiver. Further, if receiver methods utilize a `capture` block
-    # then the receiver of that `local_eval` becomes the receiver of that
-    # method call (rather than the local context).
-    # @return The return value of the block
-    # @yield The block to `local_eval`
-    # @example local ivars can be looked up
-    #   class C
-    #     def hello(name)
-    #       "hello #{name}!"
-    #     end
-    #   end
-    #   
-    #   o = C.new
-    #   
-    #   @name = "John"
-    #   o.local_eval { hello(@name) } #=> "hello John!"
-    def local_eval(&block)
-      local_eval_with(&block)
-    end
-
-    # Since `local_eval` does not alter the `self` inside a block,
-    # all methods with an implied receiver will be invoked with respect to
-    # this self. This means that all mutator methods defined on the receiver
-    # will modify state on the block's self rather than on the receiver's
-    # self. This is unlikely to be the desired behaviour; and so
-    # using the `capture` method we can redirect the method lookup to
-    # the actual receiver. All code captured by the `capture` block
-    # will be `instance_eval`'d against the actual receiver of the
-    # method.
-    # @return The return value of the block.
-    # @yield The block to be evaluated in the receiver's context.
-    # @example
-    #   class C
-    #     attr_reader :hello
-    #     def self.capture_test
-    #     
-    #       # this code will be run against C
-    #       capture { @hello = :captured }
-    #
-    #       # this code will be run against the block context
-    #       @goodbye = :goobye
-    #     end
-    #   end
-    #
-    #   C.local_eval { capture_test }
-    #   C.hello #=> :captured
-    #   @goodbye #=> :goodbye
-    def capture(&block)
-      
-      # 1. Get name of enclosing method (method that invoked
-      # `capture ` block)
-      # 2. Find owner of enclosing method (owner is guaranteed to be
-      # a singleton class)
-      # 4. Find associated object (attached object) of the singleton class
-      # 5. This object will be the receiver of the method call, so
-      # instance_eval on it.
-      method_name = eval('__method__', block.binding)
-
-      method_owner = method(method_name).owner
-      attached_object = method_owner.__attached__
-      attached_object.instance_eval &block
-    end
-    alias_method :__capture__, :capture
-    
-  end
-end
-
-class Class
-  include LocalEval::ClassExtensions
-end
-
-class Object
-  include LocalEval::ObjectExtensions
-end

data/test/test_segfault_flymake.rb

@@ -1,25 +0,0 @@
-direc = File.dirname(__FILE__)
-require "rubygems"
-require "#{direc}/../lib/local_eval"
-require 'mult'
-
-class C
-  attr_reader :hello
-  def self.hello
-    capture { @hello = :captures }
-    @goodbye = :captured
-  end
-end
-
-C.local_eval { hello }
-@goodbye
-C.hello
-m = Module.new
-m.gen_include Module.new.singleton_class
-
-o = Object.new
-o.instance_eval {
-#  o.actual_class = C
-  self.temp_extend(m) { puts self 
-#  C.local_eval { puts self }
-}