Improve CamelCase package splitting. Fixes #3493.

jruby · Nov 24, 2015 · 3709326 · 3709326
1 parent 408e2d9
commit 3709326
Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/javasupport/Java.java b/core/src/main/java/org/jruby/javasupport/Java.java
@@ -766,7 +766,7 @@ private static RubyModule createPackageModule(final Ruby runtime,
         return packageModule;
     }
 
-    private static final Pattern CAMEL_CASE_PACKAGE_SPLITTER = Pattern.compile("([a-z][0-9]*)([A-Z])");
+    private static final Pattern CAMEL_CASE_PACKAGE_SPLITTER = Pattern.compile("([a-z0-9_]+)([A-Z])");
 
     private static RubyModule getPackageModule(final Ruby runtime, final String name) {
         final RubyModule javaModule = runtime.getJavaSupport().getJavaModule();

diff --git a/spec/java_integration/packages/access_spec.rb b/spec/java_integration/packages/access_spec.rb
@@ -44,6 +44,12 @@
   it "supports const_get with inherit argument" do
     expect(java.util.const_get("Arrays", false)).to respond_to :asList
   end
+
+  it "can be accessed using Java module and CamelCase" do
+    expect(Java::JavaLang).to eq(java.lang)
+    expect(Java::ComBlahV8Something).to eq(com.blah.v8.something)
+    expect(Java::X_Y_).to eq(Java::x_.y_)
+  end
 end
 
 # for DefaultPackageClass