sass-globbing 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c378b666e5d54cced56b405bd79948a6d70b4ae
-  data.tar.gz: 34c8c623a7e574f97423c4d6fa0ace8b8300c8f0
+  metadata.gz: 865d10a42fbe093a517f11ea886c98c8fcd150f4
+  data.tar.gz: aa7655463f75ff566929a97a9ef4ad2655cc501a
 SHA512:
-  metadata.gz: 7d1902277f44ff1d7956bb150c5a44e6cfa847f65e47ec6f651172ea5de12daf8ca60c08ee6209ea73b75643c40162767171c06e46126131e3240e8d6a04d717
-  data.tar.gz: 9a6d2369524d29dc41c46d4ab1b1498d1a9672133d35386ec89f7e6196249c27ba1ecf91f42935523688d9b0946462e2e0436b67e719fb2c12e1d2258b5ff57b
+  metadata.gz: fd3eca7d7dcd91c986078afdecbced4ceea735f4b0d7a76bdae136783db2680aeb2351535fb3a456b9879bcbd055974e76c19f96e93524d08ff7048baa9c25f1
+  data.tar.gz: 894d0bd2a62d6c1344e01fa03b34684f9a1b4e7f11506dee982b5741027060232b7d94f906d6a566362adaf0a1563e39b2ed42842f59ccd91ce7de922bcfbdd6

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 1.1.1
+
+* Fix importing issues when using import-once with sass-globbing
+* Fix mtime checks so that globs don't force recompiles of unchanged
+  sass files.
+
 # 1.1.0
 
 * Add the ability for a glob to not match any files. Instead a css

data/Gemfile

@@ -4,4 +4,4 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rake'
-gem 'sass', :path => "/Users/chris/Projects/sass"
+gem 'sass'

data/lib/sass/globbing/importer.rb

@@ -24,23 +24,9 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
     SASS_EXTENSIONS[File.extname(filename.to_s)]
   end
   
-  def find_relative(name, base, options, absolute = false)
+  def find_relative(name, base, options)
     if name =~ GLOB
-      contents = ""
-      base = base.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
-      base_pathname = Pathname.new(base)
-      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,
-        :importer => self,
-        :syntax => :scss
-      ))
+      find_glob(name, base, options) { nil }
     else
       super(name, base, options)
     end
@@ -48,7 +34,11 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
   
   def find(name, options)
     if options[:filename] # globs must be relative
-      find_relative(name, options[:filename], options, true)
+      if name =~ GLOB
+        find_glob(name, options[:filename], options) { "/* No files to import found in #{comment_safe(name)} */" }
+      else
+        super(name, options)
+      end
     else
       nil
     end
@@ -64,7 +54,12 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
   def mtime(name, options)
     if name =~ GLOB && options[:filename]
       mtime = nil
-      each_globbed_file(name, Pathname.new(options[:filename]), options) do |p|
+      base_pathname = Pathname.new(options[:filename])
+      name_pathname = Pathname.new(name)
+      if name_pathname.absolute?
+        name = name_pathname.relative_path_from(base_pathname.dirname).to_s
+      end
+      each_globbed_file(name, base_pathname, options) do |p|
         if mtime.nil?
           mtime = File.mtime(p)
         else
@@ -85,8 +80,23 @@ class Sass::Globbing::Importer < Sass::Importers::Filesystem
 
   protected
 
+  def find_glob(name, base, options)
+    contents = ""
+    base = base.gsub(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
+    base_pathname = Pathname.new(base)
+    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
+    contents = yield if contents.empty?
+    return nil if contents.nil? || contents.empty?
+    Sass::Engine.new(contents, options.merge(
+      :filename => base_pathname.dirname.join(Pathname.new(name)).to_s,
+      :importer => self,
+      :syntax => :scss
+    ))
+  end
+
   def comment_safe(string)
     string.gsub(%r{\*/}, "*\\/")
   end
-  
 end

data/lib/sass/globbing/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Globbing
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-globbing
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Chris Eppstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Allows use of globs in Sass @import directives.