reproduced regression with requires similar to LESS loading

+ added a require 'less' as an integration spec

Gemfile

@@ -8,5 +8,11 @@ group :test do
                :ref => "0d844f066666f967a78b20beb164c52d9ac3f5ca"
   #gem 'redjs', :path => '../redjs', :group => :test
   
-  gem 'therubyrhino_jar', '1.7.4'
+  # e.g. `export therubyrhino_jar=1.7.3`
+  if jar_version = ENV['therubyrhino_jar']
+    gem 'therubyrhino_jar', jar_version
+  else
+    gem 'therubyrhino_jar', :path => '.'
+  end
+  gem 'less', '>= 2.2.1'
 end

spec/rhino/integration/index.js

@@ -0,0 +1,7 @@
+console.log('./loop');
+require('./loop');
+
+['element1', 'element2'].forEach(function (n) {
+    console.log('require(./loop/' + n + ')');
+    require('./loop/' + n);
+});

spec/rhino/integration/loop.js

@@ -0,0 +1,5 @@
+var Loop = {};
+Loop.toString = function() {
+    return 'Loop';
+};
+exports.Loop = Loop;

spec/rhino/integration/loop/element1.js

@@ -0,0 +1,3 @@
+console.log('loop/element1 1');
+require('../index');
+console.log('loop/element1 2');

spec/rhino/integration/loop/element2.js

@@ -0,0 +1,8 @@
+console.log('loop/element2 1');
+(function (loop) {
+console.log('loop/element2 2');
+loop.fn2 = function (arg1, arg2) {
+    return arg1 + arg2;
+};
+})(require('../loop'));
+console.log('loop/element2 3');

spec/rhino/integration_spec.rb

@@ -4,14 +4,16 @@ require 'rhino'
 require 'pathname'
 require 'stringio'
 
+puts "running with: #{Rhino::VERSION} using jar: #{Rhino::JAR_PATH}"
+
 describe 'integration' do
   
-  it "requires (CommonJS)" do
-    context = Rhino::Context.new
-    #context.optimization_level = -1
-    context['console'] = Console
-    path = Pathname(__FILE__).dirname.join('integration')
-    environment = Env.new(context, :path => path.to_s)
+  it "loads LESS" do
+    require 'less'
+  end
+  
+  it "require foo" do # CommonJS
+    environment = new_environment(:console => Console)
     environment.native 'util', Util.new(out = StringIO.new)
     exports = environment.require 'foo'
     out.string.should == "Hello Bar!\n"
@@ -21,9 +23,28 @@ describe 'integration' do
     exports.foo['Bar'].should respond_to(:'[]')
     exports.foo['Bar'][:puts].should be_a Rhino::JS::Function
   end
+
+  it "require index/loop" do # CommonJS
+    environment = new_environment(:console => Console)
+    exports = environment.require 'index'
+    exports.context['Loop'].should_not be nil
+    exports.context['Loop'].to_s.should == 'Loop'
+  end
+  
+  private
+  
+  def new_environment(globals = {})
+    context = Rhino::Context.new
+    #context.optimization_level = -1
+    globals.each { |key, obj| context[key] = obj }
+    path = Pathname(__FILE__).dirname.join('integration')
+    Env.new(context, :path => path.to_s)
+  end
   
   class Env # a CommonJS like environment (inspired by commonjs.rb)
   
+    attr_reader :context, :modules
+    
     def initialize(context, options = {})
       @context = context
       @paths = [ options[:path] ].flatten.map { |path| Pathname(path) }
@@ -31,22 +52,22 @@ describe 'integration' do
     end
     
     def require(module_id)
-      unless mod = @modules[module_id]
+      unless mod = modules[module_id]
         filepath = find(module_id) or fail LoadError, "no such module '#{module_id}'"
         js = "( function(module, require, exports) {\n#{File.read(filepath)}\n} )"
-        load = @context.eval(js, filepath.expand_path.to_s)
-        @modules[module_id] = mod = Module.new(module_id, self)
+        load = context.eval(js, filepath.expand_path.to_s)
+        modules[module_id] = mod = Module.new(module_id, self)
         load.call(mod, mod.require_function, mod.exports)
       end
       return mod.exports
     end
     
     def native(module_id, impl)
-      @modules[module_id] = Module::Native.new(impl)
+      modules[module_id] = Module::Native.new(impl)
     end
     
     def new_object
-      @context['Object'].new
+      context['Object'].new
     end
 
     private
@@ -59,11 +80,10 @@ describe 'integration' do
     
     class Module
 
-      attr_reader :exports
+      attr_reader :id, :exports
 
       def initialize(id, env)
-        @id = id
-        @env = env
+        @id, @env = id, env
         @exports = env.new_object
         @segments = id.split('/')
       end

spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 
 require 'rhino'