distil 0.14.1 → 0.14.2.a

data/VERSION

@@ -1 +1 @@
-0.14.1
+0.14.2.a

data/assets/distil.js

@@ -232,6 +232,7 @@
           resource = resource.parent;
         }
 
+        window.__filename__ = null;
         currentResource = resource ? resource : rootResource;
       };
 
@@ -395,26 +396,42 @@
 
   distil.kick = distil.moduleDidLoad;
 
+  /**
+    pathToAssetInModule(asset, module) -> String
+    - asset (String): The name or path of the asset.
+    - module (Object): The module definition from which to pull the asset
+   */
+  var pathToAssetInModule = function(asset, module)
+      {
+        //  If the asset is in the asset_map, it is presumed to be relative to the
+        //  module rather than the currently running script.
+        if (module.asset_map && module.asset_map[asset])
+          return module.path + module.asset_map[asset];
+
+        var path, url;
+
+        if (distil.sync)
+          url = getRunningScriptSource();
+        else
+          url = window.__filename__;
+          
+        if (url)
+        {
+          var lastSlash = url.lastIndexOf('/');
+          path = url.substring(0, lastSlash + 1);
+        }
+        else
+          path= module.path;
+          
+        return path + asset;
+      };
+
   distil.urlForAssetWithNameInModule = function(asset, moduleName)
   {
     var module = moduleName ? moduleIndex[moduleName] : distil.mainModule;
     if (!module)
       throw new Error(NO_MODULE_ERROR + moduleName);
-
-    var path;
-    if (distil.sync)
-    {
-      var url = getRunningScriptSource();
-      var lastSlash = url.lastIndexOf('/');
-      path = url.substring(0, lastSlash + 1);
-    }
-    else
-      path = module.path;
-
-    if (!module.asset_map)
-      return path + asset;
-      
-    return path + (module.asset_map[asset] || asset);
+    return pathToAssetInModule(asset, module);
   }
 
   distil.dataForAssetWithNameInModule = function(asset, moduleName)
@@ -433,23 +450,13 @@
     if (!module.asset_map)
       return null;
 
-    var path;
-    if (distil.sync)
-    {
-      var url = getRunningScriptSource();
-      var lastSlash = url.lastIndexOf('/');
-      path = url.substring(0, lastSlash + 1);
-    }
-    else
-      path = module.path;
-
-    var assetUrl = path + (module.asset_map[asset] || asset);
+    var path= pathToAssetInModule(asset, module);
 
     function oncomplete(unused, xhr)
     {
       module.assets[asset] = data = xhr.responseText;
     }
-    fetchAsset(assetUrl, oncomplete, null, null, true);
+    fetchAsset(path, oncomplete, null, null, true);
     return data;
   }
 

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.14.1"
+  s.version = "0.14.2.a"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2011-04-20}
+  s.date = %q{2011-05-06}
   s.description = %q{A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit}
   s.executables = ["distil", "jsl"]
   s.extensions = ["vendor/extconf.rb"]

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 14
-  - 1
-  version: 0.14.1
+  - 2
+  - a
+  version: 0.14.2.a
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -07:00
+date: 2011-05-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -847,11 +848,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: