slinky 0.2.1 → 0.4.0

data/slinky.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slinky}
-  s.version = "0.2.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mwylde"]
-  s.date = %q{2011-04-21}
+  s.date = %q{2011-08-09}
   s.default_executable = %q{slinky}
   s.description = %q{A static file server for rich javascript apps that automatically compiles SASS, HAML, CoffeeScript and more}
   s.email = %q{mwylde@wesleyan.edu}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
     "Gemfile",
     "LICENSE.txt",
     "README.md",
@@ -27,12 +28,15 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/slinky",
     "lib/slinky.rb",
+    "lib/slinky/builder.rb",
     "lib/slinky/compiled_file.rb",
+    "lib/slinky/compilers.rb",
     "lib/slinky/compilers/coffee-compiler.rb",
     "lib/slinky/compilers/coffee-helper",
     "lib/slinky/compilers/haml-compiler.rb",
     "lib/slinky/compilers/sass-compiler.rb",
     "lib/slinky/em-popen3.rb",
+    "lib/slinky/manifest.rb",
     "lib/slinky/runner.rb",
     "lib/slinky/server.rb",
     "slinky.gemspec",
@@ -57,35 +61,50 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<eventmachine_httpserver>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<rainbow>, [">= 1.1.1"])
       s.add_runtime_dependency(%q<haml>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<sass>, [">= 3.1.1"])
       s.add_runtime_dependency(%q<coffee-script>, [">= 2.2.0"])
-      s.add_development_dependency(%q<bacon>, [">= 0"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
+      s.add_runtime_dependency(%q<yui-compressor>, [">= 0.9.6"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<cover_me>, [">= 1.0.0.rc6"])
+      s.add_development_dependency(%q<fakefs>, [">= 0"])
+      s.add_development_dependency(%q<em-http-request>, [">= 0"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0.12.0"])
       s.add_dependency(%q<eventmachine_httpserver>, [">= 0.2.0"])
       s.add_dependency(%q<rainbow>, [">= 1.1.1"])
       s.add_dependency(%q<haml>, [">= 3.0.0"])
+      s.add_dependency(%q<sass>, [">= 3.1.1"])
       s.add_dependency(%q<coffee-script>, [">= 2.2.0"])
-      s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<mime-types>, [">= 1.16"])
+      s.add_dependency(%q<yui-compressor>, [">= 0.9.6"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<cover_me>, [">= 1.0.0.rc6"])
+      s.add_dependency(%q<fakefs>, [">= 0"])
+      s.add_dependency(%q<em-http-request>, [">= 0"])
     end
   else
     s.add_dependency(%q<eventmachine>, [">= 0.12.0"])
     s.add_dependency(%q<eventmachine_httpserver>, [">= 0.2.0"])
     s.add_dependency(%q<rainbow>, [">= 1.1.1"])
     s.add_dependency(%q<haml>, [">= 3.0.0"])
+    s.add_dependency(%q<sass>, [">= 3.1.1"])
     s.add_dependency(%q<coffee-script>, [">= 2.2.0"])
-    s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<mime-types>, [">= 1.16"])
+    s.add_dependency(%q<yui-compressor>, [">= 0.9.6"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<cover_me>, [">= 1.0.0.rc6"])
+    s.add_dependency(%q<fakefs>, [">= 0"])
+    s.add_dependency(%q<em-http-request>, [">= 0"])
   end
 end
 

data/spec/slinky_spec.rb

@@ -1,7 +1,318 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'em-http'
 
 describe "Slinky" do
-  it "fails" do
-    should.flunk "hey buddy, you should probably rename this file and start specing for real"
+  context "Runner" do
+    it "should output help" do
+      $stdout.should_receive(:puts).with(/Usage: slinky/)
+      lambda { ::Slinky::Runner.new(["--help"]).run }.should raise_error SystemExit
+    end
+
+    it "should output a version" do
+      $stdout.should_receive(:puts).with(/slinky \d+\.\d+\.\d+/)
+      FakeFS.deactivate!
+      lambda { ::Slinky::Runner.new(["--version"]).run }.should raise_error SystemExit
+      FakeFS.activate!
+    end
+  end
+
+  context "Manifest" do
+    before :each do
+      @mprod = Slinky::Manifest.new("/src", :devel => false, :build_to => "/build")
+      @mdevel = Slinky::Manifest.new("/src")
+      @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"]
+    end
+
+    it "should build manifest with all files in fs" do
+      @mprod.files.collect{|f|
+        f.source
+      }.sort.should == @files.collect{|x| "/src/" + x}.sort
+      @mdevel.files.collect{|f|
+        f.source
+      }.sort.should == @files.collect{|x| "/src/" + x}.sort
+    end
+
+    it "should find files in the manifest by path" do
+      @mdevel.find_by_path("test.haml").source.should == "/src/test.haml"
+      @mdevel.find_by_path("asdf.haml").should == nil
+      @mdevel.find_by_path("l1/l2/test.txt").source.should == "/src/l1/l2/test.txt"
+      @mdevel.find_by_path("l1/test.css").source.should == "/src/l1/test.sass"
+    end
+
+    it "should produce the correct scripts string for production" do
+      @mprod.scripts_string.should == '<script type="text/javscript" src="/scripts.js"></script>'
+    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>'
+    end
+
+    it "should produce the correct styles string for production" do
+      @mprod.styles_string.should == '<link rel="stylesheet" href="/styles.css" />'
+    end
+
+    it "should produce the correct styles string for development" do
+      File.open("/src/l1/l2/bad.sass", "w+"){|f|
+        f.write "require('../test.sass')\ncolor: red;"
+      }
+      manifest = Slinky::Manifest.new("/src")
+      @mdevel.styles_string.should == '<link rel="stylesheet" href="l1/test.css" /><link rel="stylesheet" href="l1/l2/test2.css" />'
+    end
+
+    it "should allow the creation of ManifestFiles" do
+      mf = Slinky::ManifestFile.new("/src/test.haml", "", @mprod)
+    end
+
+    it "should correctly determine output_path" do
+      mf = Slinky::ManifestFile.new("/src/test.haml", "/src/build", @mprod)
+      mf.output_path.to_s.should == "/src/test.html"
+      mf = Slinky::ManifestFile.new("/src/l1/test.js", "/src/build", @mprod)
+      mf.output_path.to_s.should == "/src/l1/test.js"
+    end
+
+    it "should correctly determine relative_output_path" do
+      mf = Slinky::ManifestFile.new("/src/test.haml", "/src/build", @mprod)
+      mf.relative_output_path.to_s.should == "test.html"
+      mf = Slinky::ManifestFile.new("/src/l1/test.js", "/src/build", @mprod)
+      mf.relative_output_path.to_s.should == "l1/test.js"
+    end
+
+    it "should build tmp file without directives" do
+      original = "/src/test.haml"
+      mf = Slinky::ManifestFile.new("/src/test.haml", "/src/build", @mprod)
+      path = mf.handle_directives mf.source
+      File.read(original).match(/slinky_scripts|slinky_styles/).should_not == nil
+      File.read(path).match(/slinky_scripts|slinky_styles/).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)
+      build_path = mf.process mf.build_to
+      build_path.to_s.split(".")[-1].should == "html"
+      File.read("/src/test.haml").match("<head>").should == nil
+      File.read(build_path).match("<head>").should_not == nil
+
+      $stdout.should_receive(:puts).with("Compiled /src/test.haml".foreground(:green))
+      mf = Slinky::ManifestFile.new("/src/test.haml", "/src/build", @mprod)
+      build_path = mf.process "/src/build/test.html"
+      File.read("/src/build/test.html").match("<head>").should_not == nil
+    end
+
+    it "should report errors for bad files" do
+      File.open("/src/l1/l2/bad.sass", "w+"){|f|
+        f.write "color: red;"
+      }
+      $stderr.should_receive(:puts).with(/Failed on/)
+      mf = Slinky::ManifestFile.new("/src/l1/l2/bad.sass", "/src/build", @mprod)
+      build_path = mf.process
+      build_path.should == nil
+    end
+
+    it "shouldn't crash on syntax errors" do
+      File.open("/src/l1/asdf.haml", "w+"){|f|
+        f.write("%h1{:width => 50px}")
+      }
+      $stderr.should_receive(:puts).with(/Failed on/)
+      mf = Slinky::ManifestFile.new("/src/l1/asdf.haml", "/src/build", @mprod)
+      build_path = mf.process
+      build_path.should == nil
+    end
+
+    it "should properly determine build directives" do
+      mf = Slinky::ManifestFile.new("/src/test.haml", "/src/build", @mprod)
+      mf.find_directives.should == {:slinky_scripts => [], :slinky_styles => []}
+      mf = Slinky::ManifestFile.new("/src/l1/test.js", "/src/build", @mprod)
+      mf.find_directives.should == {:slinky_require => ["test2.js", "l2/test3.js"]}
+    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")
+      mf = Slinky::ManifestFile.new("/src/l1/test.js", "/src/build", @mprod)
+      mf.build_to.should == Pathname.new("/src/build/test.js")
+    end
+
+    it "should build both compiled files and non-compiled files" do
+      $stdout.should_receive(:puts).with("Compiled /src/test.haml".foreground(:green))
+      mf = Slinky::ManifestFile.new("/src/test.haml", "/src/build", @mprod)
+      path = mf.build
+      path.to_s.should == "/src/build/test.html"
+      File.read("/src/test.haml").match("<head>").should == nil
+      File.read(path).match("<head>").should_not == nil
+
+      $stdout.should_not_receive(:puts)
+      mf = Slinky::ManifestFile.new("/src/l1/l2/test.txt", "/src/build/l1/l2", @mprod)
+      path = mf.build
+      path.to_s.should == "/src/build/l1/l2/test.txt"
+      File.read("/src/build/l1/l2/test.txt").should == "hello\n"
+    end
+
+    it "should match files" do
+      mf = Slinky::ManifestFile.new("/src/l1/l2/test.txt", "/src/build/l1/l2", @mprod)
+      mf.matches?("test.txt").should == true
+      mf = Slinky::ManifestFile.new("/src/l1/test.sass", "", @prod)
+      mf.matches?("test.css").should == true
+      mf.matches?("test.sass").should == true
+    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"],
+         ["/src/l1/l2/test3.coffee", "/src/l1/test.js"],
+         ["/src/l1/test5.js", "/src/l1/test2.js"],
+         ["/src/l1/l2/test6.js", "/src/l1/l2/test3.coffee"]].sort
+    end
+
+    it "should fail if a required file isn't in the manifest" do
+      FileUtils.rm("/src/l1/test2.js")
+      manifest = Slinky::Manifest.new("/src", :devel => false, :build_to => "/build")
+      $stderr.should_receive(:puts).with("Could not find file test2.js required by /src/l1/test.js".foreground(:red))
+      proc {
+        manifest.build_dependency_graph
+      }.should raise_error Slinky::FileNotFoundError
+    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"]
+    end
+
+    it "should fail if there is a cycle in the dependency graph" do
+      File.open("/src/l1/test5.js", "w+"){|f| f.write("slinky_require('test.js')")}
+      manifest = Slinky::Manifest.new("/src", :devel => false, :build_to => "/build")
+      $stderr.should_receive(:puts).with("Dependencies /src/l1/test2.js -> /src/l1/test.js, /src/l1/test5.js -> /src/l1/test2.js, /src/l1/test.js -> /src/l1/test5.js could not be satisfied".foreground(:red))
+      proc { manifest.dependency_list }.should raise_error Slinky::DependencyError
+    end
+
+    it "should ignore the build directory" do
+      $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(6).times
+      Slinky::Builder.build("/src", "/src/build")
+      File.exists?("/src/build/build").should_not == true
+      File.exists?("/src/build/test.html").should == true
+      Slinky::Builder.build("/src", "/src/build")
+      File.exists?("/src/build/build").should_not == true
+    end
+
+    it "should combine and compress javascript" do
+      $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(3).times
+      @mprod.build
+      File.exists?("/build/scripts.js").should == true
+      File.size("/build/scripts.js").should > 90
+      File.read("/build/scripts.js").match('"Hello, world"').should_not == nil
+      File.exists?("/build/l1/test.js").should == false
+    end
+
+    it "should combine and compress css" do
+      $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(3).times
+      @mprod.build
+      File.exists?("/build/styles.css").should == true
+      File.size("/build/styles.css").should > 25
+      File.read("/build/styles.css").match(/color:red/).should_not == nil
+      File.exists?("/build/l1/test.css").should == false
+    end
+
+    it "should modify css urls to point to correct paths when compiled" do
+      $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(3).times
+      @mprod.build
+      css = File.read("/build/styles.css")
+      css.include?("url('/l1/asdf.png')").should == true
+      css.include?("url('l1/bg.png')").should == true
+      css.include?("url('l1/l2/l3/hello.png')").should == true
+    end
+  end
+
+  context "Server" do
+    before :each do
+      @resp = double("EventMachine::DelegatedHttpResponse")
+      @resp.stub(:content=){|c| @content = c}
+      @resp.stub(:content){ @content }
+    end
+
+    it "path_for_uri should work correctly" do
+      Slinky::Server.path_for_uri("http://localhost:124/test/hello/asdf.js?query=string&another").should == "test/hello/asdf.js"
+    end
+
+    it "should serve files" do
+      @resp.should_receive(:content_type).with(MIME::Types.type_for("/src/l1/test.js").first)
+      Slinky::Server.serve_file @resp, "/src/l1/test.js"
+      @resp.content.should == File.read("/src/l1/test.js")
+    end
+
+    it "should serve 404s" do
+      @resp.should_receive(:status=).with(404)
+      Slinky::Server.serve_file @resp, "/src/asdf/faljshd"
+      @resp.content.should == "File not found"
+    end
+
+    it "should handle static files" do
+      mf = Slinky::ManifestFile.new("/src/l1/l2/test.txt", nil, @mdevel)
+      @resp.should_receive(:content_type).with(MIME::Types.type_for("/src/l1/le/test.txt").first)
+      Slinky::Server.handle_file @resp, mf
+      @resp.content.should == File.read("/src/l1/l2/test.txt")
+    end
+
+    it "should handle compiled files" do
+      mf = Slinky::ManifestFile.new("/src/l1/test.sass", nil, @mdevel)
+      @resp.should_receive(:content_type).with(MIME::Types.type_for("test.css").first)
+      $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"), "")
+    end
+
+    it "should handle non-existant files" do
+      mf = Slinky::ManifestFile.new("/src/l1/asdf.txt", nil, @mdevel)
+      @resp.should_receive(:status=).with(404)
+      Slinky::Server.handle_file @resp, mf
+      @resp.content.should == "File not found"
+    end
+
+    it "should accept a port option" do
+      port = 53453
+      $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]).run
+      end
+    end
+
+    # it "should serve files for realz" do
+    #   $stdout.should_receive(:puts).with(/Started static file server on port 43453/)
+    #   @results = []
+    #   run_for 3 do
+    #     Slinky::Runner.new(["start","--port", "43453", "--src-dir", "/src"]).run
+    #     base = "http://localhost:43453"
+    #     multi = EventMachine::MultiRequest.new
+
+    #     # add multiple requests to the multi-handler
+    #     multi.add(EventMachine::HttpRequest.new("#{base}/index.html").get)
+    #     multi.add(EventMachine::HttpRequest.new(base).get)
+    #     multi.callback do
+    #       multi.responses[:succeeded].size.should == 2
+    #       multi.responses[:succeeded].each{|r|
+    #         $stderr.puts r.response
+    #         r.response.include?("hello").should == true
+    #       }
+    #       multi.responses[:failed].size.should == 0
+    #       EM.stop_event_loop
+    #     end
+    #   end
+    # end
+  end
+  context "Builder" do
+    before :each do
+      @compilation_subs = {".sass" => ".css", ".coffee" => ".js", ".haml" => ".html"}
+    end
+    it "should build manifest to build directory" do
+      $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(3).times
+      Slinky::Builder.build("/src", "/build")
+      File.exists?("/build").should == true
+      File.exists?("/build/scripts.js").should == true
+      File.exists?("/build/l1/l2/test.txt").should == true
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,116 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'slinky'
+require 'fakefs/safe'
+require 'fileutils'
+require 'open-uri'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+
+module FakeFS
+  class File
+    def self.absolute_path(*args)
+      RealFile.absolute_path(*args)
+    end
+  end
 end
-require 'bacon'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'static-runner'
 
-Bacon.summary_on_exit
+module Slinky
+  module CoffeeCompiler
+    def CoffeeCompiler::compile s, file
+      FakeFS.deactivate!
+      o = CoffeeScript::compile(s)
+      FakeFS.activate!
+      o
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before :all do
+    FakeFS.activate!
+    FileUtils.mkdir("/tmp")
+  end
+  config.before :each do
+    FileUtils.rm_rf("/src") rescue nil
+    FileUtils.mkdir("/src")
+    FileUtils.mkdir_p("/src/l1/l2/l3")
+    File.open("/src/test.haml", "w+"){|f|
+      f.write <<eos
+!!!5
+%head
+  slinky_scripts
+  slinky_styles
+  :plain
+    does this screw it up?
+%body
+  h1. hello
+eos
+    }
+
+    File.open("/src/l1/test.sass", "w+"){|f|
+      f.write <<eos
+h1
+  color: red
+  background-image: url("bg.png")
+eos
+    }
+
+    File.open("/src/l1/l2/test2.css", "w+"){|f|
+      f.write <<eos
+h2 { color: green; }
+div { background: url('/l1/asdf.png')}
+.something {background: url('l3/hello.png')}
+eos
+    }
+
+    File.open("/src/l1/test.js", "w+"){|f|
+      f.write <<eos
+slinky_require('test2.js')
+slinky_require("l2/test3.js")
+eos
+    }
+
+    File.open("/src/l1/test2.js", "w+"){|f|
+      f.write <<eos
+slinky_require('test5.js')
+eos
+    }
+
+    File.open("/src/l1/l2/test3.coffee", "w+"){|f|
+      f.write <<eos
+slinky_require('test6.js')
+test = {do: (x) -> console.log(x)}
+test.do("Hello, world")
+eos
+    }
+
+    File.open("/src/l1/test5.js", "w+").close()
+    File.open("/src/l1/l2/test6.js", "w+").close()
+
+    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"]
+
+  end
+
+  config.after :all do
+    FakeFS.deactivate!
+  end
+end
+
+def run_for secs
+  EM.run do
+    yield
+    EM.add_timer(secs) {
+      EM.stop_event_loop
+    }
+  end
+end
+