RubyGems - serve - Versions diffs - 0.9.2 → 0.9.3 - Mend

serve 0.9.2 → 0.9.3

Files changed (8) hide show

data/History.txt CHANGED Viewed

@@ -1,3 +1,5 @@
+== 0.9.2 (January 17, 2008)
 * Added support for redirects
 == 0.9.1 (October 19, 2007)

data/README.txt CHANGED Viewed

@@ -52,13 +52,12 @@ with as an option on the command line:
 Serve presently does special processing for files with following extensions:
-  textile :: Evaluates the document as Textile (requires the Redcloth gem)
-  markdown :: Evaluates the document as Markdown (requires the Bluecloth gem)
-  haml :: Evaluates the document as Haml (requires the Haml gem)
-  sass :: Evaluates the document as Sass (requires the Haml gem)
-  email :: Evaluates the document as if it is an e-mail message; the format
-    is identicle to a plain/text e-mail message's source
-  redirect :: Redirects to the URL contained in the document
+textile :: Evaluates the document as Textile (requires the Redcloth gem)
+markdown :: Evaluates the document as Markdown (requires the Bluecloth gem)
+haml :: Evaluates the document as Haml (requires the Haml gem)
+sass :: Evaluates the document as Sass (requires the Haml gem)
+email :: Evaluates the document as if it is an e-mail message; the format is identicle to a plain/text e-mail message's source
+redirect :: Redirects to the URL contained in the document
 === Installation and Setup

data/bin/serve CHANGED Viewed

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 lib = File.dirname(__FILE__) + '/../lib'
+require 'rubygems'
 if File.file?(lib + '/serve/version.rb')
   $LOAD_PATH << lib
 else
-  require 'rubygems'
   gem 'serve'
 end
 require 'serve'

data/lib/serve/version.rb CHANGED Viewed

@@ -2,7 +2,7 @@ module Serve #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 2
+    TINY  = 3
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/serve.rb CHANGED Viewed

@@ -3,11 +3,11 @@ require 'webrick/extensions'
 module Serve #:nodoc:
   class FileTypeHandler < WEBrick::HTTPServlet::AbstractServlet #:nodoc:
     def self.extension(extension)
       WEBrick::HTTPServlet::FileHandler.add_handler(extension, self)
     end
     def initialize(server, name)
       super
       @script_filename = name
@@ -29,55 +29,136 @@ module Serve #:nodoc:
         raise WEBrick::HTTPStatus::InternalServerError, ex.message
       end
     end
     alias do_POST do_GET
     protected
       def content_type
         'text/html'
       end
       def parse(string)
         string.dup
       end
   end
   class TextileHandler < FileTypeHandler #:nodoc:
     extension 'textile'
     def parse(string)
       require 'redcloth'
       "<html><body>#{ RedCloth.new(string).to_html }</body></html>"
     end
   end
   class MarkdownHandler < FileTypeHandler #:nodoc:
     extension 'markdown'
     def parse(string)
       require 'bluecloth'
       "<html><body>#{ BlueCloth.new(string).to_html }</body></html>"
     end
   end
   class HamlHandler < FileTypeHandler #:nodoc:
     extension 'haml'
     def parse(string)
       require 'haml'
       engine = Haml::Engine.new(string,
         :attr_wrapper => '"',
         :filename => @script_filename
       )
-      engine.render
+      layout = find_layout(@script_filename)
+      if layout
+        lines = IO.read(layout)
+        context = Context.new(Dir.pwd, @script_filename, engine.options.dup)
+        context.content = engine.render(context)
+        layout_engine = Haml::Engine.new(lines, engine.options.dup)
+        layout_engine.render(context) do |*args|
+          context.get_content_for(*args)
+        end
+      else
+        engine.render
+      end
+    end
+    def find_layout(filename)
+      root = Dir.pwd
+      path = filename[root.size..-1]
+      layout = nil
+      begin
+        path = File.dirname(path)
+        l = File.join(root, path, '_layout.haml')
+        layout = l if File.file?(l)
+      end until layout or path == "/"
+      layout
+    end
+    class Context
+      attr_accessor :content
+      def initialize(root, script_filename, engine_options)
+        @root, @script_filename, @engine_options = root, script_filename, engine_options
+      end
+      # Content_for methods
+      def content_for(symbol, &block)
+        set_content_for(symbol, capture_haml(&block))
+      end
+      def content_for?(symbol)
+        !(get_content_for(symbol)).nil?
+      end
+      def get_content_for(symbol = :content)
+        if symbol.to_s.intern == :content
+          @content
+        else
+          instance_variable_get("@content_for_#{symbol}") || instance_variable_get("@#{symbol}")
+        end
+      end
+      def set_content_for(symbol, value)
+        instance_variable_set("@content_for_#{symbol}", value)
+      end
+      # Render methods
+      def render(options)
+        partial = options.delete(:partial)
+        case
+        when partial
+          render_partial(partial)
+        else
+          raise "render options not supported #{options.inspect}"
+        end
+      end
+      def render_partial(partial)
+        path = File.dirname(@script_filename)
+        if partial =~ %r{^/}
+          partial = partial[1..-1]
+          path = @root
+        end
+        filename = File.join(path, "_" + partial + ".haml")
+        if File.file?(filename)
+          lines = IO.read(filename)
+          engine = Haml::Engine.new(lines, @engine_options)
+          engine.render(self)
+        else
+          raise "File does not exist #{filename.inspect}"
+        end
+      end
     end
   end
   class SassHandler < FileTypeHandler #:nodoc:
     extension 'sass'
     def parse(string)
       require 'sass'
       engine = Sass::Engine.new(string,
@@ -86,7 +167,7 @@ module Serve #:nodoc:
       )
       engine.render
     end
     def content_type
       'text/css'
     end

data.tar.gz.sig CHANGED Viewed

Binary file

metadata CHANGED Viewed

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: serve
 version: !ruby/object:Gem::Version
-  version: 0.9.2
-date: 2008-01-17 00:00:00 -05:00
+  version: 0.9.3
+date: 2008-01-23 00:00:00 -05:00
 summary: Serve is a small Ruby script that makes it easy to start up a WEBrick server in any directory. Serve is ideal for HTML prototyping and simple file sharing. If the haml, redcloth, and bluecloth gems are installed serve can handle Haml, Sass, Textile, and Markdown (in addition to HTML).
 require_paths:
 - lib

metadata.gz.sig CHANGED Viewed

Binary file