jammit-jcarnegie 0.0.2 → 0.0.3

data/jammit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit-jcarnegie'
-  s.version   = '0.0.2'         # Keep version in sync with jammit.rb
+  s.version   = '0.0.3'         # Keep version in sync with jammit.rb
   s.date      = '2011-07-25'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"

data/lib/jammit/compressor.rb

@@ -102,7 +102,7 @@ module Jammit
       compiled      = paths.map do |path|
         contents    = read_binary_file(path)
         contents    = contents.gsub(/\r?\n/, "\\n").gsub("'", '\\\\\'')
-        name        = template_root ? template_name(path, base_path)
+        name        = template_name(path, base_path, template_root)
         "#{namespace}['#{name}'] = #{Jammit.template_function}('#{contents}');"
       end
       compiler = Jammit.include_jst_script ? read_binary_file(DEFAULT_JST_SCRIPT) : '';
@@ -129,7 +129,13 @@ module Jammit
 
     # Determine the name of a JS template. If there's a common base path, use
     # the namespaced prefix. Otherwise, simply use the filename.
-    def template_name(path, base_path)
+    def template_name(path, base_path, template_root=nil)
+      if template_root
+        root = File.join(RAILS_ROOT, template_root)
+        path = path.sub(/#{root}/, "")
+        dir  = File.dirname(path)
+        return File.join(dir, File.basename(path, ".#{Jammit.template_extension}"))
+      end
       return File.basename(path, ".#{Jammit.template_extension}") unless base_path
       path.gsub(/\A#{Regexp.escape(base_path)}\/(.*)\.#{Jammit.template_extension}\Z/, '\1')
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jammit-jcarnegie
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jeremy Ashkenas