sass-globbing 1.1.0.pre.0 → 1.1.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 191d169ded107c621388430015c6e73a9ec93a33
-  data.tar.gz: 58093b03a0eb68b661e7acca78a3a333d03ddb4a
+  metadata.gz: 9429ec43bc287105c36943ec75077ee795979cd7
+  data.tar.gz: bd981b679ea8b1fd7de4ca3e4e49ddef62855f88
 SHA512:
-  metadata.gz: 119d2347ac7dc0452a06580043a1479e48ced63a0bf1fdf3af31206b916b1796887e5736334ca607b1b70007b5e888bd3db8c54f90360933e382726c97794c7a
-  data.tar.gz: 7ef9d07c819dbf8ee302617133f3ed6fdd9a63be230cfc107fa1ccd792e8f6f88668dedb397281804aa001089d88edde361dbb592905984e97d0fc6a40f23469
+  metadata.gz: 2f03ed3f1887516df597c42a58e742bda41e334889d95dab8ac472bac4c8a2ce10d38626235fccae21d7ec8e266e552628c9449650257990969fc68521dcd4c4
+  data.tar.gz: c7307b7835e5099b0bc6d5fd059350e59318dc5ced0492e560c1b69844854b225575c34dbca161efa44058df779925d8aaa06e14f54deaeb5e85514e9e3d1cc3

data/lib/sass/globbing/importer.rb

@@ -24,7 +24,7 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
     SASS_EXTENSIONS[File.extname(filename.to_s)]
   end
   
-  def find_relative(name, base, options)
+  def find_relative(name, base, options, absolute = false)
     if name =~ GLOB
       contents = ""
       base = base.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
@@ -32,6 +32,9 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
       each_globbed_file(name, base_pathname, options) do |filename|
         contents << "@import #{Pathname.new(filename).relative_path_from(base_pathname.dirname).to_s.inspect};\n"
       end
+      if contents.empty? && !absolute
+        return nil
+      end
       contents = "/* No files to import found in #{comment_safe(name)} */" if contents.empty?
       Sass::Engine.new(contents, options.merge(
         :filename => base_pathname.to_s,
@@ -39,13 +42,15 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
         :syntax => :scss
       ))
     else
-      super
+      super(name, base, options)
     end
   end
   
   def find(name, options)
     if options[:filename] # globs must be relative
-      find_relative(name, options[:filename], options)
+      find_relative(name, options[:filename], options, true)
+    else
+      nil
     end
   end
   

data/lib/sass/globbing/monkey_patches.rb

@@ -5,8 +5,8 @@ class Sass::Engine
   
   def initialize(template, options={})
     old_initialize(template, options)
-    unless self.options[:load_paths].include?(Sass::Globbing::Importer.instance)
-      self.options[:load_paths].push Sass::Globbing::Importer.instance
-    end
+    self.options[:load_paths].delete(Sass::Globbing::Importer.instance) # in case it's there
+    self.options[:load_paths] << Sass::Globbing::Importer.instance
   end
 end
+

data/lib/sass/globbing/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Globbing
-    VERSION = "1.1.0.pre.0"
+    VERSION = "1.1.0.pre.1"
   end
 end

data/test/sass_globbing_test.rb

@@ -12,12 +12,15 @@ class SassGlobbingTest < Test::Unit::TestCase
 
 private
   def render_file(filename)
-    full_filename = File.expand_path("fixtures/#{filename}", File.dirname(__FILE__))
+    fixtures_dir = File.expand_path("fixtures", File.dirname(__FILE__))
+    full_filename = File.expand_path(filename, fixtures_dir)
     syntax = File.extname(full_filename)[1..-1].to_sym
-    Sass::Engine.new(File.read(full_filename),
-      :syntax => syntax,
-      :filename => full_filename,
-      :cache => false,
-      :read_cache => false).render
+    engine = Sass::Engine.new(File.read(full_filename),
+                              :syntax => syntax,
+                              :filename => full_filename,
+                              :cache => false,
+                              :read_cache => false,
+                              :load_paths => [fixtures_dir])
+    engine.render
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-globbing
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre.0
+  version: 1.1.0.pre.1
 platform: ruby
 authors:
 - Chris Eppstein