RubyGems - serve - Versions diffs - 0.9.7 → 0.9.8 - Mend

serve 0.9.7 → 0.9.8

Files changed (20) hide show

data.tar.gz.sig +0 -0
data/History.txt +9 -0
data/Manifest.txt +6 -0
data/Quickstart.textile +4 -4
data/README.txt +18 -2
data/bin/serve +0 -0
data/lib/serve/handlers/dynamic_handler.rb +11 -4
data/lib/serve/version.rb +1 -1
data/lib/serve/webrick/extensions.rb +0 -0
data/script/destroy +0 -0
data/script/generate +0 -0
data/script/txt2html +0 -0
data/test_project/_layout.haml +7 -0
data/test_project/erb/_layout.html.erb +10 -0
data/test_project/erb/index.html.erb +5 -0
data/test_project/test.haml +3 -0
data/test_project/test.html.erb +3 -0
data/test_project/view_helpers.rb +5 -0
metadata +20 -5
metadata.gz.sig +0 -0

data.tar.gz.sig CHANGED

Binary file

data/History.txt CHANGED

@@ -1,3 +1,12 @@
+== 0.9.8 (July 18, 2008)
+* Added experimental support for ERB layouts. [Lawjoskar]
+== 0.9.7 (July 17, 2008)
+* Added experimental support for view helpers. [aiwilliams]
+* Added limited support for ERB. Layouts are not yet supported. [jlong]
 == 0.9.6 (February 20, 2008)
 * Changed default port to 4000 so that serve plays nicely with Rails apps.

data/Manifest.txt CHANGED

@@ -32,3 +32,9 @@ tasks/environment.rake
 tasks/rspec.rake
 tasks/undefine.rake
 tasks/website.rake
+test_project/_layout.haml
+test_project/erb/_layout.html.erb
+test_project/erb/index.html.erb
+test_project/test.haml
+test_project/test.html.erb
+test_project/view_helpers.rb

data/Quickstart.textile CHANGED

@@ -50,7 +50,7 @@ h3. Creating Our First Screen
 Now that we have the prototype directory set up, let's create our first page so that you can get a feel for how Serve works. This will be a simple HTML login page for our application.
-Insert the following HTML into an file named "login.html":
+Insert the following HTML into an file named "login.html.erb":
 <pre><code>
 <form action="/dashboard/" method="put">
@@ -96,7 +96,7 @@ Name                          Last modified         Size
 Parent Directory              2008/02/23 15:35      -
 images/                       2008/02/23 15:35      -
 javascripts/                  2008/02/23 15:35      -
-login.html                    2008/02/23 15:36      346
+login.html.erb                2008/02/23 15:36      346
 stylesheets/                  2008/02/23 15:35      -
 </pre>
@@ -111,7 +111,7 @@ h3. Layouts
 One thing to note about the source that I gave you for the login page. I intentionally left out the <html>, <head>, and <body> tags because they belong a layout---not the source file. Let's go ahead and create that layout now.
-Insert the following HTML into a file named "_layout.html" in the root directory of your prototype:
+Insert the following HTML into a file named "_layout.html.erb" in the root directory of your prototype:
 <pre><code>
 <html>
@@ -129,7 +129,7 @@ This layout includes a small amount of ERB(Embedded Ruby) to indicate the title
 Embedded Ruby is delineated with the opening and closing sequence <% and %> respectively. Sequences that begin with an addition equals sign insert their output directly into the HTML. In this case we want to render the @title variable as the title in the head and as the first heading in the document body. The yield keyword is used to insert the content of the page at that point.
-We need to make one small change to our login page before continuing. Insert the following line at the top of login.html file:
+We need to make one small change to our login page before continuing. Insert the following line at the top of login.html.erb file:
 <pre>
 <% @title = "Login" %>

data/README.txt CHANGED

@@ -52,12 +52,24 @@ 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)
+erb :: Experimental support for ERB is partial implemented
 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
+email :: Evaluates the document as if it is an e-mail message; the format is identical to a plain/text e-mail message's source
 redirect :: Redirects to the URL contained in the document
+== View Helpers
+If you drop a file called view_helpers.rb in the root of a project, you can define custom helpers for your Haml and ERB views. Just declare the ViewHelpers module and begin declaring your helpers:
+  module ViewHelpers
+    def custom_method
+      "Request object: #{request.headers['user-agent']}"
+    end
+  end
 === Installation and Setup
 It is recommended that you install serve via RubyGems:
@@ -76,10 +88,14 @@ Or visit the project page here:
 * http://rubyforge.org/projects/serve
+All development now takes place on GitHub:
+* http://github.com/jlong/serve
 === License
-Serve is released under the MIT license and is copyright (c) 2006-2007
+Serve is released under the MIT license and is copyright (c) 2006-2008
 John W. Long. A copy of the MIT license can be found in the License.txt file.

data/bin/serve CHANGED

File without changes

data/lib/serve/handlers/dynamic_handler.rb CHANGED

@@ -33,11 +33,18 @@ module Serve #:nodoc:
       root = Dir.pwd
       path = filename[root.size..-1]
       layout = nil
-      begin
+      until layout or path == "/"
         path = File.dirname(path)
-        l = File.join(root, path, '_layout.haml')
-        layout = l if File.file?(l)
-      end until layout or path == "/"
+        possible_layouts = ['_layout.haml', '_layout.html.erb'].map do |l|
+          possible_layout = File.join(root, path, l)
+          File.file?(possible_layout) ? possible_layout : false
+        end
+        layout = possible_layouts.detect {|o| o }
+      end
       layout
     end

data/lib/serve/version.rb CHANGED

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

data/lib/serve/webrick/extensions.rb CHANGED

File without changes

data/script/destroy CHANGED

File without changes

data/script/generate CHANGED

File without changes

data/script/txt2html CHANGED

File without changes

data/test_project/_layout.haml ADDED

@@ -0,0 +1,7 @@
+!!! Strict
+%html
+  %head
+    %title= @title
+  %body
+    %h1= @title
+    = yield

data/test_project/erb/_layout.html.erb ADDED

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title><%= @title %></title>
+  </head>
+  <body>
+    <h1><%= @title %></h1>
+    <%= yield %>
+  </body>
+</html>

data/test_project/erb/index.html.erb ADDED

@@ -0,0 +1,5 @@
+<% @title = "ERB Template" %>
+<p>Hello World!</p>
+<%= custom_method %>

data/test_project/test.haml ADDED

@@ -0,0 +1,3 @@
+= render :template => "test.html.erb"
+= custom_method
+- @title = "Haml Template"

data/test_project/test.html.erb ADDED

@@ -0,0 +1,3 @@
+<% @title = "ERB Template" %>
+<p>Hello World!</p>

data/test_project/view_helpers.rb ADDED

@@ -0,0 +1,5 @@
+module ViewHelpers
+  def custom_method
+    "Request object: #{request.headers['user-agent']}"
+  end
+end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serve
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - John W. Long
@@ -30,10 +30,19 @@ cert_chain:
   qXI=
   -----END CERTIFICATE-----
-date: 2008-07-17 00:00:00 -04:00
+date: 2008-07-18 00:00:00 -04:00
 default_executable:
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: hoe
+  type: :development
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+    version:
 description: 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).
 email: me@johnwlong.com
 executables:
@@ -80,6 +89,12 @@ files:
 - tasks/rspec.rake
 - tasks/undefine.rake
 - tasks/website.rake
+- test_project/_layout.haml
+- test_project/erb/_layout.html.erb
+- test_project/erb/index.html.erb
+- test_project/test.haml
+- test_project/test.html.erb
+- test_project/view_helpers.rb
 has_rdoc: true
 homepage: http://serve.rubyforge.org
 post_install_message:
@@ -103,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: serve
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key:
 specification_version: 2
 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).

metadata.gz.sig CHANGED

Binary file