modulr 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/assets/modulr.js

@@ -6,9 +6,11 @@
 var modulr = (function(global) {
   var _modules = {},
       _moduleObjects = {},
-      _references = {},
       _exports = {},
-      PREFIX = '__module__'; // Prefix identifiers to avoid issues in IE.
+      _oldDir = '',
+      _currentDir = '',
+      PREFIX = '__module__', // Prefix identifiers to avoid issues in IE.
+      RELATIVE_IDENTIFIER_PATTERN = /^\.\.?\//;
   
   function log(str) {
     if (global.console && console.log) { console.log(str); }
@@ -16,28 +18,63 @@ var modulr = (function(global) {
   
   function require(identifier) {
     var fn, modObj,
-        key = PREFIX + identifier,
-        id = _references[key] || key,
-        expts = _exports[id];
+        id = resolveIdentifier(identifier),
+        key = PREFIX + id,
+        expts = _exports[key];
     
     log('Required module "' + identifier + '".');
     
     if (!expts) {
-      _exports[id] = expts = {};
-      _moduleObjects[id] = modObj = { id: id.replace(PREFIX, '') };
+      _exports[key] = expts = {};
+      _moduleObjects[key] = modObj = { id: id };
       
       if (!require.main) { require.main = modObj; }
       
-      fn = _modules[id];
-      if (!fn) { throw 'Can\'t find module "' + identifier + '".'; }
-      if (typeof fn === 'string') {
-        fn = new Function('require', 'exports', 'module', fn);
+      fn = _modules[key];
+      _oldDir = _currentDir;
+      _currentDir = id.slice(0, id.lastIndexOf('/'));
+      
+      try {
+        if (!fn) { throw 'Can\'t find module "' + identifier + '".'; }
+        if (typeof fn === 'string') {
+          fn = new Function('require', 'exports', 'module', fn);
+        }
+        fn(require, expts, modObj);
+        _currentDir = _oldDir;
+      } catch(e) {
+        _currentDir = _oldDir;
+        // We'd use a finally statement here if it wasn't for IE.
+        throw e;
       }
-      fn(require, expts, modObj);
     }
     return expts;
   }
   
+  function resolveIdentifier(identifier) {
+    var parts, part, path;
+    
+    if (!RELATIVE_IDENTIFIER_PATTERN.test(identifier)) {
+      return identifier;
+    }
+    
+    parts = (_currentDir + '/' + identifier).split('/');
+    path = [];
+    for (var i = 0, length = parts.length; i < length; i++) {
+      part = parts[i];
+      switch (part) {
+        case '':
+        case '.':
+          continue;
+        case '..':
+          path.pop();
+          break;
+        default:
+          path.push(part);
+      }
+    }
+    return path.join('/');
+  }
+  
   function cache(id, fn) {
     var key = PREFIX + id;
     
@@ -48,14 +85,8 @@ var modulr = (function(global) {
     _modules[key] = fn;
   }
   
-  function alias(identifier, id) {
-    log('Linked "' + identifier + '" to module "' + id + '".');
-    _references[PREFIX + identifier] = PREFIX + id;
-  }
-  
   return {
     require: require,
-    cache: cache,
-    alias: alias
+    cache: cache
   };
 })(this);

data/example/foo/foo.js

@@ -1,3 +1,4 @@
 exports.toplevel = require('math').add;
 exports.relative = require('./bar').bar;
 exports.relative2 = require('../foo/bar').bar;
+exports.relative3 = require('../foo/../foo/./bar').bar;

data/example/increment.js

@@ -1,5 +1,4 @@
 var add = require('math').add;
-add = require('../example/math').add;
 
 exports.increment = function(val) {
     return add(val, 1);

data/example/program.js

@@ -6,4 +6,5 @@ inspect(require('inspect') === require('inspect'));
 var foo = require('foo/foo');
 inspect(foo.relative);
 inspect(foo.relative === foo.relative2);
+inspect(foo.relative === foo.relative3);
 inspect(foo.toplevel === require('math').add);

data/lib/modulr/js_module.rb

@@ -88,13 +88,11 @@ module Modulr
     end
 
     def to_js(buffer = '')
-      call_alias_js_function(buffer)
       fn = "function(require, exports, module) {\n#{src}\n}"
       buffer << "\nmodulr.cache('#{id}', #{fn});\n"
     end
     
     def to_js_string(buffer = '')
-      call_alias_js_function(buffer)
       buffer << "\nmodulr.cache('#{id}', '#{escaped_src}');\n"
     end
     
@@ -106,12 +104,6 @@ module Modulr
       def directory
         relative? ? File.dirname(file) : root
       end
-      
-      def call_alias_js_function(buffer)
-        if relative?
-          buffer << "\nmodulr.alias('#{identifier}', '#{id}');"
-        end
-      end
   end
   
   class ModuleIdentifierError < ModulrError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: modulr
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tobie Langel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 +01:00
+date: 2010-03-11 00:00:00 +01:00
 default_executable: modulrize
 dependencies: []