method_source 0.6.0 → 0.6.5

data/README.markdown

@@ -15,7 +15,8 @@ Method comments can also be extracted using the `comment` method.
 
 It is written in pure Ruby (no C).
 
-* Some Ruby 1.8 support now available. 
+* Some Ruby 1.8 support now available.
+* Support for MRI, RBX, JRuby.
 
 `method_source` provides the `source` and `comment` methods to the `Method` and
 `UnboundMethod` and `Proc` classes.
@@ -60,3 +61,29 @@ Special Thanks
 [Adam Sanderson](https://github.com/adamsanderson) for `comment` functionality.
 
 [Dmitry Elastic](https://github.com/dmitryelastic) for the brilliant Ruby 1.8 `source_location` hack.
+
+License
+-------
+
+(The MIT License)
+
+Copyright (c) 2011 John Mair (banisterfiend)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/method_source/source_location.rb

@@ -1,31 +1,42 @@
 module MethodSource
   module SourceLocation
     module MethodExtensions
+      if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
+        require 'java'
 
-      def trace_func(event, file, line, id, binding, classname)
-        return unless event == 'call'
-        set_trace_func nil
+        # JRuby version source_location hack
+        # @return [Array] A two element array containing the source location of the method
+        def source_location
+          to_java.source_location(Thread.current.to_java.getContext())
+        end
+      else
 
-        @file, @line = file, line
-        raise :found
-      end
 
-      private :trace_func
+        def trace_func(event, file, line, id, binding, classname)
+          return unless event == 'call'
+          set_trace_func nil
+
+          @file, @line = file, line
+          raise :found
+        end
 
-      # Return the source location of a method for Ruby 1.8.
-      # @return [Array] A two element array. First element is the
-      #   file, second element is the line in the file where the
-      #   method definition is found.
-      def source_location
-        if @file.nil?
-          args =[*(1..(arity<-1 ? -arity-1 : arity ))]
+        private :trace_func
 
-          set_trace_func method(:trace_func).to_proc
-          call(*args) rescue nil
-          set_trace_func nil
-          @file = File.expand_path(@file) if @file && File.exist?(File.expand_path(@file))
+        # Return the source location of a method for Ruby 1.8.
+        # @return [Array] A two element array. First element is the
+        #   file, second element is the line in the file where the
+        #   method definition is found.
+        def source_location
+          if @file.nil?
+            args =[*(1..(arity<-1 ? -arity-1 : arity ))]
+
+            set_trace_func method(:trace_func).to_proc
+            call(*args) rescue nil
+            set_trace_func nil
+            @file = File.expand_path(@file) if @file && File.exist?(File.expand_path(@file))
+          end
+          return [@file, @line] if File.exist?(@file.to_s)
         end
-        return [@file, @line] if File.exist?(@file.to_s)
       end
     end
 
@@ -56,43 +67,54 @@ module MethodSource
     end
 
     module UnboundMethodExtensions
+      if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
+        require 'java'
 
-      # Return the source location of an instance method for Ruby 1.8.
-      # @return [Array] A two element array. First element is the
-      #   file, second element is the line in the file where the
-      #   method definition is found.
-      def source_location
-        klass = case owner
-                when Class
-                  owner
-                when Module
-                  method_owner = owner
-                  Class.new { include(method_owner) }
-                end
-
-        # deal with immediate values
-        case
-        when klass == Symbol
-          return :a.method(name).source_location
-        when klass == Fixnum
-          return 0.method(name).source_location
-        when klass == TrueClass
-          return true.method(name).source_location
-        when klass == FalseClass
-          return false.method(name).source_location
-        when klass == NilClass
-          return nil.method(name).source_location
+        # JRuby version source_location hack
+        # @return [Array] A two element array containing the source location of the method
+        def source_location
+          to_java.source_location(Thread.current.to_java.getContext())
         end
+      else
+
+
+        # Return the source location of an instance method for Ruby 1.8.
+        # @return [Array] A two element array. First element is the
+        #   file, second element is the line in the file where the
+        #   method definition is found.
+        def source_location
+          klass = case owner
+                  when Class
+                    owner
+                  when Module
+                    method_owner = owner
+                    Class.new { include(method_owner) }
+                  end
+
+          # deal with immediate values
+          case
+          when klass == Symbol
+            return :a.method(name).source_location
+          when klass == Fixnum
+            return 0.method(name).source_location
+          when klass == TrueClass
+            return true.method(name).source_location
+          when klass == FalseClass
+            return false.method(name).source_location
+          when klass == NilClass
+            return nil.method(name).source_location
+          end
 
-        begin
-          klass.allocate.method(name).source_location
-        rescue TypeError
+          begin
+            klass.allocate.method(name).source_location
+          rescue TypeError
 
-          # Assume we are dealing with a Singleton Class:
-          # 1. Get the instance object
-          # 2. Forward the source_location lookup to the instance
-          instance ||= ObjectSpace.each_object(owner).first
-          instance.method(name).source_location
+            # Assume we are dealing with a Singleton Class:
+            # 1. Get the instance object
+            # 2. Forward the source_location lookup to the instance
+            instance ||= ObjectSpace.each_object(owner).first
+            instance.method(name).source_location
+          end
         end
       end
     end

data/lib/method_source/version.rb

@@ -1,3 +1,3 @@
 module MethodSource
-  VERSION = "0.6.0"
+  VERSION = "0.6.5"
 end

data/test/test.rb

@@ -8,10 +8,12 @@ require "#{direc}/test_helper"
 
 describe MethodSource do
 
-  describe "emitted warnings" do
-    it 'should emit no warnings' do
-      Open4.popen4 'ruby -I lib -rubygems -r"method_source" -W -e "exit"' do |pid,stdin,stdout,stderr|
-        stderr.read.empty?.should == true
+  if !jruby?
+    describe "emitted warnings" do
+      it 'should emit no warnings' do
+        Open4.popen4 'ruby -I lib -rubygems -r"method_source" -W -e "exit"' do |pid,stdin,stdout,stderr|
+          stderr.read.empty?.should == true
+        end
       end
     end
   end
@@ -81,23 +83,23 @@ describe MethodSource do
   end
 
   # if RUBY_VERSION =~ /1.9/ || is_rbx?
-    describe "Lambdas and Procs" do
-      it 'should return source for proc' do
-        MyProc.source.should == @proc_source
-      end
+  describe "Lambdas and Procs" do
+    it 'should return source for proc' do
+      MyProc.source.should == @proc_source
+    end
 
-      it 'should return an empty string if there is no comment' do
-        MyProc.comment.should == ''
-      end
+    it 'should return an empty string if there is no comment' do
+      MyProc.comment.should == ''
+    end
 
-      it 'should return source for lambda' do
-        MyLambda.source.should == @lambda_source
-      end
+    it 'should return source for lambda' do
+      MyLambda.source.should == @lambda_source
+    end
 
-      it 'should return comment for lambda' do
-        MyLambda.comment.should == @lambda_comment
-      end
+    it 'should return comment for lambda' do
+      MyLambda.comment.should == @lambda_comment
     end
+  end
   # end
   describe "Comment tests" do
     before do

data/test/test_helper.rb

@@ -2,6 +2,11 @@ def is_rbx?
   defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
 end
 
+def jruby?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
+end
+
+
 module M
   def hello; :hello_module; end
 end

metadata

@@ -1,59 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: method_source
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.5
   prerelease: 
-  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby_parser
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70251253612220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70251253612220
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &70251253611520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: open4
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70251253611520
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: &70251253610760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70251253610760
 description: retrieve the sourcecode for a method
 email: jrmair@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/method_source/source_location.rb
 - lib/method_source/version.rb
 - lib/method_source.rb
@@ -64,30 +60,26 @@ files:
 - .gemtest
 homepage: http://banisterfiend.wordpress.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: retrieve the sourcecode for a method
 test_files: []
-