staticmatic 0.10.6 → 0.10.7

data/Rakefile

@@ -18,6 +18,7 @@ begin
     gem.files =  FileList["[A-Z]*", "{bin,lib,spec}/**/*"]
     
     gem.add_dependency("haml", ">=2.0.0")
+    gem.add_dependency("rack", ">=1.0")
     gem.add_dependency("mongrel", ">=1.1.5")
   end
 rescue LoadError

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 10
-:patch: 6
+:patch: 7 

data/lib/staticmatic.rb

@@ -2,7 +2,8 @@ require 'rubygems'
 require 'haml'
 require 'sass'
 require 'sass/plugin'
-require 'mongrel'
+require 'rack'
+require 'rack/handler/mongrel'
 require 'fileutils'
 
 module StaticMatic

data/lib/staticmatic/server.rb

@@ -1,17 +1,14 @@
 module StaticMatic
-  class Server < Mongrel::HttpHandler
-    @@file_only_methods = ["GET","HEAD"]
- 
-    def initialize(staticmatic)
-      @files = Mongrel::DirHandler.new(staticmatic.site_dir, false)
+  class Server
+    def initialize(staticmatic, default = nil)
+      @files = default || Rack::File.new(staticmatic.site_dir)
       @staticmatic = staticmatic
     end
-  
-    def process(request, response)
+
+    def call(env)
       @staticmatic.load_helpers
-      path_info = request.params[Mongrel::Const::PATH_INFO]
-      get_or_head = @@file_only_methods.include? request.params[Mongrel::Const::REQUEST_METHOD]
-      
+      path_info = env["PATH_INFO"]
+
       file_dir, file_name, file_ext = expand_path(path_info)
 
       # remove stylesheets/ directory if applicable
@@ -19,40 +16,44 @@ module StaticMatic
       
       file_dir = CGI::unescape(file_dir)
       file_name = CGI::unescape(file_name)
-      
-      if file_ext && file_ext.match(/html|css/)
-        response.start(200) do |head, out|
-          head["Content-Type"] = "text/#{file_ext}"
-          output = ""
 
-          if @staticmatic.template_exists?(file_name, file_dir) && !(File.basename(file_name) =~ /^\_/)
+      unless file_ext && ["html", "css"].include?(file_ext) &&
+          @staticmatic.template_exists?(file_name, file_dir) &&
+          File.basename(file_name) !~ /^\_/
+        return @files.call(env)
+      end
 
-            begin
-              if file_ext == "css"
-                output = @staticmatic.generate_css(file_name, file_dir)
-              else
-                output = @staticmatic.generate_html_with_layout(file_name, file_dir)
-              end
-            rescue StaticMatic::Error => e
-              output = e.message
-            end
-          else
-            if @files.can_serve(path_info)
-              @files.process(request,response)
-            else
-              output = "File not Found"
-            end
-          end
-          out.write output
-        end
-      else
-        # try to serve static file from site dir
-        if @files.can_serve(path_info)
-          @files.process(request,response)
+      res = Rack::Response.new
+      res.header["Content-Type"] = "text/#{file_ext}"
+
+      begin
+        if file_ext == "css"
+          res.write @staticmatic.generate_css(file_name, file_dir)
+        else
+          res.write @staticmatic.generate_html_with_layout(file_name, file_dir)
         end
+      rescue StaticMatic::Error => e
+        res.write e.message
       end
+
+      res.finish
     end
 
+    # Starts the StaticMatic preview server
+    def self.start(staticmatic)
+      port = staticmatic.configuration.preview_server_port || 3000
+
+      host = staticmatic.configuration.preview_server_host || ""
+
+      app = Rack::Builder.new do
+        use Rack::ShowExceptions
+        run StaticMatic::Server.new(staticmatic)
+      end
+      Rack::Handler::Mongrel.run(app, :Port => port, :Host => host)
+    end
+
+    private
+
     def expand_path(path_info)
       dirname, basename = File.split(path_info)
 
@@ -71,24 +72,5 @@ module StaticMatic
 
       [ dirname, filename, extname ]
     end
-    
-    class << self
-      # Starts the StaticMatic preview server
-      def start(staticmatic)
-        port = staticmatic.configuration.preview_server_port || 3000
-        
-        host = staticmatic.configuration.preview_server_host || ""
-        
-        config = Mongrel::Configurator.new :host => host do
-          puts "Running Preview of #{staticmatic.base_dir} on #{host}:#{port}"
-          listener :port => port do
-            uri "/", :handler => Server.new(staticmatic)
-          end
-          trap("INT") { stop }
-          run
-        end
-        config.join
-      end
-    end
   end
 end

data/lib/staticmatic/template_error.rb

@@ -20,7 +20,7 @@ class StaticMatic::TemplateError < StandardError
   end
   
   def source_extract(indentation = 0)
-    return unless num = line_number
+    return "" unless num = line_number
     num = num.to_i
 
     source_code = @source.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +01:00
+date: 2009-11-23 00:00:00 +00:00
 default_executable: staticmatic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
   type: :runtime