slinky 0.6.1 → 0.7.0

data/spec/slinky_spec.rb

@@ -53,7 +53,7 @@ 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>'
     end
 
     it "should produce the correct styles string for production" do
@@ -66,7 +66,7 @@ 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" />'
     end
 
     it "should allow the creation of ManifestFiles" do
@@ -111,6 +111,13 @@ describe "Slinky" do
       FileUtils.rm_rf("/src/build") rescue nil
     end
 
+    it "should give the proper error message for compilers with unmet dependencies" do
+      File.open("/src/test.fake", "w+"){|f| f.write("hello, fake data")}
+      $stderr.should_receive(:puts).with(/Missing dependency/)
+      mf = Slinky::ManifestFile.new("/src/test.fake", "/src/build", @mprod)
+      build_path = mf.process
+    end
+
     it "should report errors for bad files" do
       File.open("/src/l1/l2/bad.sass", "w+"){|f|
         f.write "color: red;"
@@ -284,11 +291,12 @@ describe "Slinky" do
 
     it "should ignore the build directory" do
       $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(6).times
-      Slinky::Builder.build("/src", "/src/build", @config)
+      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
-      Slinky::Builder.build("/src", "/src/build", @config)
-      File.exists?("/src/build/build").should_not == true
+      Slinky::Builder.build(options, @config)
+      File.exists?("/src/build/build").should == false
     end
 
     it "should combine and compress javascript" do
@@ -306,7 +314,7 @@ describe "Slinky" do
       @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.read("/build/styles.css").match(/color:\s*red/).should_not == nil
       File.exists?("/build/l1/test.css").should == false
     end
 
@@ -315,8 +323,8 @@ describe "Slinky" do
       @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
+      css.include?("url('/l1/bg.png')").should == true
+      css.include?("url('/l1/l2/l3/hello.png')").should == true
     end
   end
 
@@ -325,6 +333,7 @@ describe "Slinky" do
       @resp = double("EventMachine::DelegatedHttpResponse")
       @resp.stub(:content=){|c| @content = c}
       @resp.stub(:content){ @content }
+      @mdevel = Slinky::Manifest.new("/src", @config)      
     end
 
     it "path_for_uri should work correctly" do
@@ -362,11 +371,57 @@ describe "Slinky" do
       @resp.content.should == "File not found\n"
     end
 
+    it "should handle a global pushstate" do
+      config = <<eos
+pushstate:
+  "/": "/test.html"
+eos
+      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))
+      @resp.should_receive(:content_type).with("text/html").at_least(:once)
+      Slinky::Server.process_path @resp, "this/doesnt/exist.html"
+      @resp.content.include?("html").should == true
+    end
+
+    it "should not enter an infinite loop with a non-existant pushstate index" do
+      config = <<eos
+pushstate:
+  "/": "/notreal.html"
+eos
+      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)      
+      Slinky::Server.process_path @resp, "this/doesnt/exist.html"
+    end
+
+    it "should choose the more specific pushstate path when conflicts are present" do
+      config = <<eos
+pushstate:
+  "/": "/index.html"
+  "/hello": "/test.html"
+eos
+      File.open("/src/slinky.yaml", "w+"){|f| f.write config}
+      File.open("/src/index.html", "w+"){|f| f.write("goodbye")}
+      cr = Slinky::ConfigReader.from_file("/src/slinky.yaml")
+      Slinky::Server.config = cr
+      manifest = Slinky::Manifest.new("/src", cr)
+      Slinky::Server.manifest = manifest
+      @resp.should_receive(:content_type).with("text/html").at_least(:once)
+      Slinky::Server.process_path @resp, "hello/doesnt/exist.html"
+      @resp.content.include?("goodbye").should == true
+    end
+
     it "should accept a port option" do
       port = 53455
       $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
+        Slinky::Runner.new(["start","--port", port.to_s, "--no-livereload"]).run
       end
     end
 
@@ -384,7 +439,7 @@ describe "Slinky" do
 eos
       }
       run_for 3 do
-        Slinky::Runner.new(["start","--port", "43453", "--src-dir", "/src"]).run
+        Slinky::Runner.new(["start","--port", "43453", "--src-dir", "/src", "--no-livereload"]).run
         base = "http://localhost:43453"
         multi = EventMachine::MultiRequest.new
         $stdout.should_receive(:puts).with(/Compiled \/src\/index.haml/)
@@ -411,7 +466,8 @@ eos
     end
     it "should build manifest to build directory" do
       $stdout.should_receive(:puts).with(/Compiled \/src\/.+/).exactly(3).times
-      Slinky::Builder.build("/src", "/build", @config)
+      options = {:src_dir => "/src", :build_dir => "/build"}
+      Slinky::Builder.build(options, @config)
       File.exists?("/build").should == true
       File.exists?("/build/scripts.js").should == true
       File.exists?("/build/l1/l2/test.txt").should == true
@@ -427,6 +483,16 @@ proxy:
 ignore:
   - script/vendor
   - script/jquery.js
+port: 5555
+src_dir: "src/"
+build_dir: "build/"
+no_proxy: true
+no_livereload: true
+livereload_port: 5556
+dont_minify: true
+pushstate:
+  "/app1": "/index.html"
+  "/app2": "/index2.html"
 eos
       File.open("/src/slinky.yaml", "w+"){|f| f.write @config}
       @proxies = {
@@ -434,6 +500,10 @@ eos
         "/test2" => "http://127.0.0.1:7000"
       }
       @ignores = ["script/vendor", "script/jquery.js"]
+      @pushstates = {
+        "/app1" => "/index.html",
+        "/app2" => "/index2.html"
+      }
     end
 
     it "should be able to read configuration from strings" do
@@ -446,6 +516,14 @@ eos
       cr = Slinky::ConfigReader.from_file("/src/slinky.yaml")
       cr.proxies.should == @proxies
       cr.ignores.should == @ignores
+      cr.port.should == 5555
+      cr.src_dir.should == "src/"
+      cr.build_dir.should == "build/"
+      cr.no_proxy.should == true
+      cr.no_livereload.should == true
+      cr.livereload_port.should == 5556
+      cr.dont_minify.should == true
+      cr.pushstates.should == @pushstates
     end
 
     it "should be able to create the empty config" do
@@ -528,5 +606,6 @@ eos
       @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

@@ -31,6 +31,7 @@ module FakeFS
 end
 
 module Slinky
+  # The coffee script compiler doesn't work under FakeFS
   module CoffeeCompiler
     def CoffeeCompiler::compile s, file
       FakeFS.deactivate!
@@ -40,10 +41,30 @@ module Slinky
     end
   end
 
+  # This is necessary because require doesn't work with FakeFS
+  class Compilers
+    class << self
+      alias :get_old_cfile :get_cfile
+      def get_cfile *args
+        FakeFS.deactivate!
+        cfile = get_old_cfile *args
+        FakeFS.activate!
+        cfile
+      end
+    end
+  end
+
   # No way to make this work with FakeFS, so just disabled it
   class Listener
     def run; end
   end
+
+  module FakeCompiler
+    Compilers.register_compiler self,
+    :inputs => ["fake"],
+    :outputs =>["real"],
+    :dependencies => [["nonexistant_gem", ">= 9.9.9"]]
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slinky
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70362415712140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70362415712140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
-  requirement: &70362415725440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,31 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70362415725440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: em-websocket
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: em-proxy
-  requirement: &70362415723240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70362415723240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70362415720620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,76 +85,111 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70362415720620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70362415744280 !ruby/object:Gem::Requirement
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70362415744280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &70362415742500 !ruby/object:Gem::Requirement
+  name: yui-compressor
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70362415742500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: &70362415739720 !ruby/object:Gem::Requirement
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70362415739720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: &70362415751120 !ruby/object:Gem::Requirement
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70362415751120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: yui-compressor
-  requirement: &70362415759760 !ruby/object:Gem::Requirement
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70362415759760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
-  name: listen
-  requirement: &70362415757320 !ruby/object:Gem::Requirement
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70362415757320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70362415755100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +197,15 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70362415755100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70362415752880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,21 +213,31 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70362415752880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70362415767840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70362415767840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70362415765060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,21 +245,15 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70362415765060
-- !ruby/object:Gem::Dependency
-  name: cover_me
-  requirement: &70362415763620 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc6
-  type: :development
-  prerelease: false
-  version_requirements: *70362415763620
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70362415761540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +261,15 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70362415761540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70362415775780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,7 +277,12 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70362415775780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: A static file server for rich web apps that automatically compiles SASS,
   HAML, CoffeeScript and more
 email: micah@micahw.com
@@ -221,13 +306,15 @@ files:
 - lib/slinky/builder.rb
 - lib/slinky/compiled_file.rb
 - lib/slinky/compilers.rb
+- lib/slinky/compilers/clojurescript-compiler.rb
 - lib/slinky/compilers/coffee-compiler.rb
-- lib/slinky/compilers/coffee-helper
 - lib/slinky/compilers/haml-compiler.rb
+- lib/slinky/compilers/less-compiler.rb
 - lib/slinky/compilers/sass-compiler.rb
 - lib/slinky/config_reader.rb
 - lib/slinky/em-popen3.rb
 - lib/slinky/listener.rb
+- lib/slinky/live_reload.rb
 - lib/slinky/manifest.rb
 - lib/slinky/proxy_server.rb
 - lib/slinky/runner.rb
@@ -250,7 +337,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1657614552858671315
+      hash: 4080873917067961416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Static file server for javascript apps

data/lib/slinky/compilers/coffee-helper

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-coffee --compile --print $1 > $2