slinky 0.4.0 → 0.4.1

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "eventmachine", ">= 0.12.0"
 gem "eventmachine_httpserver", ">= 0.2.0"
+gem "em-proxy", ">= 0.1.5"
 gem "rainbow", ">= 1.1.1"
 gem "haml", ">= 3.0.0"
 gem "sass", ">= 3.1.1"

data/bin/slinky

@@ -2,7 +2,7 @@
 
 root = File.expand_path(File.dirname(__FILE__))
 
-#require "#{root}/../lib/slinky"
-require 'slinky'
+require "#{root}/../lib/slinky"
+#require 'slinky'
 
 Slinky::Runner.new(ARGV).run

data/lib/slinky/manifest.rb

@@ -4,9 +4,9 @@ require 'pathname'
 module Slinky
   # extensions of files that can contain build directives
   DIRECTIVE_FILES = %w{js css html haml sass scss coffee}
-  REQUIRE_DIRECTIVE = /^\W*(slinky_require)\((".*"|'.+'|)\)\W*$/
-  SCRIPTS_DIRECTIVE = /^\W*(slinky_scripts)\W*$/
-  STYLES_DIRECTIVE  = /^\W*(slinky_styles)\W*$/
+  REQUIRE_DIRECTIVE = /^[^\n\w]*(slinky_require)\((".*"|'.+'|)\)[^\n\w]*$/
+  SCRIPTS_DIRECTIVE = /^[^\n\w]*(slinky_scripts)[^\n\w]*$/
+  STYLES_DIRECTIVE  = /^[^\n\w]*(slinky_styles)[^\n\w]*$/
   BUILD_DIRECTIVES = Regexp.union(REQUIRE_DIRECTIVE, SCRIPTS_DIRECTIVE, STYLES_DIRECTIVE)
   CSS_URL_MATCHER = /url\(['"]?([^'"\/][^\s)]+\.[a-z]+)(\?\d+)?['"]?\)/
 
@@ -57,7 +57,7 @@ module Slinky
           %Q\<script type="text/javascript" src="#{d.relative_output_path}"></script>\
         }.join("")
       else
-        '<script type="text/javscript" src="/scripts.js"></script>'
+        '<script type="text/javascript" src="/scripts.js"></script>'
       end
     end
 
@@ -68,9 +68,9 @@ module Slinky
         f = File.open(s.build_to.to_s, 'rb'){|f| f.read}
         (block_given?) ? (yield s, f) : f
       }.join("\n")
-      
+
       File.open(output, "w+"){|f|
-        f.write(compressor.compress(s))
+        f.write(compressor.compress(s)) 
       }
       scripts.collect{|s| FileUtils.rm(s.build_to)}
     end

data/lib/slinky/runner.rb

@@ -13,6 +13,9 @@ module Slinky
       parser.parse! @argv
       @command = @argv.shift
       @arguments = @argv
+
+      config_path = "#{@options[:src_dir]}/slinky.yaml"
+      @config = ConfigReader.from_file(config_path) if File.exist?(config_path)
     end
 
     def version
@@ -30,6 +33,7 @@ module Slinky
         opts.on("-o DIR", "--build-dir DIR", "Directory to which the site will be built.", "Use in conjunction with the 'build' command."){|dir| @options[:build_dir] = File.expand_path(dir)}
         opts.on("-p PORT", "--port PORT", "Port to run on (default: #{@options[:port]})"){|p| @options[:port] = p.to_i}
         opts.on("-s DIR", "--src-dir DIR", "Directory containing project source"){|p| @options[:src_dir] = p}
+        opts.on("-n", "--no-proxy", "Don't set up proxy server"){ @options[:no_proxy] = true }
       end
     end
 
@@ -49,7 +53,12 @@ module Slinky
 
       EM::run {
         Slinky::Server.dir = @options[:src_dir]
-        EM::start_server "0.0.0.0", @options[:port], Slinky::Server
+        if @config && @config.proxies && !@options[:no_proxy]
+          server = EM::start_server "127.0.0.1", 5324, Slinky::Server
+          ProxyServer.run(@config.proxies, @options[:port], 5324)
+        else
+          EM::start_server "0.0.0.0", @options[:port], Slinky::Server
+        end
         puts "Started static file server on port #{@options[:port]}"
       }
     end

data/lib/slinky/server.rb

@@ -34,7 +34,6 @@ module Slinky
       if File.exists?(path) && !File.directory?(path)
         size = File.size(path)
         _, _, extension = path.match(EXTENSION_REGEX).to_a
-        resp.content_type MIME::Types.type_for(path).first
         # File reading code from rack/file.rb
         File.open path do |file|
           resp.content = ""
@@ -50,7 +49,7 @@ module Slinky
       end
     end
 
-    # Returns the proper responce for files that do not exist
+    # Returns the proper response for files that do not exist
     def self.not_found resp
       resp.status = 404
       resp.content = "File not found"
@@ -66,6 +65,7 @@ module Slinky
       if file.is_a? ManifestDir
         file = @manifest.find_by_path(path+"/index.html")
       end
+      resp.content_type MIME::Types.type_for(path).first
       Server.handle_file(resp, file).send_response
     end
   end

data/lib/slinky.rb

@@ -1,6 +1,9 @@
 ROOT = File.expand_path(File.dirname(__FILE__))
 
+require 'uri'
+require 'yaml'
 require 'eventmachine'
+require 'em-proxy'
 require 'evma_httpserver'
 require 'uri'
 require 'tempfile'
@@ -11,8 +14,10 @@ require 'yui/compressor'
 
 require "#{ROOT}/slinky/em-popen3"
 require "#{ROOT}/slinky/compilers"
+require "#{ROOT}/slinky/config_reader"
 require "#{ROOT}/slinky/manifest"
 require "#{ROOT}/slinky/compiled_file"
+require "#{ROOT}/slinky/proxy_server"
 require "#{ROOT}/slinky/server"
 require "#{ROOT}/slinky/runner"
 require "#{ROOT}/slinky/builder"
@@ -27,3 +32,11 @@ Dir.glob("#{ROOT}/slinky/compilers/*.rb").each{|compiler|
     puts "Failed to load #{compiler}: syntax error"
   end
 }
+
+# Without this monkeypatch data uris in CSS cause compression to fail
+class YUI::Compressor
+  def command
+    @command.insert 1, "-Xss8m"
+    @command.map { |word| Shellwords.escape(word) }.join(" ")
+  end
+end

data/slinky.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slinky}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mwylde"]
-  s.date = %q{2011-08-09}
+  s.date = %q{2011-08-19}
   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}

data/spec/slinky_spec.rb

@@ -46,7 +46,7 @@ describe "Slinky" do
     end
 
     it "should produce the correct scripts string for production" do
-      @mprod.scripts_string.should == '<script type="text/javscript" src="/scripts.js"></script>'
+      @mprod.scripts_string.should == '<script type="text/javascript" src="/scripts.js"></script>'
     end
 
     it "should produce the correct scripts string for devel" do
@@ -239,7 +239,6 @@ describe "Slinky" do
     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
@@ -252,14 +251,12 @@ describe "Slinky" do
 
     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"), "")

metadata

@@ -2,7 +2,7 @@
 name: slinky
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - mwylde
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -07:00
+date: 2011-08-19 00:00:00 -07:00
 default_executable: slinky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 501156153539470276
+      hash: 1095209777694119011
       segments: 
       - 0
       version: "0"