turbo-sprockets-rails3 0.1.11 → 0.1.12

data/lib/sprockets/unprocessed_asset.rb

@@ -1,11 +1,15 @@
 module Sprockets
   class UnprocessedAsset < AssetWithDependencies
-    def replace_scss_imports
-      @source.gsub!(/^@import ["']([^"']+)["']/) do |match|
+    def replace_imports(template_with_leading_underscore = true)
+      @source.gsub!(/^@import ["']([^"']+)["'];?/) do |match|
         begin
-          template = "_#{$1}"
+          if template_with_leading_underscore
+            template = "_#{$1}"
+          else
+            template = $1
+          end
           pathname = @environment.resolve(template)
-          asset = UnprocessedAsset.new @environment, '_changeme2', pathname
+          asset = UnprocessedAsset.new @environment, template, pathname
           # Replace imported template with the unprocessed asset contents.
           asset.to_s
         rescue Sprockets::FileNotFound
@@ -14,6 +18,7 @@ module Sprockets
       end
     end
 
+
     def initialize(environment, logical_path, pathname)
       super
 
@@ -27,9 +32,13 @@ module Sprockets
 
       @source = context.evaluate(pathname, :processors => processors)
 
-      # Manually include files that are @imported from SCSS
+      # Include SASS imports
       if defined?(Sass::Rails::ScssTemplate) && attributes.processors.include?(Sass::Rails::ScssTemplate)
-        replace_scss_imports
+        replace_imports(true)  # Template has leading underscore
+      end
+      # Include Less imports
+      if defined?(Less::Rails::LessTemplate) && attributes.processors.include?(Less::Rails::LessTemplate)
+        replace_imports(false)  # Template has no leading underscore
       end
 
       build_required_assets(environment, context,  :process => false)

data/lib/turbo-sprockets/version.rb

@@ -1,3 +1,3 @@
 module TurboSprockets
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-sprockets-rails3
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors: