commonjs 0.2.0 → 0.2.1

data/lib/commonjs/environment.rb

@@ -6,16 +6,16 @@ module CommonJS
 
     def initialize(runtime, options = {})
       @runtime = runtime
-      @path = Pathname(options[:path])
+      @paths = [options[:path]].flatten.map {|path| Pathname(path)}
       @modules = {}
     end
 
     def require(module_id)
       unless mod = @modules[module_id]
         filepath = find(module_id) or fail LoadError, "no such module '#{module_id}'"
-        load = @runtime.eval("(function(require, exports) {#{File.read(filepath)}})", filepath.expand_path)
+        load = @runtime.eval("(function(module, require, exports) {#{File.read(filepath)}})", filepath.expand_path)
         @modules[module_id] = mod = Module.new(module_id, self)
-        load.call(mod.require_function, mod.exports)
+        load.call(mod, mod.require_function, mod.exports)
       end
       return mod.exports
     end
@@ -31,9 +31,7 @@ module CommonJS
     private
 
     def find(module_id)
-      filepath = @path.join("#{module_id}.js")
-      filepath if filepath.exist?
+      @paths.find { |path| path.join("#{module_id}.js").exist? }.join("#{module_id}.js")
     end
-
   end
 end

data/lib/commonjs/module.rb

@@ -2,7 +2,8 @@
 module CommonJS
   class Module
 
-    attr_reader :exports
+    attr_reader :id
+    attr_accessor :exports
 
     def initialize(id, env)
       @id = id

data/lib/commonjs/version.rb

@@ -1,3 +1,3 @@
 module CommonJS
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/commonjs/libjs/assign_module_exports.js

@@ -0,0 +1 @@
+module.exports = function() {return 'I am your exports'}

data/spec/commonjs/libjs/one.js

@@ -0,0 +1 @@
+exports.one = 'one'

data/spec/commonjs/libjs/three.js

@@ -0,0 +1 @@
+exports.three = 'three'

data/spec/commonjs/libjs2/one.js

@@ -0,0 +1 @@
+exports.one = 1

data/spec/commonjs/libjs2/two.js

@@ -0,0 +1 @@
+exports.two = 2

data/spec/commonjs/modules_extensions_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe 'modules extensions' do
+  before do
+    @env = CommonJS::Environment.new(V8::Context.new, :path => File.expand_path('../libjs', __FILE__))
+  end
+  it "allows the exports object to be completely replaced" do
+    @env.require('assign_module_exports').call().should eql "I am your exports"
+  end
+end

data/spec/commonjs/path_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe "load paths: " do
+  describe "with a single path" do
+    before do
+      @env = env_with_path_value File.expand_path('../libjs', __FILE__)
+    end
+    
+    it "finds modules in that path" do
+      @env.require('one').one.should eql 'one'
+    end
+  end
+  
+  describe "with multilpe paths" do
+    before do
+      @env = env_with_path_value [File.expand_path('../libjs2', __FILE__), File.expand_path('../libjs', __FILE__)]
+    end
+    
+    it "finds modules in both paths" do
+      @env.require('two').two.should eql 2
+      @env.require('three').three.should eql 'three'
+    end
+    
+    it "respects the order in which paths were specified" do
+      @env.require('one').one.should eql 1
+    end
+  end
+  
+  def env_with_path_value(path)
+    CommonJS::Environment.new V8::Context.new, :path => path
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
 
 require 'commonjs'
-require 'pathname'
+require 'pathname'
+require 'v8'

metadata

@@ -1,76 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: commonjs
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Charles Lowell
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: therubyracer
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156255820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
+      - !ruby/object:Gem::Version
         version: 0.9.9
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156255820
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156255280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156255280
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156254640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2156254640
 description: Host CommonJS JavaScript environments in Ruby
-email: 
+email:
 - cowboyd@thefrontside.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .gitmodules
 - Gemfile
@@ -81,41 +61,47 @@ files:
 - lib/commonjs/environment.rb
 - lib/commonjs/module.rb
 - lib/commonjs/version.rb
+- spec/commonjs/libjs/assign_module_exports.js
+- spec/commonjs/libjs/one.js
+- spec/commonjs/libjs/three.js
+- spec/commonjs/libjs2/one.js
+- spec/commonjs/libjs2/two.js
+- spec/commonjs/modules_extensions_spec.rb
 - spec/commonjs/modules_spec.rb
+- spec/commonjs/path_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/cowboyd/commonjs
 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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Provide access to your Ruby and Operating System runtime via the commonjs API
-test_files: 
+summary: Provide access to your Ruby and Operating System runtime via the commonjs
+  API
+test_files:
+- spec/commonjs/libjs/assign_module_exports.js
+- spec/commonjs/libjs/one.js
+- spec/commonjs/libjs/three.js
+- spec/commonjs/libjs2/one.js
+- spec/commonjs/libjs2/two.js
+- spec/commonjs/modules_extensions_spec.rb
 - spec/commonjs/modules_spec.rb
+- spec/commonjs/path_spec.rb
 - spec/spec_helper.rb