slinky 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 889ff2fbc318014fa07dc0a6b6ec58f6836e8154
-  data.tar.gz: e9ae1e023ceeb1f07ce8c8950f279a52d1f6e048
+  metadata.gz: b1e4131531f13a7e59d8af244621759990a0e195
+  data.tar.gz: c8fc44e9a92a3344c896b6aec2ace9eec058e552
 SHA512:
-  metadata.gz: 4b072781ffd19338d0685a2bf3cd0d25545343ec88d92de5aa3463afbcf992b23034639ad3792efe47a510d6db371fbd2d6cc9a4c2e9cc2078bae9d3cd98b513
-  data.tar.gz: 9ea118ef3f70d8708fa85547029ffec8023b798e09ca8dc701111927c634bdb0a96ad8ec660070bcada4c6933dd83dc06faab7e6462024884bb6cd08fee938de
+  metadata.gz: 23db4994117d3d0a118ae014920f15a84848fd9239e3f8fa012fd378ba02ee8d745a0bdca8018bfd3546284f04031759724dbd6589f97e46e78302c754a74bb7
+  data.tar.gz: bdbf6cf9ada64a30b0044a8c363638588ebcda0c048a7228a7ba7566507074c02a191df588d713934ea728338dece776616a88272cbaae778d2786eb2ad39c5a

data/Gemfile

@@ -22,4 +22,8 @@ group :development do
   gem "jeweler", "~> 1.8"
   gem "fakefs", '~> 0.5', :require => "fakefs/safe"
   gem "em-http-request", '~> 1.0'
+  gem 'simplecov'
+  # optional compilation gems
+  gem "less", ">= 2.2.0"
+  gem "therubyracer" # for less
 end

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/slinky/compiled_file.rb

@@ -4,7 +4,7 @@ module Slinky
   class CompiledFile
     attr_accessor :source, :print_name, :output_path
     attr_reader :last_compiled, :output_ext
-    
+
     # Creates a new CompiledFile, compiling the provided source file
     # with the provided compiler class.
     def initialize source, compiler, output_ext
@@ -36,7 +36,7 @@ module Slinky
         out = File.open @source do |f|
           @compiler.compile f.read, @source
         end
-        
+
         compile_succeeded
         File.open(path, "w+") do |f|
           f.write out

data/lib/slinky/compilers/sass-compiler.rb

@@ -6,7 +6,10 @@ module Slinky
       :dependencies => [["sass", ">= 3.1.1"]]
 
     def SassCompiler::compile s, file
-      sass_engine = Sass::Engine.new(s, :load_paths => [File.dirname(file)])
+      syntax = file.end_with?(".sass") ? :sass : :scss
+      sass_engine = Sass::Engine.new(s,
+                                     :syntax => syntax,
+                                     :load_paths => [File.dirname(file)])
       sass_engine.render
     end
   end

data/lib/slinky/compilers.rb

@@ -2,7 +2,7 @@ require 'set'
 
 module Slinky
   EXTENSION_REGEX = /(.+)\.(\w+)/
-  
+
   class Compilers
     @compilers = []
     @compilers_by_ext = {}
@@ -50,7 +50,7 @@ module Slinky
           end
         }
       end
-      
+
       # Produces a CompiledFile for an input file if the file needs to
       # be compiled, or nil otherwise. Note that path is the path of
       # the compiled file, so script.js not script.coffee.

data/lib/slinky/config_reader.rb

@@ -1,60 +1,77 @@
 module Slinky
-  class ConfigReader
-    def self.from_file path
-      new File.open(path).read
-    end
+  # Raised when reading an invalid configuraiton
+  class InvalidConfigError < StandardError; end
 
-    def self.empty
-      new "{}"
-    end
-
-    def initialize string
-      @config = YAML::load(string)
-    end
-
-    def proxies
-      @config["proxy"] || {}
-    end
+  class ConfigReader
+    HASH_TYPE = "hash"
+    ARRAY_TYPE = "array"
+    STRING_TYPE = "string"
+    NUMBER_TYPE = "number"
+    BOOL_TYPE = "bool"
+    ANY_TYPE = "any"
 
-    def ignores
-      @config["ignore"] || []
+    class ConfigEntry
+      attr_reader :type, :name, :default
+      def initialize(name, type, default)
+        @name = name
+        @type = type
+        @default = default
+      end
     end
 
-    def port
-      @config["port"] || 5323
-    end
+    @entries = [
+      ConfigEntry.new("proxy", HASH_TYPE, {}),
+      ConfigEntry.new("ignore", ARRAY_TYPE, []),
+      ConfigEntry.new("port", NUMBER_TYPE, 5323),
+      ConfigEntry.new("src_dir", STRING_TYPE, "."),
+      ConfigEntry.new("build_dir", STRING_TYPE, "."),
+      ConfigEntry.new("no_proxy", BOOL_TYPE, false),
+      ConfigEntry.new("no_livereload", BOOL_TYPE, false),
+      ConfigEntry.new("livereload_port", NUMBER_TYPE, 35729),
+      ConfigEntry.new("dont_minify", BOOL_TYPE, false),
+      ConfigEntry.new("pushstate", ANY_TYPE, []),
+    ]
 
-    def src_dir
-      @config["src_dir"] || "."
-    end
+    @entries.each{|e|
+      self.class_eval %{
+        def #{e.name}
+          @config["#{e.name}"] || #{e.default.inspect}
+        end
+      }
+    }
 
-    def build_dir
-      @config["build_dir"] || "build"
+    def self.from_file path
+      new File.open(path).read
     end
 
-    def no_proxy
-      @config["no_proxy"] || false
-    end
-    
-    def no_livereload
-      @config["no_livereload"] || false
+    def self.empty
+      new "{}"
     end
 
-    def livereload_port
-      @config["livereload_port"] || 35729
-    end
+    # Validates whether a supplied hash is well-formed according to
+    # the allowed entries
+    def self.validate config
+      entries = {}
+      @entries.each{|e| entries[e.name] = e}
+      errors = config.map{|k, v|
+        if !entries[k]
+          " * '#{k}' is not an allowed configuration key"
+        end
+      }.compact
 
-    def dont_minify
-      @config["dont_minify"] || false
+      if !errors.empty?
+        raise InvalidConfigError.new(errors.join("\n"))
+      end
     end
 
-    def pushstates
-      @config["pushstate"]
+    def initialize string
+      @config = YAML::load(string)
+      ConfigReader.validate(@config)
     end
 
     def pushstate_for_path path
-      if pushstates && pushstates.is_a?(Hash)
-        p = pushstates.sort_by{|from, to| -from.count("/")}.find{|a|
+      if pushstate && pushstate.is_a?(Hash)
+        p = pushstate.sort_by{|from, to| -from.count("/")}.find{|a|
           path.start_with? a[0]
         }
         p[1] if p

data/lib/slinky/em-popen3.rb

@@ -22,16 +22,16 @@ module EventMachine
     EM.attach rd, Popen3StderrHandler, connection
     connection
   end
-  
+
   class Popen3StderrHandler < EventMachine::Connection
     def initialize(connection)
       @connection = connection
     end
-    
+
     def receive_data(data)
       @connection.receive_stderr(data)
     end
-  end  
+  end
 end
 
 class ProcessHandler < EventMachine::Connection  
@@ -48,7 +48,7 @@ class ProcessHandler < EventMachine::Connection
   def receive_stderr data 
     @stderr << data
   end
-  
+
   def unbind
     @cb.call @stdout.join(''), @stderr.join(''), get_status if @cb
   end

data/lib/slinky/listener.rb

@@ -8,11 +8,14 @@ module Slinky
     end
 
     def run
+      manifest_md5 = @manifest.md5
       listener = Listen.to(@manifest.dir) do |mod, add, rem|
-        handle_mod(mod) if mod.size > 0
-        handle_add(add) if add.size > 0
 
         EM.next_tick {
+          handle_mod(mod) if mod.size > 0
+          handle_add(add) if add.size > 0
+          handle_rem(rem) if rem.size > 0
+          
           files = (mod + add + rem).map{|path|
             mpath = Pathname.new(path)\
               .relative_path_from(Pathname.new(@manifest.dir).expand_path).to_s
@@ -23,34 +26,28 @@ module Slinky
               path
             end
           }
-          @livereload.reload_browser(files)
-        } if @livereload
 
-        handle_rem(rem) if rem.size > 0        
+          # only reload if something's actually changed
+          if manifest_md5 != @manifest.md5
+            manifest_md5 = @manifest.md5
+            @livereload.reload_browser(files)
+          end
+        } if @livereload
       end
       listener.start
       listener
     end
 
     def handle_mod files
+      @manifest.update_all_by_path files rescue nil
     end
-    
+
     def handle_add files
-      EM.next_tick {
-        begin
-          @manifest.add_all_by_path files
-        rescue
-        end
-      }
+      @manifest.add_all_by_path files rescue nil
     end
 
     def handle_rem files
-      EM.next_tick {
-        begin
-          @manifest.remove_all_by_path files
-        rescue
-        end
-      }
+      @manifest.remove_all_by_path files rescue nil
     end
   end
 end

data/lib/slinky/live_reload.rb

@@ -17,7 +17,6 @@ module Slinky
                                     EventMachine::WebSocket::Connection, {}) do |ws|
             ws.onopen do
               begin
-                $stdout.puts "Browser connected to livereload server"
                 ws.send "!!ver:1.6"
                 @websockets << ws
               rescue
@@ -27,7 +26,6 @@ module Slinky
 
             ws.onclose do
               @websockets.delete ws
-              $stdout.puts "Browser disconnected"
             end
           end
           $stdout.puts "Started live-reload server on port #{@port}"

data/lib/slinky/manifest.rb

@@ -22,7 +22,7 @@ module Slinky
   # Raised when there is a cycle in the dependency graph (i.e., file A
   # requires file B which requires C which requires A)
   class DependencyError < StandardError; end
-  
+
   class Manifest
     attr_accessor :manifest_dir, :dir
 
@@ -50,7 +50,7 @@ module Slinky
       if include_ignores
         @files
       else
-        @files.reject{|f| @config.ignores.any?{|p| f.in_tree? p}}
+        @files.reject{|f| @config.ignore.any?{|p| f.in_tree? p}}
       end
     end
 
@@ -62,14 +62,23 @@ module Slinky
       end
     end
 
+    # Notifies of an update to a file in the manifest
+    def update_all_by_path paths
+      manifest_update paths do |path|
+        md = find_by_path(File.dirname(path)).first
+        if mf = find_by_path(path).first
+          mf.parent.remove_file(mf)
+        end
+        md.add_file(File.basename(path))
+      end
+    end
+
     # Removes a file from the manifest
     def remove_all_by_path paths
       manifest_update paths do |path|
         mf = find_by_path(path).first()
-        begin
+        if mf
           mf.parent.remove_file(mf)
-        rescue
-          puts "Failed to remove <#{path}>"
         end
       end
     end
@@ -86,9 +95,9 @@ module Slinky
 
     def scripts_string
       if @devel
-        dependency_list.reject{|x| x.output_path.extname != ".js"}.collect{|d|
+        dependency_list.reject{|x| x.output_path.extname != ".js" }.collect{|d|
           %Q\<script type="text/javascript" src="/#{d.relative_output_path}"></script>\
-        }.join("")
+        }.join("\n")
       else
         %Q\<script type="text/javascript" src="/scripts.js?#{rand(999999999)}"></script>\
       end
@@ -113,7 +122,7 @@ module Slinky
         scripts.collect{|s| FileUtils.rm(s.build_to)}
       end
     end
-    
+
     def compress_scripts
       compressor = YUI::JavaScriptCompressor.new(:munge => false)
       compress(".js", "#{@build_to}/scripts.js", compressor)
@@ -134,7 +143,7 @@ module Slinky
       if @devel
         dependency_list.reject{|x| x.output_path.extname != ".css"}.collect{|d|
           %Q\<link rel="stylesheet" href="/#{d.relative_output_path}" />\
-        }.join("")
+        }.join("\n")
       else
         %Q\<link rel="stylesheet" href="/styles.css?#{rand(999999999)}" />\
       end
@@ -202,6 +211,18 @@ module Slinky
       end
     end
 
+    # Returns a md5 encompassing the current state of the manifest.
+    # Any change to the manifest should produce a different hash.
+    # This can be used to determine if the manifest has changed.
+    def md5
+      if @md5
+        @md5
+      else
+        @md5 = Digest::MD5.hexdigest(files.map{|f| [f.source, f.md5]}
+                                      .sort.flatten.join(":"))
+      end
+    end
+
     private
     def files_rec md
       @files += md.files
@@ -213,6 +234,7 @@ module Slinky
     def invalidate_cache
       @files = nil
       @dependency_graph = nil
+      @md5 = nil
     end
 
     def manifest_update paths
@@ -305,15 +327,20 @@ module Slinky
         md
       end
     end
-    
+
     # Adds a file on the filesystem to the manifest
     #
     # @param String path The path of the file
     def add_file path
       file = File.basename(path)
-      full_path = [@dir, file].join(File::SEPARATOR)
-      if File.exists? full_path
+      full_path = Pathname.new(@dir).join(file).to_s
+      if File.exists?(full_path) && !file.start_with?(".")
         mf = ManifestFile.new(full_path, @build_dir, @manifest, self)
+        # we don't want two files with the same source
+        extant_file = @files.find{|f| f.source == mf.source}
+        if extant_file
+          @files.delete(extant_file)
+        end
         @files << mf
         mf
       end
@@ -325,7 +352,7 @@ module Slinky
     def remove_file mf
       @files.delete(mf)
     end
-    
+
     def build
       unless File.directory?(@build_dir.to_s)
         FileUtils.mkdir(@build_dir.to_s)
@@ -397,11 +424,10 @@ module Slinky
     # Predicate which determines whether the file is the supplied path
     # or lies on supplied tree
     def in_tree? path
-      return true if matches? path
-      abs_path = Pathname.new(path).expand_path.to_s
-      asdf = Pathname.new(@source).dirname.expand_path.to_s
-      # puts [abs_path, asdf, asdf.start_with?(abs_path), abs_path == asdf].inspect
-      asdf.start_with?(abs_path)
+      full_path = @manifest.dir + "/" + path
+      abs_path = Pathname.new(full_path).expand_path.to_s
+      dir = Pathname.new(@source).dirname.expand_path.to_s
+      dir.start_with?(abs_path) || abs_path == @source
     end
 
     # Returns the path to which this file should be output. This is
@@ -418,6 +444,11 @@ module Slinky
       end
     end
 
+    # returns the source path relative to the manifest directory
+    def relative_source_path
+      Pathname.new(@source).relative_path_from Pathname.new(@manifest.dir)
+    end
+
     # Returns the output path relative to the manifest directory
     def relative_output_path
       output_path.relative_path_from Pathname.new(@manifest.dir)
@@ -495,7 +526,7 @@ module Slinky
     # @param String path to which the file should be compiled
     #
     # @return String the path of the processed file, ready for serving
-    def process to = nil
+    def process to = nil, should_compile = true
       return if @processing # prevent infinite recursion
       start_time = Time.now
       hash = md5
@@ -522,7 +553,8 @@ module Slinky
         @last_md5 = hash
         @updated = Time.now
         # mangle file appropriately
-        @last_path = handle_directives((compile @source), to)
+        f = should_compile ? (compile @source) : @source
+        @last_path = handle_directives(f, to)
       end
     end
 

data/lib/slinky/proxy_server.rb

@@ -2,7 +2,7 @@ module Slinky
   module ProxyServer
     HTTP_MATCHER = /(GET|POST|PUT|DELETE|HEAD) (.+?)(?= HTTP)/
     HOST_MATCHER = /Host: (.+)/
-    
+
     def self.process_proxies proxy_hash
       proxy_hash.map{|from, h|
         begin
@@ -23,7 +23,7 @@ module Slinky
     end
 
     def self.rewrite_path path, proxy
-      path.gsub(/^#{proxy[0]}/, "")      
+      path.gsub(/^#{proxy[0]}/, "")
     end
 
     def self.replace_path http, old_path, new_path, addition

data/lib/slinky/runner.rb

@@ -19,11 +19,18 @@ module Slinky
       @arguments = @argv
 
       config_path = @options[:config] || "#{@options[:src_dir] || "."}/slinky.yaml"
-      @config = if File.exist?(config_path) 
-                  ConfigReader.from_file(config_path)
-                else
-                  ConfigReader.empty
-                end
+      begin
+        @config = if File.exist?(config_path) 
+                    ConfigReader.from_file(config_path)
+                  else
+                    ConfigReader.empty
+                  end
+      rescue InvalidConfigError => e
+        $stderr.puts("The configuration file at #{config_path} is invalid:".foreground(:red))
+        $stderr.puts(e.message.foreground(:red))
+        exit(1)
+      end
+        
     end
 
     def version
@@ -72,9 +79,9 @@ module Slinky
         port = @options[:port] || @config.port
 
         should_proxy = !(@config.no_proxy || @options[:no_proxy])
-        if !@config.proxies.empty? && should_proxy
+        if !@config.proxy.empty? && should_proxy
           server = EM::start_server "127.0.0.1", port+1, Slinky::Server
-          ProxyServer.run(@config.proxies, port, port+1)
+          ProxyServer.run(@config.proxy, port, port+1)
         else
           EM::start_server "127.0.0.1", port, Slinky::Server
         end

data/lib/slinky/server.rb

@@ -42,16 +42,13 @@ module Slinky
         path += "/index.html"
       end
 
-      resp.content_type MIME::Types.type_for(path).first
+      resp.content_type MIME::Types.type_for(path).first.to_s
 
       if file
-        if file.source.end_with?(path)
-          # They're requesting the source file and we should just
-          # return it
-          serve_file(resp, file.source)
-        else
-          handle_file(resp, file)
-        end
+        # They're requesting the source file and we should not
+        # compile it (but still process directives)
+        compile = !(file.source.end_with?(path) && file.source)
+        handle_file(resp, file, compile)
       elsif !pushstate && p = config.pushstate_for_path("/" + path)
         path = p[0] == "/" ? p[1..-1] : p
         self.process_path(resp, path, true)
@@ -62,9 +59,9 @@ module Slinky
     end
 
     # Takes a manifest file and produces a response for it
-    def self.handle_file resp, mf
+    def self.handle_file resp, mf, compile = true
       begin
-        if path = mf.process
+        if path = mf.process(nil, compile)
           serve_file resp, path.to_s
         else
           raise StandardError.new

data/slinky.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: slinky 0.7.1 ruby lib
+# stub: slinky 0.7.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "slinky"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Micah Wylde"]
-  s.date = "2014-03-30"
+  s.date = "2014-04-10"
   s.description = "A static file server for rich web apps that automatically compiles SASS, HAML, CoffeeScript and more"
   s.email = "micah@micahw.com"
   s.executables = ["slinky"]
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
     "lib/slinky/runner.rb",
     "lib/slinky/server.rb",
     "slinky.gemspec",
+    "spec/compilers_spec.rb",
     "spec/slinky_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -76,6 +77,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
       s.add_development_dependency(%q<fakefs>, ["~> 0.5"])
       s.add_development_dependency(%q<em-http-request>, ["~> 1.0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<less>, [">= 2.2.0"])
+      s.add_development_dependency(%q<therubyracer>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, ["~> 1.0"])
       s.add_dependency(%q<eventmachine_httpserver>, ["~> 0.2"])
@@ -94,6 +98,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.8"])
       s.add_dependency(%q<fakefs>, ["~> 0.5"])
       s.add_dependency(%q<em-http-request>, ["~> 1.0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<less>, [">= 2.2.0"])
+      s.add_dependency(%q<therubyracer>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, ["~> 1.0"])
@@ -113,6 +120,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.8"])
     s.add_dependency(%q<fakefs>, ["~> 0.5"])
     s.add_dependency(%q<em-http-request>, ["~> 1.0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<less>, [">= 2.2.0"])
+    s.add_dependency(%q<therubyracer>, [">= 0"])
   end
 end
 

data/spec/compilers_spec.rb

@@ -0,0 +1,93 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'em-http'
+
+def compiler_test file, ext, src, &test
+  File.open(file, "w+"){|f| f.write(src)}
+  cf = Slinky::Compilers.cfile_for_file(file)
+  called_back = false
+
+  $stdout.should_receive(:puts).with("Compiled #{file}".foreground(:green))  
+
+  cf.compile{|cpath, _, _, error|
+    error.should == nil
+    cpath.nil?.should == false
+    cpath.end_with?(ext).should == true
+    test.call(File.open(cpath).read).should == true
+    called_back = true
+  }
+
+  called_back.should == true
+end
+
+describe "Compilers" do
+  before :each do
+    FileUtils.rm_rf("/compilers") rescue nil
+    FileUtils.mkdir("/compilers")
+  end
+
+  context "SassCompiler" do
+    it "should be able to compile SASS files" do
+      src = <<eos
+h1
+  color: red
+eos
+      compiler_test("/compilers/test.sass", ".css", src){|s|
+        s.include?("color: red;")
+      }
+    end
+
+    it "should be able to compile SCSS files" do
+      src = <<eos
+h1 {
+  a {
+    color: red;
+  }
+}
+eos
+      compiler_test("/compilers/test.scss", ".css", src){|s|
+        s.include?("color: red;") && s.include?("h1 a")
+      }
+    end
+  end
+
+  context "LessCompiler" do
+    it "should be able to compile LESS files" do
+      src = <<eos
+@width: 0.5;
+
+.class {
+  width: percentage(@width);
+}
+eos
+      compiler_test("/compilers/test.less", ".css", src){|s|
+        s.include?("width: 50%;")
+      }
+    end
+  end
+
+  context "CoffeeCompiler" do
+    it "should be able to compile .coffee files" do
+      src = <<eos
+test = {do: (x) -> console.log(x)}
+test.do("Hello, world")
+eos
+      compiler_test("/compilers/test.coffee", ".js", src){|s|
+        s.include?("function(x) {")
+      }
+    end
+  end
+
+  context "HamlCompiler" do
+    it "should be able to compile .haml files" do
+      src = <<eos
+!!!5
+%head
+  %title Hello!
+%body
+eos
+      compiler_test("/compilers/test.haml", ".html", src){|s|
+        s.include?("<title>Hello!</title>")
+      }
+    end
+  end
+end

data/spec/slinky_spec.rb

@@ -23,7 +23,7 @@ describe "Slinky" do
       @md_prod = @mprod.manifest_dir
       @md_devel = @mdevel.manifest_dir
     end
-    
+
     it "should build manifest dir with all files in current dir" do
       @md_prod.files.collect{|f| f.source}.should == ["/src/test.haml"]
       @md_devel.files.collect{|f| f.source}.should == ["/src/test.haml"]
@@ -38,6 +38,21 @@ describe "Slinky" do
       }.sort.should == @files.collect{|x| "/src/" + x}.sort
     end
 
+    it "should not include dot files" do
+      File.open("/src/.index.haml.swp", "w+"){|f| f.write("x")}
+      manifest = Slinky::Manifest.new("/src", @config)
+      manifest.files.map{|x| x.source}.include?("/src/.index.haml.swp").should == false
+    end
+
+    it "should be able to compute a hash for the entire manifest" do
+      m = @mdevel
+      hash1 = m.md5
+      File.open("/src/hello.html", "w+") {|f| f.write("Hell!") }
+      $stdout.should_receive(:puts).with("Compiled /src/test.haml".foreground(:green)).exactly(2).times
+      m.add_all_by_path(["/src/hello.html"])
+      m.md5.should_not == hash1
+    end
+
     it "should find files in the manifest by path" do
       @mdevel.find_by_path("test.haml").first.source.should == "/src/test.haml"
       @mdevel.find_by_path("asdf.haml").first.should == nil
@@ -53,7 +68,12 @@ describe "Slinky" do
     end
 
     it "should produce the correct scripts string for devel" do
-      @mdevel.scripts_string.should == '<script type="text/javascript" src="/l1/test5.js"></script><script type="text/javascript" src="/l1/l2/test6.js"></script><script type="text/javascript" src="/l1/test2.js"></script><script type="text/javascript" src="/l1/l2/test3.js"></script><script type="text/javascript" src="/l1/test.js"></script>'
+      @mdevel.scripts_string.should == [
+        '<script type="text/javascript" src="/l1/test5.js"></script>',
+        '<script type="text/javascript" src="/l1/l2/test6.js"></script>',
+        '<script type="text/javascript" src="/l1/test2.js"></script>',
+        '<script type="text/javascript" src="/l1/l2/test3.js"></script>',
+        '<script type="text/javascript" src="/l1/test.js"></script>'].join("\n")
     end
 
     it "should produce the correct styles string for production" do
@@ -66,7 +86,9 @@ describe "Slinky" do
         f.write "require('../test.sass')\ncolor: red;"
       }
       manifest = Slinky::Manifest.new("/src", @config)
-      @mdevel.styles_string.should == '<link rel="stylesheet" href="/l1/test.css" /><link rel="stylesheet" href="/l1/l2/test2.css" />'
+      @mdevel.styles_string.should == [
+        '<link rel="stylesheet" href="/l1/test.css" />',
+        '<link rel="stylesheet" href="/l1/l2/test2.css" />'].join("\n")
     end
 
     it "should allow the creation of ManifestFiles" do
@@ -95,6 +117,14 @@ describe "Slinky" do
       File.read(path).match(/slinky_scripts|slinky_styles/).should == nil
     end
 
+    it "should build tmp file without directives for .js" do
+      original = "/src/l1/test.js"
+      mf = Slinky::ManifestFile.new("/src/l1/test.js", "/src/build", @mprod)
+      path = mf.handle_directives mf.source
+      File.read(original).match(/slinky_require/).should_not == nil
+      File.read(path).match(/slinky_require/).should == nil
+    end
+
     it "should compile files that need it" do
       $stdout.should_receive(:puts).with("Compiled /src/test.haml".foreground(:green))
       mf = Slinky::ManifestFile.new("/src/test.haml", "/src/build", @mprod)
@@ -175,6 +205,15 @@ describe "Slinky" do
       mf.matches?("test.sass").should == true
     end
 
+    it "should should properly determine if in tree" do
+      mf = Slinky::ManifestFile.new("/src/l1/l2/test.txt", "/src/build/l1/l2", @mprod)
+      mf.in_tree?("/l1").should == true
+      mf.in_tree?("/l1/l2").should == true
+      mf.in_tree?("/l1/l2/test.txt").should == true
+      mf.in_tree?("/l1/l3").should == false
+      mf.in_tree?("test.txt").should == false
+    end
+
     it "should correctly build the dependency graph" do
       @mprod.build_dependency_graph.collect{|x| x.collect{|y| y.source}}.sort.should ==
         [["/src/l1/test2.js", "/src/l1/test.js"],
@@ -246,7 +285,7 @@ describe "Slinky" do
       f.process
       File.open("/src/l1/cache.coffee", "a"){|f| f.write("() -> 'goodbye, world!'\n")}
       $stdout.should_receive(:puts).with(/Compiled \/src\/l1\/cache.coffee/)
-      f.process      
+      f.process
     end
 
     it "should handle new directives" do
@@ -280,18 +319,18 @@ describe "Slinky" do
       f = manifest.find_by_path("l1/cache.coffee").first
       f.should_not == nil
       manifest.scripts_string.match("l1/cache.js").should_not == nil
-      
+
       FileUtils.rm("/src/l1/cache.coffee")
       File.exists?("/src/l1/cache.coffee").should == false
       manifest.remove_all_by_path(["/src/l1/cache.coffee"])
       f = manifest.find_by_path("l1/cache.coffee").first
       f.should == nil
-      manifest.scripts_string.match("l1/cache.js").should == nil      
+      manifest.scripts_string.match("l1/cache.js").should == nil
     end
 
     it "should ignore the build directory" do
       $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(6).times
-      options = {:src_dir => "/src", :build_dir => "/src/build"}      
+      options = {:src_dir => "/src", :build_dir => "/src/build"}
       Slinky::Builder.build(options, @config)
       File.exists?("/src/build/build").should_not == true
       File.exists?("/src/build/test.html").should == true
@@ -326,6 +365,75 @@ describe "Slinky" do
       css.include?("url('/l1/bg.png')").should == true
       css.include?("url('/l1/l2/l3/hello.png')").should == true
     end
+
+    it "should properly filter out ignores in files list" do
+      config = Slinky::ConfigReader.new("ignore:\n  - /l1/test2.js")
+      config.ignore.should == ["/l1/test2.js"]
+      mdevel = Slinky::Manifest.new("/src", config)
+      mfiles = mdevel.files(false).map{|x| x.source}.sort
+      files = (@files - ["l1/test2.js"]).map{|x| "/src/" + x}.sort
+      mfiles.should == files
+      # double check
+      mfiles.include?("/src/l1/test2.js").should == false
+    end
+
+    it "should properly filter out relative ignores in files list" do
+      config = Slinky::ConfigReader.new("ignore:\n  - l1/test2.js")
+      config.ignore.should == ["l1/test2.js"]
+      mdevel = Slinky::Manifest.new("/src", config)
+      mfiles = mdevel.files(false).map{|x| x.source}.sort
+      files = (@files - ["l1/test2.js"]).map{|x| "/src/" + x}.sort
+      mfiles.should == files
+      # double check
+      mfiles.include?("/src/l1/test2.js").should == false
+    end
+
+    it "should properly filter out directory ignores in files list" do
+      config = Slinky::ConfigReader.new("ignore:\n  - /l1/l2")
+      config.ignore.should == ["/l1/l2"]
+      mdevel = Slinky::Manifest.new("/src", config)
+      mfiles = mdevel.files(false).map{|x| x.source}.sort
+      files = (@files.reject{|x| x.start_with?("l1/l2")}).map{|x| "/src/" + x}.sort
+      mfiles.should == files
+    end
+
+    it "should properly handle ignores for scripts" do
+      File.open("/src/l1/l2/ignore.js", "w+"){|f| f.write("IGNORE!!!")}
+      config = Slinky::ConfigReader.new("ignore:\n  - /l1/l2/ignore.js")
+      config.ignore.should == ["/l1/l2/ignore.js"]
+
+      mdevel = Slinky::Manifest.new("/src", config)
+      mdevel.scripts_string.scan(/src=\"(.+?)\"/).flatten.
+        include?("/l1/l2/ignore.js").should == false
+
+      mprod = Slinky::Manifest.new("/src", config, :devel => false,
+                                   :build_to => "/build")
+
+      $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(3).times      
+      mprod.build
+
+      File.read("/build/scripts.js").include?("IGNORE!!!").should == false
+      File.exists?("/build/l1/l2/ignore.js").should == true
+    end
+
+    it "should properly handle ignores for styles" do
+      File.open("/src/l1/l2/ignore.css", "w+"){|f| f.write("IGNORE!!!")}
+      config = Slinky::ConfigReader.new("ignore:\n  - /l1/l2/ignore.css")
+      config.ignore.should == ["/l1/l2/ignore.css"]
+
+      mdevel = Slinky::Manifest.new("/src", config)
+      mdevel.styles_string.scan(/href=\"(.+?)\"/).flatten.
+        include?("/l1/l2/ignore.css").should == false
+
+      mprod = Slinky::Manifest.new("/src", config, :devel => false,
+                                   :build_to => "/build")
+
+      $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(3).times      
+      mprod.build
+
+      File.read("/build/styles.css").include?("IGNORE!!!").should == false
+      File.exists?("/build/l1/l2/ignore.css").should == true
+    end
   end
 
   context "Server" do
@@ -333,7 +441,7 @@ describe "Slinky" do
       @resp = double("EventMachine::DelegatedHttpResponse")
       @resp.stub(:content=){|c| @content = c}
       @resp.stub(:content){ @content }
-      @mdevel = Slinky::Manifest.new("/src", @config)      
+      @mdevel = Slinky::Manifest.new("/src", @config)
     end
 
     it "path_for_uri should work correctly" do
@@ -362,11 +470,19 @@ describe "Slinky" do
       @resp.content.should == File.read("/src/l1/l2/test.txt")
     end
 
+    it "should serve the processed version of static files" do
+      Slinky::Server.manifest = @mdevel
+      @resp.should_receive(:content_type).with("application/javascript").at_least(:once)
+      Slinky::Server.process_path @resp, "/l1/test.js"
+      File.read("/src/l1/test.js").match("slinky_require").should_not == nil
+      @resp.content.match("slinky_require").should == nil
+    end
+
     it "should handle compiled files" do
       mf = Slinky::ManifestFile.new("/src/l1/test.sass", nil, @mdevel)
       $stdout.should_receive(:puts).with("Compiled /src/l1/test.sass".foreground(:green))
       Slinky::Server.handle_file @resp, mf
-      @resp.content.should == Slinky::SassCompiler::compile(File.read("/src/l1/test.sass"), "")
+      @resp.content.should == Slinky::SassCompiler::compile(File.read("/src/l1/test.sass"), "/src/l1/test.sass")
     end
 
     it "should handle non-existant files" do
@@ -381,8 +497,8 @@ describe "Slinky" do
 pushstate:
   "/": "/test.html"
 eos
-      File.open("/src/slinky.yaml", "w+"){|f| f.write config}      
-      cr = Slinky::ConfigReader.from_file("/src/slinky.yaml") 
+      File.open("/src/slinky.yaml", "w+"){|f| f.write config}
+      cr = Slinky::ConfigReader.from_file("/src/slinky.yaml")
       Slinky::Server.config = cr
       Slinky::Server.manifest = @mdevel
       $stdout.should_receive(:puts).with("Compiled /src/test.haml".foreground(:green))
@@ -396,12 +512,12 @@ eos
 pushstate:
   "/": "/notreal.html"
 eos
-      File.open("/src/slinky.yaml", "w+"){|f| f.write config}      
-      cr = Slinky::ConfigReader.from_file("/src/slinky.yaml") 
+      File.open("/src/slinky.yaml", "w+"){|f| f.write config}
+      cr = Slinky::ConfigReader.from_file("/src/slinky.yaml")
       Slinky::Server.config = cr
       Slinky::Server.manifest = @mdevel
       @resp.should_receive(:status=).with(404)
-      @resp.should_receive(:content_type).with("text/html").at_least(:once)      
+      @resp.should_receive(:content_type).with("text/html").at_least(:once)
       Slinky::Server.process_path @resp, "this/doesnt/exist.html"
     end
 
@@ -456,7 +572,7 @@ eos
         base = "http://localhost:43453"
         multi = EventMachine::MultiRequest.new
         $stdout.should_receive(:puts).with(/Compiled \/src\/index.haml/)
-        
+
         # add multiple requests to the multi-handler
         multi.add(:index, EventMachine::HttpRequest.new("#{base}/index.html").get)
         multi.add(:base, EventMachine::HttpRequest.new(base).get)
@@ -521,14 +637,14 @@ eos
 
     it "should be able to read configuration from strings" do
       cr = Slinky::ConfigReader.new(@config)
-      cr.proxies.should == @proxies
-      cr.ignores.should == @ignores
+      cr.proxy.should == @proxies
+      cr.ignore.should == @ignores
     end
 
     it "should be able to read configuration from files" do
       cr = Slinky::ConfigReader.from_file("/src/slinky.yaml")
-      cr.proxies.should == @proxies
-      cr.ignores.should == @ignores
+      cr.proxy.should == @proxies
+      cr.ignore.should == @ignores
       cr.port.should == 5555
       cr.src_dir.should == "src/"
       cr.build_dir.should == "build/"
@@ -536,12 +652,21 @@ eos
       cr.no_livereload.should == true
       cr.livereload_port.should == 5556
       cr.dont_minify.should == true
-      cr.pushstates.should == @pushstates
+      cr.pushstate.should == @pushstates
     end
 
     it "should be able to create the empty config" do
-      Slinky::ConfigReader.empty.proxies.should == {}
-      Slinky::ConfigReader.empty.ignores.should == []
+      Slinky::ConfigReader.empty.proxy.should == {}
+      Slinky::ConfigReader.empty.ignore.should == []
+    end
+
+    it "should error on invalid configuration" do
+      config = <<eos
+invalid:
+  -script/vendor
+eos
+      proc { Slinky::ConfigReader.new(config) }
+        .should raise_error Slinky::InvalidConfigError
     end
   end
 
@@ -553,7 +678,7 @@ proxy:
   "/test2/": "http://127.0.0.1:7000"
 eos
       @cr = Slinky::ConfigReader.new(@config)
-      @proxies = Slinky::ProxyServer.process_proxies(@cr.proxies)
+      @proxies = Slinky::ProxyServer.process_proxies(@cr.proxy)
       @data = <<eos
 GET /test1/something/and?q=asdf&c=E9oBiwFqZmoJam9uYXNmdXAyclkLEj0KABoMQ29ja3RhaWxJbXBsIzAFchIaA2Z0cyAAKgkaB3doaXNrZXkkS1IPd2VpZ2h0ZWRBdmFyYWdlWAJMDAsSDENvY2t0YWlsSW1wbCIGNDYtODE3DHIeGg93ZWlnaHRlZEF2YXJhZ2UgACoJIQAAAAAAAAAAggEA4AEAFA HTTP/1.1\r\nHost: 127.0.0.1:8888\nConnection: keep-alive\r\nX-Requested-With: XMLHttpRequest\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_1) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/16.0.904.0 Safari/535.7\r\nAccept: */*\r\nReferer: http://localhost:5323/\r\nAccept-Encoding: gzip,deflate,sdch\r\nAccept-Language: en-US,en;q=0.8\r\nAccept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3\r\nCookie: mp_super_properties=%7B%22all%22%3A%20%7B%22%24initial_referrer%22%3A%20%22http%3A//localhost%3A5323/%22%2C%22%24initial_referring_domain%22%3A%20%22localhost%3A5323%22%7D%2C%22events%22%3A%20%7B%7D%2C%22funnels%22%3A%20%7B%7D%7D\r\n\r\n
 eos
@@ -571,16 +696,16 @@ eos
       Slinky::ProxyServer.process_proxy_servers(@proxies).should ==
         [["127.0.0.1", 8000], ["127.0.0.1", 7000]]
     end
-    
+
     it "should find the correct matcher for a request" do
       p = Slinky::ProxyServer.find_matcher(@proxies, "/test1/this/is/another")
       p[0].should == "/test1"
       p[1].to_s.should == "http://127.0.0.1:8000"
-      
+
       p = Slinky::ProxyServer.find_matcher(@proxies, "/test2/whatsgoing.html?something=asdf")
       p[0].should == "/test2/"
       p[1].to_s.should == "http://127.0.0.1:7000"
-      
+
       Slinky::ProxyServer.find_matcher(@proxies, "/asdf/test1/asdf").should == nil
       Slinky::ProxyServer.find_matcher(@proxies, "/test2x/asdf").should == nil
     end
@@ -613,12 +738,11 @@ proxy:
     lag: 1000
 eos
       @cr = Slinky::ConfigReader.new(@config)
-      @proxies = Slinky::ProxyServer.process_proxies(@cr.proxies)
+      @proxies = Slinky::ProxyServer.process_proxies(@cr.proxy)
 
       @proxies[0][0].should == "/test3"
       @proxies[0][1].to_s.should == "http://127.0.0.1:6000"
       @proxies[0][2].should == {"lag" => 1000}
     end
-    
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+require 'simplecov'
+SimpleCov.start
+
 require 'bundler/setup'
 require 'rspec'
 require 'slinky'
@@ -102,7 +105,7 @@ module Slinky
       s
     end
   end
-  
+
   class Manifest
     alias :old_compress :compress
     def compress ext, output, compressor
@@ -113,7 +116,7 @@ module Slinky
       end
     end
   end
-  
+
   # No way to make this work with FakeFS, so just disabled it
   class Listener
     def run; end
@@ -130,9 +133,11 @@ end
 RSpec.configure do |config|
   config.before :all do
     FakeFS.activate!
+    FileUtils.rm_rf("/tmp") rescue nil
     FileUtils.mkdir("/tmp")
     @config = Slinky::ConfigReader.empty
   end
+
   config.before :each do
     FakeFS.activate!
     FileUtils.rm_rf("/src") rescue nil
@@ -171,6 +176,7 @@ eos
       f.write <<eos
 slinky_require('test2.js')
 slinky_require("l2/test3.js")
+console.log("Hello!");
 eos
     }
 
@@ -211,4 +217,3 @@ def run_for secs
     }
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slinky
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Micah Wylde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -248,6 +248,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: less
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A static file server for rich web apps that automatically compiles SASS,
   HAML, CoffeeScript and more
 email: micah@micahw.com
@@ -285,6 +327,7 @@ files:
 - lib/slinky/runner.rb
 - lib/slinky/server.rb
 - slinky.gemspec
+- spec/compilers_spec.rb
 - spec/slinky_spec.rb
 - spec/spec_helper.rb
 homepage: http://mwylde.github.com/slinky/