implement glob importing

Author: bolandrm

lib/sassc/rails/importer.rb

@@ -10,7 +10,7 @@ def initialize(postfix=nil)
           @postfix = postfix
         end
 
-        def import_for(original_path, parent_path, full_path, options)
+        def import_for(full_path, parent_dir, options)
           SassC::Importer::Import.new(full_path)
         end
       end
@@ -20,7 +20,7 @@ def postfix
           ".css"
         end
 
-        def import_for(original_path, parent_path, full_path, options)
+        def import_for(full_path, parent_dir, options)
           import_path = full_path.gsub(/\.css$/,"")
           SassC::Importer::Import.new(import_path)
         end
@@ -31,7 +31,7 @@ def postfix
           ".css.scss"
         end
 
-        def import_for(original_path, parent_path, full_path, options)
+        def import_for(full_path, parent_dir, options)
           source = File.open(full_path, 'rb') { |f| f.read }
           SassC::Importer::Import.new(full_path, source: source)
         end
@@ -42,7 +42,7 @@ def postfix
           ".css.sass"
         end
 
-        def import_for(original_path, parent_path, full_path, options)
+        def import_for(full_path, parent_dir, options)
           sass = File.open(full_path, 'rb') { |f| f.read }
           parsed_scss = SassC::Sass2Scss.convert(sass)
           SassC::Importer::Import.new(full_path, source: parsed_scss)
@@ -54,7 +54,7 @@ def postfix
           ".sass.erb"
         end
 
-        def import_for(original_path, parent_path, full_path, options)
+        def import_for(full_path, parent_dir, options)
           template = Tilt::ERBTemplate.new(full_path)
           parsed_erb = template.render(options[:sprockets][:context], {})
           parsed_scss = SassC::Sass2Scss.convert(parsed_erb)
@@ -63,30 +63,37 @@ def import_for(original_path, parent_path, full_path, options)
       end
 
       class ERBExtension < Extension
-        def import_for(original_path, parent_path, full_path, options)
+        def import_for(full_path, parent_dir, options)
           template = Tilt::ERBTemplate.new(full_path)
           parsed_erb = template.render(options[:sprockets][:context], {})
           SassC::Importer::Import.new(full_path, source: parsed_erb)
         end
       end
 
       EXTENSIONS = [
+        CssScssExtension.new,
+        CssSassExtension.new,
         Extension.new(".scss"),
         Extension.new(".sass"),
         CSSExtension.new,
         ERBExtension.new(".scss.erb"),
         ERBExtension.new(".css.erb"),
-        SassERBExtension.new,
-        CssScssExtension.new,
-        CssSassExtension.new
+        SassERBExtension.new
       ]
 
       PREFIXS = [ "", "_" ]
+      GLOB = /(\A|\/)(\*|\*\*\/\*)\z/
 
       def imports(path, parent_path)
         parent_dir, _ = File.split(parent_path)
         specified_dir, specified_file = File.split(path)
 
+        if m = path.match(GLOB)
+          path = path.sub(m[0], "")
+          base = File.expand_path(path, File.dirname(parent_path))
+          return glob_imports(base, m[2], parent_path)
+        end
+
         search_paths = ([parent_dir] + load_paths).uniq
 
         if specified_dir != "."
@@ -103,17 +110,24 @@ def imports(path, parent_path)
               try_path = File.join(search_path, file_name + extension.postfix)
               if File.exists?(try_path)
                 record_import_as_dependency try_path
-                return extension.import_for(path, parent_path, try_path, options)
+                return extension.import_for(try_path, parent_dir, options)
               end
             end
           end
         end
 
-        Import.new(path)
+        # TODO: Raise an error from SassC here
+        raise ArgumentError.new("file not found: #{path}")
       end
 
       private
 
+      def extension_for_file(file)
+        EXTENSIONS.detect do |extension|
+          file.include? extension.postfix
+        end
+      end
+
       def record_import_as_dependency(path)
         context.depend_on path
       end
@@ -125,6 +139,39 @@ def context
       def load_paths
         options[:load_paths]
       end
+
+      def glob_imports(base, glob, current_file)
+        files = globbed_files(base, glob)
+        files = files.reject { |f| f == current_file }
+
+        files.map do |filename|
+          record_import_as_dependency(filename)
+          extension = extension_for_file(filename)
+          extension.import_for(filename, base, options)
+        end
+      end
+
+      def globbed_files(base, glob)
+        # TODO: Raise an error from SassC here
+        raise ArgumentError unless glob == "*" || glob == "**/*"
+
+        extensions = EXTENSIONS.map(&:postfix)
+        exts = extensions.map { |ext| Regexp.escape("#{ext}") }.join("|")
+        sass_re = Regexp.compile("(#{exts})$")
+
+        record_import_as_dependency(base)
+
+        files = Dir["#{base}/#{glob}"].sort.map do |path|
+          if File.directory?(path)
+            record_import_as_dependency(path)
+            nil
+          elsif sass_re =~ path
+            path
+          end
+        end
+
+        files.compact
+      end
     end
   end
 end

sassc-rails.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   # unfortunately we require sass for now, so that we can
   # reuse portions of the sprockets template
   spec.add_dependency 'sass'
-  spec.add_dependency "sassc", "1.1.1"
+  spec.add_dependency "sassc", "~> 1.1.2"
 
   spec.add_dependency "tilt"
 

test/dummy/app/assets/stylesheets/glob_test.scss

@@ -0,0 +1 @@
+@import "globbed/**/*";

test/dummy/app/assets/stylesheets/imports_test.scss

@@ -1,7 +1,7 @@
 @import "partials/css_sass_import";
 @import "partials/sass_import";
 @import "partials/scss_import";
-// //@import "globbed/**/*";
+@import "globbed/**/*";
 @import "subfolder/plain";
 @import "subfolder/second_level";
 @import "partials/without_css_ext";

test/sassc_rails_test.rb

@@ -133,9 +133,8 @@ def test_sass_imports_work_correctly
 
     assert_match /default-old-css/,          css_output
 
-    # skip for now
-    # assert_match /globbed/,                  css_output
-    # assert_match /nested-glob/,              css_output
+    assert_match /globbed/,                  css_output
+    assert_match /nested-glob/,              css_output
   end
 
   def test_style_config_item_is_defaulted_to_expanded_in_development_mode
@@ -198,41 +197,50 @@ def test_compression_works
   #  assert_match /\.import-css-application/, css_output
   #end
 
-  #test 'globbed imports work when new file is added' do
-  #  skip
+  def test_globbed_imports_work_when_globbed_file_is_changed
+    skip "This seems to work in practice, possible test setup problem"
 
-  #  project = 'scss_project'
-  #  filename = 'application.scss'
+    begin
+      initialize!
 
-  #  within_rails_app(project) do |tmpdir|
-  #    asset_output(filename)
+      new_file = File.join(File.dirname(__FILE__), 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
 
-  #    new_file = File.join(tmpdir, 'app', 'assets', 'stylesheets', 'globbed', 'new.scss')
-  #    File.open(new_file, 'w') do |file|
-  #      file.puts '.new-file-test { color: #000; }'
-  #    end
+      File.open(new_file, 'w') do |file|
+        file.puts '.new-file-test { color: #000; }'
+      end
 
-  #    css_output = asset_output(filename)
-  #    assert_match /new-file-test/, css_output
-  #  end
-  #end
+      css_output = render_asset("glob_test.scss")
+      assert_match /new-file-test/, css_output
 
-  #test 'globbed imports work when globbed file is changed' do
-  #  skip
+      File.open(new_file, 'w') do |file|
+        file.puts '.changed-file-test { color: #000; }'
+      end
 
-  #  project = 'scss_project'
-  #  filename = 'application.scss'
+      new_css_output = render_asset("glob_test.scss")
+      assert_match /changed-file-test/, new_css_output
+      refute_equal css_output, new_css_output
+    ensure
+      File.delete(new_file)
+    end
+  end
 
-  #  within_rails_app(project) do |tmpdir|
-  #    asset_output(filename)
+  def test_globbed_imports_work_when_globbed_file_is_added
+    begin
+      initialize!
 
-  #    new_file = File.join(tmpdir, 'app', 'assets', 'stylesheets', 'globbed', 'globbed.scss')
-  #    File.open(new_file, 'w') do |file|
-  #      file.puts '.changed-file-test { color: #000; }'
-  #    end
+      css_output = render_asset("glob_test.scss")
+      refute_match /changed-file-test/, css_output
+      new_file = File.join(File.dirname(__FILE__), 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
 
-  #    css_output = asset_output(filename)
-  #    assert_match /changed-file-test/, css_output
-  #  end
-  #end
+      File.open(new_file, 'w') do |file|
+        file.puts '.changed-file-test { color: #000; }'
+      end
+
+      new_css_output = render_asset("glob_test.scss")
+      assert_match /changed-file-test/, new_css_output
+      refute_equal css_output, new_css_output
+    ensure
+      File.delete(new_file)
+    end
+  end
 end