serve 1.5.0.pre5 → 1.5.0

data/lib/serve/templates/default/stylesheets/modules/_all.scss

@@ -0,0 +1,3 @@
+@import "utility";
+@import "links";
+@import "typography";

data/lib/serve/templates/default/stylesheets/modules/_links.scss

@@ -0,0 +1,15 @@
+@mixin basic-link($color: $link-color, $visited: $color, $hover: $color, $decoration: "underline") {
+  &:link { 
+    color: $color;
+    @if $decoration == "underline" { text-decoration: underline; }
+    @if $decoration == "plain"     { text-decoration: none; }
+  }
+  &:visited {
+    color: $visited;
+  }
+  &:hover {
+    color: $hover;
+    @if $decoration == "underline" { text-decoration: none; }
+    @if $decoration == "plain"     { text-decoration: underline; }
+  }
+}

data/lib/serve/templates/default/stylesheets/modules/_typography.scss

@@ -0,0 +1,133 @@
+// This should be applied to the body of the document:
+// 
+//     body { @include base-font; }
+// 
+@mixin base-font {
+  color: $text-color;
+  font-family: $base-font-family;
+  font-size: $base-font-size;
+  line-height: $base-line-height;
+}
+
+// Typically this should be applied to content portion of the document:
+// 
+//     .content { @include basic-typography; }
+// 
+// Pass true if you would like to use indented instead of block level paragraphs:
+// 
+//     .content { @include basic-typography(true); }
+// 
+@mixin basic-typography($indented: $indented-paragraphs) {
+  @include inline-elements;
+  @include headings;
+  @if $indented {
+    @include indented-paragraphs;
+  } @else {
+    @include block-paragraphs;
+  }
+  @include lists;
+  @include fixed-font-elements;
+}
+
+// Style inline elements like strong, em, abbr, etc...
+@mixin inline-elements($loud-color: $loud-color) {
+  @include bold-italic-elements($loud-color);
+  @include misc-inline-elements;
+}
+
+// Basic styles for strong, b, em, and i
+@mixin bold-italic-elements($loud-color: $loud-color) {
+  strong, b { color: $loud-color; font-weight: bold; }
+  em, i { font-style: italic; }
+}
+
+// Basic styles for abbr, acronym, sub, sup, and span.caps
+@mixin misc-inline-elements {
+  abbr, acronym { border-bottom: 1px dotted soften($text-color, 2); }
+  sub, sup { font-size: 85%; }
+  sub { vertical-align: sub; }
+  sup { vertical-align: super; }
+  span.caps { font-size: 95%; }
+}
+
+// Basic styles for headings
+@mixin headings($color: $header-color, $line-height: $base-line-height) {
+  h1, h2, h3, h4, h5, h6 {
+    color: $color;
+    margin: 1em 0;
+  }
+  h1 {
+    font-weight: bold;
+    font-size: 200%;
+    line-height: 0.785 * $line-height;
+    margin: 0.75em 0;
+  }
+  h2 {
+    font-weight: bold;
+    font-size: 170%;
+    line-height: 0.785 * $line-height;
+  }
+  h3 {
+    font-weight: bold;
+    font-size: 140%;
+    line-height: 0.835 * $line-height;
+    margin: 1.25em 0 0.5em;
+  }
+  h4 {
+    font-weight: bold;
+    font-size: 110%;
+    line-height: 0.9 * $line-height;
+    margin: 0.5em 0 0.5em;
+  }
+  h5 {
+    font-style: italic;
+    font-size: 110%;
+    line-height: $line-height;
+    margin: 0.65em 0;
+  }
+  h6 {
+    font-weight: bold;
+    margin-bottom: -0.75em;
+  }
+}
+
+// Block-level paragraphs with vertical margin
+@mixin block-paragraphs {
+  p { margin: 1em 0; }
+}
+
+// Indented paragraphs
+@mixin indented-paragraphs($indent: 1em) {
+  p { margin-top: 0.5; margin-bottom: 0.5; }
+  p + p { text-indent: $indent; }
+}
+
+// Basic styles for list elements
+@mixin lists($indent: 2.25em, $ul-list-style: disc, $ol-list-style: decimal) {
+  ul, ol, dl { margin-top: 1em; margin-bottom: 1em; }
+  ul, ol, dd { padding-left: $indent; }
+  ul { list-style: $ul-list-style; }
+  ol { list-style: $ol-list-style; }
+  li { margin-top: 0.5em; margin-bottom: 0.5em; }
+  dt { margin-top: 1em; }
+  dd { margin-bottom: 1em; }
+}
+
+// Typewritter styles for fixed-font elements
+@mixin fixed-font-elements($font-family: $fixed-font-family, $font-size: $fixed-font-size, $line-height: $fixed-line-height) {
+  code, dfn, kbd, samp, tt {
+    font-family: $font-family;
+    font-size: 95%;
+    color: soften($text-color);
+  }
+  pre {
+    background: soften($text-color);
+    color: invert($text-color);
+    font-family: $font-family;
+    font-size: 95%;
+    line-height: $line-height;
+    margin: 1.5em 0;
+    padding: 1em;
+    @include border-radius;
+  }
+}

data/lib/serve/templates/default/stylesheets/modules/_utility.scss

@@ -0,0 +1,15 @@
+@function strengthen($color, $multiplier: 1, $reversed: $reversed-text) {
+  @if $reversed {
+    @return lighten($color, 20% * $multiplier);
+  } @else {
+    @return darken($color, 20% * $multiplier);
+  }
+}
+
+@function soften($color, $multiplier: 1, $reversed: $reversed-text) {
+  @if $reversed {
+    @return darken($color, 20% * $multiplier);
+  } @else {
+    @return lighten($color, 20% * $multiplier);
+  }
+}

data/lib/serve/templates/default/stylesheets/partials/_base.scss

@@ -0,0 +1,47 @@
+@import "compass";
+
+// Reversed?
+$reversed-text: false;
+@import "modules/utility";
+
+// Base Font
+$base-font-family: "Helvetica Neue", Hevetica, Arial, sans-serif;
+$base-font-size: 110%;
+$base-line-height: 1.4;
+
+// Fixed Font
+$fixed-font-family: Monaco, "Andale Mono", "Lucida Console", monospace;
+$fixed-font-size: 85%;
+$fixed-line-height: $base-line-height;
+
+// Text Colors
+$text-color: #333333;
+$loud-color: strengthen($text-color);
+$quiet-color: soften($text-color, 1.5);
+$header-color: strengthen($text-color, 0.66);
+
+// Link Colors
+$link-color: #bb3a08;
+$link-visited-color: #a72;
+$link-hover-color: #f66933;
+
+// Theme Colors
+$background-color: white;
+$banner-color: #973b12;
+
+// Paragraphs
+$indented-paragraphs: false;
+
+// Layout
+$body-margin-x: 15%;
+
+// Border Radius
+$default-border-radius: 8px;
+
+@import "modules/all";
+
+@include global-reset;
+@include reset-html5;
+
+html, body { background: $background-color; }
+body { @include base-font; }

data/lib/serve/templates/default/stylesheets/partials/_content.scss

@@ -0,0 +1,37 @@
+//
+// Virtual Content Classes
+//
+
+.links {
+  a { @include basic-link($link-color, $link-visited-color, $link-hover-color); }
+  a.more {
+    white-space: nowrap;
+    &:after { content: " »"; }
+  }
+}
+
+.typography {
+  @include basic-typography;
+}
+
+.content {
+  @extend .links;
+  @extend .typography;
+  
+  .box {
+    background: #efeacf;
+    border: 1px solid darken(#efeacf, 10);
+    @include border-radius;
+    margin: 1.5em -1em;
+    padding: 1px 1em;
+  }
+}
+
+
+//
+// Applied to appropriate elements
+//
+
+section[role=main] > article {
+  @extend .content
+}

data/lib/serve/templates/default/stylesheets/partials/_layout.scss

@@ -0,0 +1,42 @@
+//
+// Basic layout and styles for site
+//
+
+
+header[role=banner] {
+  background: $banner-color;
+  @include background-image(
+    linear-gradient(rgba(black, 0) 0%, rgba(black, 0) 80%, rgba(black, 0.15) 100%),
+    radial-gradient(30% 50px, $banner-color, darken($banner-color, 11) 400px)
+  );
+  padding: 20px $body-margin-x;
+  position: relative;
+  
+  a { @include basic-link(mix($banner-color, white, 20%), $hover: white, $decoration: "plain"); }
+  
+  .action-link {
+    position: absolute;
+    right: $body-margin-x;
+    top: 55px;
+    a {
+      background: rgba(white, 0.1);
+      @include border-radius;
+      display: block;
+      padding: 0.5em 1em;
+      @include text-shadow(mix($banner-color, black, 50%) 0 1px 0);
+      &:after { content: " ⇢"; }
+    }
+  }
+}
+
+section[role=main] {
+  padding: 1px $body-margin-x;
+}
+
+body > footer {
+  padding: 0 $body-margin-x 20px;
+  font-size: 90%;
+  color: $quiet-color;
+  a { @include basic-link($text-color); }
+  p { margin: 1em 0; }
+}

data/lib/serve/templates/default/stylesheets/screen.scss

@@ -0,0 +1,7 @@
+//
+// Application Stylesheet
+//
+
+@import "partials/base";
+@import "partials/content";
+@import "partials/layout";

data/lib/serve/templates/default/views/_layout.html.erb

@@ -0,0 +1 @@
+<%= render :template => "/layouts/default" %>

data/lib/serve/templates/default/views/index.redirect

@@ -0,0 +1,15 @@
+Serve has a special file type for mapping HTTP redirects. Redirects make nice
+end points for form posts or short URLs.
+
+Redirect URLs can be fully formed, like this:
+
+http://wiseheartdesign.com/
+
+Or, relative to the site root, like this:
+
+/action
+
+Extra lines at the beginning of a redirect file are ignored. By convention,
+the last line of a redirect file is the URL to redirect to:
+
+/welcome

data/lib/serve/templates/default/views/layouts/default.html.erb

@@ -0,0 +1,31 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title><%= @title %></title>
+    <link rel="stylesheet" href="/stylesheets/screen.css">
+    <!--[if IE]>
+    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+  </head>
+  <body>
+    <header role="banner">
+      <h1><a href="/"><%= image "serve-logo" %></a></h1>
+      <div class="action-link"><a href="http://get-serve.com/documentation">Documentation</a></div>
+    </header>
+    <section role="main">
+      <article>
+        <header><h1><%= @title %></h1></header>
+        <%= yield %>
+      </article>
+    </section>
+    <footer>
+      <small>
+        <p>Serve is copyright © 2007-2011 John W. Long and Adam I. Williams. Portions have
+          been contributed by Robert Evans and others. Serve is distributed under a MIT-style
+          license and is open source software. Enjoy!</p>
+        <p>Questions? <a href="http://get-serve.com/mailing-list">Join the  mailing list.</a></p>
+      </small>
+    </footer>
+  </body>
+</html>

data/lib/serve/templates/default/views/view_helpers.rb

@@ -0,0 +1,25 @@
+#
+# Methods placed in this module can be used inside of any view.
+# View helpers allow you to encapsalate complex logic and keep your
+# views pristine.
+#
+module ViewHelpers
+  
+  # Calculate the years for a copyright
+  def copyright_years(start_year)
+    end_year = Date.today.year
+    if start_year == end_year
+      "\#{start_year}"
+    else
+      "\#{start_year}–\#{end_year}"
+    end
+  end
+  
+  # Handy for hiding a block of unfinished code
+  def hidden(&block)
+    #no-op
+  end
+  
+  # Add your own helpers below...
+  
+end

data/lib/serve/templates/default/views/welcome.html.erb

@@ -0,0 +1,36 @@
+<% @title = "You created a structured Serve project!" %>
+
+<dl>
+  <dt><strong>Views &amp; Layouts</strong></dt>
+  <dd>
+    Your views are stored in the <kbd>views</kbd> folder. Coming from a page-based
+    scripting language like PHP? Views are just like regular pages. The main layout
+    file for this project is stored in <kbd>layouts/default</kbd>.
+  </dd>
+  
+  <dt><strong>Stylesheets, Sass &amp; Compass</strong></dt>
+  <dd>
+    This project is pre-configured for <a href="http://sass-lang.com">Sass</a> and
+    <a href="http://compass-style.org">Compass</a>. Store your <kbd>sass</kbd> and
+    <kbd>scss</kbd> files in the root <kbd>stylesheets</kbd> folder. Sass
+    stylesheets will be automatically compiled to CSS and stored in
+    <kbd>public/stylesheets</kbd>.
+  </dd>
+  
+  <dt><strong>Static Assets</strong></dt>
+  <dd>
+    Static assets like images, javascripts, and downloads are stored in the
+    <kbd>public</kbd> folder. Put files here that don&#8217;t need special
+    processing by Serve.
+  </dd>
+</dl>
+
+<div class="box">
+  <h6>Other Template Languages</h6>
+  <p>
+    If you are interested in using Serve with other template languages like Haml,
+    Slim, Markdown, or Textile, remember to edit the project <kbd>Gemfile</kbd>
+    to include the appropriate gems. Then use
+    <a href="http://gembundler.com/">Bundler</a> to install them.
+  </p>
+</div>

data/spec/application_spec.rb

@@ -12,7 +12,7 @@ describe Serve::Application do
       
       :port         => 4000,
       :address      => '0.0.0.0',
-      :root         => Dir.pwd,
+      :root         => ".",
       
       :convert      => nil,
       :create       => nil,
@@ -59,35 +59,37 @@ describe Serve::Application do
     end
     
     it "working directory" do
-      parse('')[:root].should == Dir.pwd
+      parse('')[:root].should == '.'
       dir = File.dirname(__FILE__)
       parse(dir)[:root].should == File.expand_path(dir)
     end
     
     describe "create" do
       it "with standard arguments" do
-        params = parse('create newapp /Users/user')[:create]
-        params[:name].should == 'newapp'
-        params[:directory].should == '/Users/user'
-        params[:framework].should be_nil
-      end
-      
-      it "without parent directory" do
         params = parse('create newapp')[:create]
-        params[:name].should == 'newapp'
-        params[:directory].should == Dir.pwd
+        params[:directory].should == 'newapp'
+        params[:framework].should be_nil
+        params[:template].should be_nil
       end
       
       it "with no arguments" do
-        lambda { parse('create') }.should raise_error(Serve::Application::InvalidArgumentsError)
+        params = parse('create')[:create]
+        params[:directory].should == '.'
+        params[:framework].should be_nil
+        params[:template].should be_nil
       end
       
       it "with a javascript framework" do
-        params = parse('create newapp /Users/user -j jquery')[:create]
-        params[:name].should == 'newapp'
-        params[:directory].should == '/Users/user'
+        params = parse('create newapp -j jquery')[:create]
+        params[:directory].should == 'newapp'
         params[:framework].should == 'jquery'
       end
+      
+      it "with a template" do
+        params = parse('create newapp --template blank')[:create]
+        params[:directory].should == 'newapp'
+        params[:template].should == 'blank'
+      end
     end
     
     describe "convert" do
@@ -99,7 +101,7 @@ describe Serve::Application do
       
       it "with no arguments" do
         params = parse('convert')[:convert]
-        params[:directory].should == Dir.pwd
+        params[:directory].should == '.'
         params[:framework].should be_nil
       end
       
@@ -119,13 +121,13 @@ describe Serve::Application do
       
       it "export with just an output directory" do
         params = parse('export output')[:export]
-        params[:input].should == Dir.pwd
+        params[:input].should == '.'
         params[:output].should == 'output'
       end
       
       it "export with no arguments" do
         params = parse('export')[:export]
-        params[:input].should == Dir.pwd
+        params[:input].should == '.'
         params[:output].should == 'html'
       end
     end
@@ -141,7 +143,7 @@ describe Serve::Application do
         args = args.split(' ')
         @app.parse(*args)
       end
-
+    
   end
   
   describe "running" do