From ac2d6f1898a5aa1aad7cc254290ec9341d2cdf60 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Fri, 23 Dec 2011 08:33:21 -0800 Subject: Remove assumption about a stable $: In some environments (e.g. [1]) $: can change between loading the library and using it. To avoid this problem, we always pass an absolute path to autoload internal modules. [1] https://github.com/pry/pry/issues/280 --- lib/coderay/scanners/java.rb | 2 +- lib/coderay/scanners/ruby.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/coderay/scanners') diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb index d3502e3..50c82c2 100644 --- a/lib/coderay/scanners/java.rb +++ b/lib/coderay/scanners/java.rb @@ -6,7 +6,7 @@ module Scanners register_for :java - autoload :BuiltinTypes, 'coderay/scanners/java/builtin_types' + autoload :BuiltinTypes, CodeRay.abs_path('coderay/scanners/java/builtin_types') # http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html KEYWORDS = %w[ diff --git a/lib/coderay/scanners/ruby.rb b/lib/coderay/scanners/ruby.rb index 4244ab7..e2e3d1b 100644 --- a/lib/coderay/scanners/ruby.rb +++ b/lib/coderay/scanners/ruby.rb @@ -13,8 +13,8 @@ module Scanners register_for :ruby file_extension 'rb' - autoload :Patterns, 'coderay/scanners/ruby/patterns' - autoload :StringState, 'coderay/scanners/ruby/string_state' + autoload :Patterns, CodeRay.abs_path('coderay/scanners/ruby/patterns') + autoload :StringState, CodeRay.abs_path('coderay/scanners/ruby/string_state') def interpreted_string_state StringState.new :string, true, '"' -- cgit v1.2.1 From 5c4c0065784c6420224516e13a0c50d86e792363 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Tue, 27 Dec 2011 02:39:02 +0100 Subject: Bug #6: merge ConradIrwin's approach with korny's --- lib/coderay/scanners/java.rb | 2 +- lib/coderay/scanners/ruby.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/coderay/scanners') diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb index 50c82c2..c1490ac 100644 --- a/lib/coderay/scanners/java.rb +++ b/lib/coderay/scanners/java.rb @@ -6,7 +6,7 @@ module Scanners register_for :java - autoload :BuiltinTypes, CodeRay.abs_path('coderay/scanners/java/builtin_types') + autoload :BuiltinTypes, CodeRay.coderay_path('scanners', 'java', 'builtin_types') # http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html KEYWORDS = %w[ diff --git a/lib/coderay/scanners/ruby.rb b/lib/coderay/scanners/ruby.rb index e2e3d1b..2be98a6 100644 --- a/lib/coderay/scanners/ruby.rb +++ b/lib/coderay/scanners/ruby.rb @@ -13,8 +13,8 @@ module Scanners register_for :ruby file_extension 'rb' - autoload :Patterns, CodeRay.abs_path('coderay/scanners/ruby/patterns') - autoload :StringState, CodeRay.abs_path('coderay/scanners/ruby/string_state') + autoload :Patterns, CodeRay.coderay_path('scanners', 'ruby', 'patterns') + autoload :StringState, CodeRay.coderay_path('scanners', 'ruby', 'string_state') def interpreted_string_state StringState.new :string, true, '"' -- cgit v1.2.1 From 964397d4bfbcbbd27d51e252faf25e291429e7d9 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Tue, 27 Dec 2011 02:45:32 +0100 Subject: let autoloading to the work (fix test warnings) --- lib/coderay/scanners/diff.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/coderay/scanners') diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb index 52e23d5..9e899c3 100644 --- a/lib/coderay/scanners/diff.rb +++ b/lib/coderay/scanners/diff.rb @@ -16,8 +16,6 @@ module Scanners protected - require 'coderay/helpers/file_type' - def scan_tokens encoder, options line_kind = nil @@ -50,7 +48,7 @@ module Scanners if match = scan(/.*?(?=$|[\t\n\x00]| \(revision)/) encoder.text_token match, :filename if options[:highlight_code] && match != '/dev/null' - file_type = FileType.fetch(match, :text) + file_type = CodeRay::FileType.fetch(match, :text) file_type = :text if file_type == :diff content_scanner = scanners[file_type] content_scanner_entry_state = nil -- cgit v1.2.1