guard-sass 1.0.1 → 1.0.2

data/lib/guard/sass.rb

@@ -1,3 +1,4 @@
+require 'sass'
 require 'sass/plugin'
 
 require 'guard'
@@ -95,44 +96,22 @@ module Guard
       run_on_changes files.reject {|f| partial?(f) }
     end
 
-    def resolve_partials_to_owners(paths, depth = 0)
-      # If we get more than 10 levels of includes deep, we're probably in an
-      # import loop.
-      return run_all if depth > 10
-
+    def resolve_partials_to_owners(paths)
       # Get all files that might have imports
-      root = options[:input]
-      root += '/' unless root.end_with?('/')
-
-      partials  = paths.find_all {|f| partial?(f) }
-      paths    -= partials
-      sub_paths = partials.map {|p|
-        # Remove root, need relative paths
-        p.sub(/^#{root}/, '')
-      }.map {|p|
-        # Make version without underscores
-        [p, p.gsub(/(\/|^)_/, '\\1')]
-      }.map {|ps|
-        # For each of those, make a version with extensions
-        ps.map {|p|
-          [p, p.gsub(/\.s[ac]ss$/, '')]
-        }
-      }.flatten
-
-      # Search through all eligible files and find those we need to recompile
-      joined_paths = sub_paths.map {|p| Regexp.escape(p) }.join('|')
-      matcher = /@import.*(:?#{joined_paths})/
-      importing = files.find_all {|file| open(file, 'r').read.match(matcher) }
-      paths += importing
-
-      # If any of the matched files were partials, then go ahead and walk up the
-      # import tree
-      if paths.any? {|f| partial?(f) }
-        paths = resolve_partials_to_owners(paths, depth + 1)
+      search_files = Dir.glob("#{options[:input]}/**/*.s[ac]ss")
+      search_files = Watcher.match_files(self, search_files)
+
+      # Get owners
+      owners = search_files.select do |file|
+         # Get dependencies of file
+         deps = ::Sass::Engine.for_file(file, @options).dependencies.collect! {|dep| dep.options[:filename] }
+         # Find intersection with paths
+         deps_in_paths = deps.intersection paths
+         # Any paths in the dependencies?
+         !deps_in_paths.empty?
       end
-
       # Return our resolved set of paths to recompile
-      paths
+      owners
     end
 
     def run_with_partials(paths)

data/lib/guard/sass/runner.rb

@@ -75,17 +75,14 @@ module Guard
       # @param file [String] Path to sass/scss file to compile
       # @return [String] Compiled css.
       def compile(file)
-        content = IO.read(file)
-
         sass_options = {
-          :filename     => file,
-          :syntax       => file[-4..-1].to_sym,
           :load_paths   => options[:load_paths],
           :style        => options[:style],
           :debug_info   => options[:debug_info],
           :line_numbers => options[:line_numbers]
         }
-        ::Sass::Engine.new(content, sass_options).render
+
+        ::Sass::Engine.for_file(file, sass_options).render
       end
 
       # @param file [String]

data/lib/guard/sass/version.rb

@@ -1,5 +1,5 @@
 module Guard
   class SassVersion
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-sass
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard