JRuby fixes.

3 files changed, 8 insertions, 5 deletions

diff --git a/lib/coderay/scanners/ruby/patterns.rb b/lib/coderay/scanners/ruby/patterns.rb
index 75937b7..c18789b 100644
--- a/lib/coderay/scanners/ruby/patterns.rb
+++ b/lib/coderay/scanners/ruby/patterns.rb
@@ -166,13 +166,14 @@ module Scanners
         { }
       ] ]
 
-      CLOSING_PAREN.values.each { |o| o.freeze }  # debug, if I try to change it with <<
+      CLOSING_PAREN.each { |k,v| k.freeze; v.freeze }  # debug, if I try to change it with <<
       OPENING_PAREN = CLOSING_PAREN.invert
 
       STRING_PATTERN = Hash.new { |h, k|
         delim, interpreted = *k
-        delim_pattern = Regexp.escape(delim.dup)
+        delim_pattern = Regexp.escape(delim)
         if closing_paren = CLOSING_PAREN[delim]
+          delim_pattern = delim_pattern[0..-1] if defined? JRUBY_VERSION  # JRuby fix
           delim_pattern << Regexp.escape(closing_paren)
         end
 
diff --git a/test/scanners/coderay_suite.rb b/test/scanners/coderay_suite.rb
index 7928433..751b8b7 100644
--- a/test/scanners/coderay_suite.rb
+++ b/test/scanners/coderay_suite.rb
@@ -126,7 +126,7 @@ module CodeRay
       end
       
       def lang
-        @lang ||= name.downcase.to_sym
+        @lang ||= name[/[\w_]+$/].downcase.to_sym
       end
       
       def extension extension = nil
diff --git a/test/scanners/java/suite.rb b/test/scanners/java/suite.rb
index ffbc815..b6d5067 100644
--- a/test/scanners/java/suite.rb
+++ b/test/scanners/java/suite.rb
@@ -1,2 +1,4 @@
-class Java < CodeRay::TestCase
-end
+module ScannerTests
+  class Java < CodeRay::TestCase
+  end
+end
\ No newline at end of file