slinky 0.8.0 → 0.8.1

data/slinky.gemspec

@@ -2,19 +2,21 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: slinky 0.8.0 ruby lib
+# stub: slinky 0.8.1 ruby lib
+# stub: ext/transitive_closure/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "slinky"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   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-07-19"
+  s.date = "2014-11-07"
   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"]
+  s.extensions = ["ext/transitive_closure/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -29,6 +31,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/slinky",
+    "ext/transitive_closure/extconf.rb",
+    "ext/transitive_closure/transitive_closure.c",
     "lib/slinky.rb",
     "lib/slinky/builder.rb",
     "lib/slinky/compiled_file.rb",
@@ -47,6 +51,7 @@ Gem::Specification.new do |s|
     "lib/slinky/live_reload.rb",
     "lib/slinky/manifest.rb",
     "lib/slinky/proxy_server.rb",
+    "lib/slinky/pure_transitive_clsoure.rb",
     "lib/slinky/runner.rb",
     "lib/slinky/server.rb",
     "lib/slinky/templates/error.css",
@@ -75,21 +80,22 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<em-proxy>, ["~> 0.1"])
       s.add_runtime_dependency(%q<rainbow>, ["~> 1.1"])
       s.add_runtime_dependency(%q<mime-types>, ["~> 1.16"])
-      s.add_runtime_dependency(%q<yui-compressor>, ["~> 0.12"])
+      s.add_runtime_dependency(%q<uglifier>, ["~> 2.5"])
       s.add_runtime_dependency(%q<listen>, ["~> 2.4"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.1"])
-      s.add_runtime_dependency(%q<sass>, ["~> 3.1"])
+      s.add_runtime_dependency(%q<sass>, ["~> 3.3"])
       s.add_runtime_dependency(%q<coffee-script>, ["~> 2.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.10"])
       s.add_development_dependency(%q<yard>, ["~> 0.8"])
       s.add_development_dependency(%q<bundler>, ["~> 1.5"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
-      s.add_development_dependency(%q<fakefs>, ["~> 0.5"])
+      s.add_development_dependency(%q<fakefs>, ["= 0.5.3"])
       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"])
       s.add_development_dependency(%q<react-jsx>, ["~> 0.8.0"])
+      s.add_development_dependency(%q<rake-compiler>, ["~> 0.9.3"])
     else
       s.add_dependency(%q<multi_json>, ["~> 1.9.2"])
       s.add_dependency(%q<eventmachine>, ["~> 1.0"])
@@ -98,21 +104,22 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<em-proxy>, ["~> 0.1"])
       s.add_dependency(%q<rainbow>, ["~> 1.1"])
       s.add_dependency(%q<mime-types>, ["~> 1.16"])
-      s.add_dependency(%q<yui-compressor>, ["~> 0.12"])
+      s.add_dependency(%q<uglifier>, ["~> 2.5"])
       s.add_dependency(%q<listen>, ["~> 2.4"])
       s.add_dependency(%q<haml>, ["~> 3.1"])
-      s.add_dependency(%q<sass>, ["~> 3.1"])
+      s.add_dependency(%q<sass>, ["~> 3.3"])
       s.add_dependency(%q<coffee-script>, ["~> 2.2"])
       s.add_dependency(%q<rspec>, ["~> 2.10"])
       s.add_dependency(%q<yard>, ["~> 0.8"])
       s.add_dependency(%q<bundler>, ["~> 1.5"])
       s.add_dependency(%q<jeweler>, ["~> 1.8"])
-      s.add_dependency(%q<fakefs>, ["~> 0.5"])
+      s.add_dependency(%q<fakefs>, ["= 0.5.3"])
       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"])
       s.add_dependency(%q<react-jsx>, ["~> 0.8.0"])
+      s.add_dependency(%q<rake-compiler>, ["~> 0.9.3"])
     end
   else
     s.add_dependency(%q<multi_json>, ["~> 1.9.2"])
@@ -122,21 +129,22 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<em-proxy>, ["~> 0.1"])
     s.add_dependency(%q<rainbow>, ["~> 1.1"])
     s.add_dependency(%q<mime-types>, ["~> 1.16"])
-    s.add_dependency(%q<yui-compressor>, ["~> 0.12"])
+    s.add_dependency(%q<uglifier>, ["~> 2.5"])
     s.add_dependency(%q<listen>, ["~> 2.4"])
     s.add_dependency(%q<haml>, ["~> 3.1"])
-    s.add_dependency(%q<sass>, ["~> 3.1"])
+    s.add_dependency(%q<sass>, ["~> 3.3"])
     s.add_dependency(%q<coffee-script>, ["~> 2.2"])
     s.add_dependency(%q<rspec>, ["~> 2.10"])
     s.add_dependency(%q<yard>, ["~> 0.8"])
     s.add_dependency(%q<bundler>, ["~> 1.5"])
     s.add_dependency(%q<jeweler>, ["~> 1.8"])
-    s.add_dependency(%q<fakefs>, ["~> 0.5"])
+    s.add_dependency(%q<fakefs>, ["= 0.5.3"])
     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"])
     s.add_dependency(%q<react-jsx>, ["~> 0.8.0"])
+    s.add_dependency(%q<rake-compiler>, ["~> 0.9.3"])
   end
 end
 

data/spec/compilers_spec.rb

@@ -48,6 +48,13 @@ eos
         s.include?("color: red;") && s.include?("h1 a")
       }
     end
+
+    it "should not compile partials" do
+      src = "body { color: $something; }"
+      compiler_test("/compilers/_partial.scss", ".css", src){|s|
+        s == ""
+      }
+    end
   end
 
   context "LessCompiler" do

data/spec/manifest_spec.rb

@@ -33,7 +33,6 @@ describe "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
@@ -55,8 +54,8 @@ describe "Manifest" do
     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/test6.js"></script>',        
         '<script type="text/javascript" src="/l1/l2/test3.js"></script>',
         '<script type="text/javascript" src="/l1/test.js"></script>'].join("\n")
     end
@@ -156,6 +155,14 @@ describe "Manifest" do
       mf.find_directives.should == {:slinky_require => ["test2.js", "l2/test3.js"]}
     end
 
+    it "should properly find depends directives" do
+      File.open("/src/depends.sass", "w+") {|f|
+        f.write('// slinky_depends("/something.sass")')
+      }
+      mf = Slinky::ManifestFile.new("/src/depends.sass", "/src/build", @mprod)
+      mf.find_directives.should == {:slinky_depends => ["/something.sass"]}
+    end
+
     it "should properly determine build_to path" do
       mf = Slinky::ManifestFile.new("/src/test.haml", "/src/build", @mprod)
       mf.build_to.should == Pathname.new("/src/build/test.html")
@@ -226,7 +233,7 @@ describe "Manifest" do
     end
 
     it "should build a correct dependency list" do
-      @mprod.dependency_list.collect{|x| x.source}.should == ["/src/test.haml", "/src/l1/test.sass", "/src/l1/test5.js", "/src/l1/l2/test.txt", "/src/l1/l2/test2.css", "/src/l1/l2/test6.js", "/src/l1/l2/l3/test2.txt", "/src/l1/test2.js", "/src/l1/l2/test3.coffee", "/src/l1/test.js"]
+      @mprod.dependency_list.collect{|x| x.source}.should == ["/src/test.haml", "/src/l1/test5.js", "/src/l1/test2.js", "/src/l1/l2/test6.js", "/src/l1/l2/test3.coffee", "/src/l1/test.js", "/src/l1/test.sass", "/src/l1/l2/test.txt", "/src/l1/l2/test2.css", "/src/l1/l2/l3/test2.txt"]
     end
 
     it "should fail if there is a cycle in the dependency graph" do
@@ -245,6 +252,22 @@ describe "Manifest" do
       f.process
     end
 
+    it "should handle external depends directives" do
+      Dir.mkdir("/external")
+      File.open("/external/file.js", "w+"){|f| f.write("Hello!") }
+      File.open("/src/l1/test5.coffee", "w+"){|f| f.write("slinky_depends_external('../external/*.js')")}
+      manifest = Slinky::Manifest.new("/src", @config, :devel => true)
+      f = manifest.find_by_path("l1/test5.js").first
+      f.should_not == nil
+      f.external_dependencies.should == ["/external/file.js"]
+      f.external_dependencies_updated?.should == true
+
+      $stdout.should_receive(:puts).with(/Compiled \/src\/l1\/test5.coffee/)
+      f.process
+
+      f.external_dependencies_updated?.should == false
+    end
+
     it "should handle depends directives with glob patterns" do
       File.open("/src/l1/test5.coffee", "w+"){|f| f.write("slinky_depends('*.sass')")}
       File.open("/src/l1/test2.sass", "w+"){|f| f.write("body\n\tcolor: red")}
@@ -257,6 +280,18 @@ describe "Manifest" do
       f.process
     end
 
+    it "should handle depends directives with **" do
+      File.open("/src/l1/test5.coffee", "w+"){|f| f.write("slinky_depends('/l1/**/*.sass')")}
+      File.open("/src/l1/l2/test5.sass", "w+"){|f| f.write("body\n\tcolor: red")}
+      manifest = Slinky::Manifest.new("/src", @config, :devel => true)
+      f = manifest.find_by_path("l1/test5.js").first
+      f.should_not == nil
+      $stdout.should_receive(:puts).with(/Compiled \/src\/l1\/test.sass/)
+      $stdout.should_receive(:puts).with(/Compiled \/src\/l1\/l2\/test5.sass/)
+      $stdout.should_receive(:puts).with(/Compiled \/src\/l1\/test5.coffee/)
+      f.process
+    end
+    
     it "should handle depends directives with infinite loops" do
       File.open("/src/l1/test5.coffee", "w+"){|f| f.write("slinky_depends('*.sass')")}
       File.open("/src/l1/test2.sass", "w+"){|f| f.write("/* slinky_depends('*.coffee')")}
@@ -311,7 +346,6 @@ eos
     end
 
     it "should detect new files" do
-      $stdout.should_receive(:puts).with(/Compiled \/src\/test.haml/)
       manifest = Slinky::Manifest.new("/src", @config, :devel => true)
       File.open("/src/l1/cache.coffee", "w+"){|f| f.write("console.log 'hello'")}
       manifest.add_all_by_path(["/src/l1/cache.coffee"])
@@ -326,7 +360,6 @@ eos
 
     it "should handle deletion of files" do
       File.open("/src/l1/cache.coffee", "w+"){|f| f.write("console.log 'hello'")}
-      $stdout.should_receive(:puts).with(/Compiled \/src\/test.haml/)
       manifest = Slinky::Manifest.new("/src", @config, :devel => true)
       f = manifest.find_by_path("l1/cache.coffee").first
       f.should_not == nil
@@ -444,6 +477,32 @@ eos
 
       File.read("/build/styles.css").include?("IGNORE!!!").should == false
     end
+
+    it "should recompile files when files they depend on change" do
+      $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(4).times
+
+      File.open("/src/l1/depender.scss", "w+"){|f|
+        f.write("// slinky_depends('/l1/_dependee.scss')\n")
+        f.write("@import \"dependee\";\n")
+        f.write("body { color: $bodycolor }\n")
+      }
+      File.open("/src/l1/_dependee.scss", "w+"){|f|
+        f.write("$bodycolor: red;\n")
+      }
+      mdevel = Slinky::Manifest.new("/src", @config)
+
+      mf = mdevel.find_by_path("/l1/depender.scss").first
+      path = mf.process
+      File.read(path).should match /color: red/
+
+      File.open("/src/l1/_dependee.scss", "w+"){|f|
+        f.write("$bodycolor: green;\n")
+      }
+
+      mf = mdevel.find_by_path("/l1/depender.scss").first
+      path = mf.process
+      File.read(path).should match /color: green/
+    end
   end
 
   context "FindByPattern" do

data/spec/slinky_spec.rb

@@ -4,6 +4,7 @@ require 'em-http'
 describe "Slinky" do
   context "Runner" do
     it "should output help" do
+      $stdout.should_receive(:puts).with(/slinky \d+\.\d+\.\d+/)
       $stdout.should_receive(:puts).with(/Usage: slinky/)
       lambda { ::Slinky::Runner.new(["--help"]).run }.should raise_error SystemExit
     end
@@ -120,6 +121,7 @@ eos
 
     it "should accept a port option" do
       port = 53455
+      $stdout.should_receive(:puts).with(/slinky \d+\.\d+\.\d+/)
       $stdout.should_receive(:puts).with(/Started static file server on port #{port}/)
       run_for 0.3 do
         Slinky::Runner.new(["start","--port", port.to_s, "--no-livereload"]).run
@@ -135,6 +137,7 @@ eos
     end
 
     it "should serve files for realz" do
+      $stdout.should_receive(:puts).with(/slinky \d+\.\d+\.\d+/)
       $stdout.should_receive(:puts).with(/Started static file server on port 43453/)
       @results = []
       File.open("/src/index.haml", "w+"){|f|
@@ -189,7 +192,7 @@ eos
       @config = <<eos
 proxy:
   "/test1": "http://127.0.0.1:8000"
-  "/test2": "http://127.0.0.1:7000"
+  "/test2": "http://127.0.0.1:7000/"
 ignore:
   - script/vendor
   - script/jquery.js
@@ -214,7 +217,7 @@ eos
       File.open("/src/slinky.yaml", "w+"){|f| f.write @config}
       @proxies = {
         "/test1" => "http://127.0.0.1:8000",
-        "/test2" => "http://127.0.0.1:7000"
+        "/test2" => "http://127.0.0.1:7000/"
       }
       @ignores = ["script/vendor", "script/jquery.js"]
       @pushstates = {
@@ -262,7 +265,7 @@ eos
     before :each do
       @config = <<eos
 proxy:
-  "/test1": "http://127.0.0.1:8000"
+  "/test1": "http://127.0.0.1:8000/"
   "/test2/": "http://127.0.0.1:7000"
 eos
       @cr = Slinky::ConfigReader.new(@config)
@@ -276,7 +279,7 @@ eos
       @proxies.map{|x|
         [x[0], x[1].to_s]
       }.should ==
-        [["/test1", URI::parse("http://127.0.0.1:8000").to_s],
+        [["/test1", URI::parse("http://127.0.0.1:8000/").to_s],
          ["/test2/", URI::parse("http://127.0.0.1:7000").to_s]]
     end
 
@@ -288,7 +291,7 @@ eos
     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[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/"
@@ -332,5 +335,19 @@ eos
       @proxies[0][1].to_s.should == "http://127.0.0.1:6000"
       @proxies[0][2].should == {"lag" => 1000}
     end
+
+    it "should properly rewrite slashes for '/'" do
+      config = <<eos
+proxy:
+  "/": "http://127.0.0.1:6000/"
+eos
+      cr = Slinky::ConfigReader.new(config)
+      proxies = Slinky::ProxyServer.process_proxies(cr.proxy)
+
+      data = "GET /hello HTTP/1.1\r\nHost:127.0.0.1:8000\r\n\r\n\n" 
+      path = data.match(Slinky::ProxyServer::HTTP_MATCHER)[2]
+      p2 = Slinky::ProxyServer.rewrite_path(path, proxies[0])
+      p2.should == "/hello"
+    end
   end
 end

data/spec/spec_helper.rb

@@ -76,6 +76,12 @@ module FakeFS
 end
 
 module Slinky
+  class Runner
+    def version
+      "0.8.0"
+    end
+  end
+
   # The coffee script compiler doesn't work under FakeFS
   module CoffeeCompiler
     def CoffeeCompiler::compile s, file
@@ -112,16 +118,10 @@ module Slinky
     end
   end
 
-  # Compressors don't work under FakeFS
-  class FakeCompressor
-    def compress s
-      s
-    end
-  end
-
   class Manifest
     def compressor_for_product product
-      FakeCompressor.new
+      # Compressors don't work under FakeFS
+      lambda{|s| s}
     end
   end
 
@@ -209,8 +209,10 @@ eos
     File.open("/src/l1/l2/test.txt", "w+"){|f| f.write("hello\n") }
     File.open("/src/l1/l2/l3/test2.txt", "w+"){|f| f.write("goodbye\n") }
 
-      @files = ["test.haml", "l1/test.js", "l1/test.sass", "l1/l2/test2.css", "l1/l2/test.txt", "l1/l2/l3/test2.txt", "l1/test2.js", "l1/l2/test3.coffee", "l1/test5.js", "l1/l2/test6.js"]
-
+    @files = ["test.haml", "l1/test.js", "l1/test.sass",
+              "l1/l2/test2.css", "l1/l2/test.txt", "l1/l2/l3/test2.txt",
+              "l1/test2.js", "l1/l2/test3.coffee", "l1/test5.js",
+              "l1/l2/test6.js"]
   end
 
   config.after :all do