slinky 0.1.1 → 0.2.0

data/Gemfile

@@ -2,6 +2,10 @@ source "http://rubygems.org"
 
 gem "eventmachine", ">= 0.12.0"
 gem "eventmachine_httpserver", ">= 0.2.0"
+gem "rainbow", ">= 1.1.1"
+gem "haml", ">= 3.0.0"
+#gem "sass", ">= 4.0.0"
+gem "coffee-script", ">= 2.2.0"
 
 group :development do
   gem "bacon", ">= 0"
@@ -10,4 +14,3 @@ group :development do
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
 end
-

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/bin/slinky

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+root = File.expand_path(File.dirname(__FILE__))
+
+#require "#{root}/../lib/slinky"
 require 'slinky'
 
 Slinky::Runner.run

data/lib/slinky/compiled_file.rb

@@ -16,23 +16,50 @@ module Slinky
     # Compiles the source file to a temporary location
     def compile &cb
       path = @path || tmp_path
+      @last_compiled = Time.now
+      if @compiler.respond_to? :compile
+        compiler_compile path, cb
+      else
+        compiler_command path, cb
+      end
+    end
 
-      command = @compiler.command @source, path
+    def compiler_compile path, cb
+      begin
+        out = @compiler.compile @source
+        compile_succeeded
+        @path = path
+        File.open(path, "w+") do |f|
+          f.write out
+        end
+      rescue
+        compile_failed $!
+      end
+      cb.call @path, nil, nil, $! 
+    end
 
-      puts "Running command '#{command}'"
+    def command path, cb
+      command = @compiler.command @source, path
 
       EM.system3 command do |stdout, stderr, status|
-        @last_compiled = Time.now
         if status.exitstatus != 0
-          $stderr.write "Failed on #{@source}: #{stderr.strip}\n"
+          compile_failed stderr.strip
         else
-          puts "Compiled #{@source}"
+          compile_succeeded
           @path = path
         end
         cb.call(@path, status, stdout, stderr)
       end
     end
 
+    def compile_succeeded
+      puts "Compiled #{@source}".foreground(:green)
+    end
+
+    def compile_failed e
+      $stderr.write "Failed on #{@source}: #{e}\n".foreground(:red)
+    end
+
     # Calls the supplied callback with the path of the compiled file,
     # compiling the source file first if necessary.
     def file &cb

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

@@ -1,12 +1,14 @@
+require 'coffee-script'
+
 module Slinky
   module CoffeeCompiler
     Server.register_compiler self,
     :inputs => ["coffee"],
     :outputs => ["js"]
-    
-    def CoffeeCompiler::command from, to
-      root = File.dirname(__FILE__)
-      %Q?#{root}/coffee-helper "#{from}" "#{to}"?
+
+    def CoffeeCompiler::compile file
+      s = File.read(file)
+      CoffeeScript::compile(s)
     end
   end
 end

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

@@ -1,11 +1,15 @@
+require 'haml'
+
 module Slinky
   module HamlCompiler
     Server.register_compiler self,
     :inputs => ["haml"],
     :outputs => ["html"]
-    
-    def HamlCompiler::command from, to
-      %Q?haml "#{from}" "#{to}"?
-    end
+
+    def HamlCompiler::compile file
+      s = File.read(file)
+      haml_engine = Haml::Engine.new(s)
+      haml_engine.render
+    end    
   end
 end

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

@@ -1,11 +1,15 @@
+require 'sass'
+
 module Slinky
   module SassCompiler
     Server.register_compiler self,
       :inputs => ["sass", "scss"],
       :outputs => ["css"]
-    
-    def SassCompiler::command from, to
-      %Q?sass "#{from}:#{to}"?
+
+    def SassCompiler::compile file
+      s = File.read(file)
+      sass_engine = Sass::Engine.new(s, :load_paths => [File.dirname(file)])
+      sass_engine.render
     end
   end
 end

data/lib/slinky/server.rb

@@ -103,23 +103,16 @@ module Slinky
         _, _, extension = path.match(EXTENSION_REGEX).to_a
         @resp.content_type CONTENT_TYPES[extension]
         # File reading code from rack/file.rb
-        range = 0..size-1
-        EM.defer do
-          File.open path do |file|
-            file.seek(range.begin)
-            remaining_len = range.end-range.begin+1
-            while remaining_len > 0
-              
-              part = file.read([8192, remaining_len].min)
-              break unless part
-              remaining_len -= part.length
-
-              @resp.chunk part
-              @resp.send_chunks
-            end
+        File.open path do |file|
+          @resp.content = ""
+          while size > 0
+            part = file.read([8192, size].min)
+            break unless part
+            size -= part.length
+            @resp.content << part
           end
-          @resp.send_trailer
         end
+        @resp.send_response
       else
         @resp.status = 404
         @resp.content = "File '#{path}' not found."

data/lib/slinky.rb

@@ -4,6 +4,8 @@ require 'eventmachine'
 require 'evma_httpserver'
 require 'uri'
 require 'tempfile'
+require 'rainbow'
+require 'rbtrace'
 
 require "#{ROOT}/slinky/em-popen3"
 require "#{ROOT}/slinky/compiled_file"

data/slinky.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{slinky}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mwylde"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-04-15}
   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}
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mwylde/slinky}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Static file server for javascript apps}
   s.test_files = [
     "spec/slinky_spec.rb",
@@ -55,6 +55,9 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.0"])
       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<coffee-script>, [">= 2.2.0"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -63,6 +66,9 @@ Gem::Specification.new do |s|
     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<coffee-script>, [">= 2.2.0"])
       s.add_dependency(%q<bacon>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -72,6 +78,9 @@ Gem::Specification.new do |s|
   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<coffee-script>, [">= 2.2.0"])
     s.add_dependency(%q<bacon>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -2,7 +2,7 @@
 name: slinky
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - mwylde
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: slinky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,8 +36,41 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: rainbow
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: haml
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: coffee-script
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,10 +78,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -56,10 +89,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,10 +100,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,10 +111,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,7 +122,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id010
 description: A static file server for rich javascript apps that automatically compiles SASS, HAML, CoffeeScript and more
 email: mwylde@wesleyan.edu
 executables: 
@@ -133,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1454064815511573175
+      hash: 3806476896341792215
       segments: 
       - 0
       version: "0"
@@ -146,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Static file server for javascript apps