aerial 0.0.0 → 0.1.0

data/config/config.yml

@@ -1,17 +1,17 @@
-title: ""
+title: "Aerial"
 subtitle: ""
 name:  ""
 author: ""
 email:  ""
 
 articles:
-  dir: "app/articles"
+  dir: "articles"
 
 public:
   dir: "public"
 
 views:
-  dir: "app/views"
+  dir: "views"
   default: "home"
 
 akismet:

data/config/thin.sample.yml

@@ -0,0 +1,13 @@
+---
+environment: development
+chdir: /apps/aerial
+address: 127.0.0.1
+port: 4567
+pid: /apps/aerial/thin.pid
+rackup: /apps/aerial/config.ru
+log: /apps/aerial/log/thin.log
+max_conns: 1024
+timeout: 30
+max_persistent_conns: 512
+daemonize: false
+servers: 1

data/examples/articles/congratulations/congratulations-aerial-is-configured-correctly.article

@@ -0,0 +1,6 @@
+Title           : Congratulations! Aerial is configured correctly
+Tags            : ruby, sinatra, git, aerial
+Publish Date    : 03/31/2009
+Author          : Aerial
+
+Congratulations! Aerial appears to be up and running. This is a sample article created during the bootstrap process.  You may overwrite this article or create a new one.

data/{lib/spec/fixtures → examples}/views/article.haml

@@ -6,7 +6,7 @@
     %span
       =article.comments.size
   %h3
-    ="Posted by #{article.author} on #{humanized_date article.published_at}"
+    ="Posted by #{article.author} on #{humanized_date article.publish_date}"
   %p.entry
     =article.body_html
   .meta

data/{lib/spec/fixtures → examples}/views/comment.haml

@@ -3,6 +3,6 @@
     %a{:href => comment.homepage}
       =comment.author
     %span
-      =comment.published_at
+      =comment.publish_date
   %p
     =comment.body

data/{lib/spec/fixtures → examples}/views/layout.haml

@@ -6,7 +6,7 @@
     %script{ 'type' => "text/javascript", :src => "/javascripts/jquery.template.js" }
     %script{ 'type' => "text/javascript", :src => "/javascripts/application.js" }
     %link{:href => '/style.css', :rel => 'stylesheet', :type => 'text/css'}
-    %link{:href => "http://#{hostname}/feed", :rel => 'alternate', :type => 'application/atom+xml', :title => "Feed for #{}" }
+    %link{:href => "#{base_url}/feed", :rel => 'alternate', :type => 'application/atom+xml', :title => "Feed for #{}" }
   %body
     #container
       #header

data/examples/views/not_found.haml

@@ -0,0 +1 @@
+The page you requested could not be found.

data/{lib/spec/fixtures → examples}/views/rss.haml

@@ -2,7 +2,7 @@
 %rss{"version" => "2.0"}
   %channel
     %title= "#{Aerial.config.title}"
-    %link= "http://#{hostname}"
+    %link= "#{base_url}"
     %language= "en-us"
     %ttl= "40"
     %description= "#{Aerial.config.subtitle}"
@@ -11,5 +11,5 @@
         %title= article.title
         %link= full_hostname(article.permalink)
         %description= article.body_html
-        %pubDate= article.published_at
+        %pubDate= article.publish_date
         %guid{"isPermaLink" => "false"}= article.id

data/{lib/spec/fixtures → examples}/views/sidebar.haml

@@ -4,6 +4,14 @@
     Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut
     labore et dolore magna aliqua. Ut enimad minim veniam, quis nostrud exercitation ullamco
     laboris nisi ut aliquip ex ea commodo consequat.
+
+#menu
+  %h2 Menu
+  %ul
+    %li
+      %a{:href => "/"}Home
+    %li
+      %a{:href => "/about"}About
 %h2 Recent Posts
 %ul
   -Aerial::Article.recent.each do |article|

data/features/home.feature

@@ -0,0 +1,16 @@
+Feature: Homepage
+    In order to view recent Articles
+    As anonymous
+    wants to view the most recent articles
+
+    Scenario: Opening the home page
+        Given there are articles
+        When I view the Homepage
+        Then the title should be "Aerial | A Microblog by Matt Sears"
+        Then I should see "Congratulations! Aerial is configured correctly"
+        Then I should see a link to "Home":/home
+        Then I should see a link to "About":/about
+        Then I should see a link to "ruby":/tags/ruby
+        Then I should see a link to "sinatra":/tags/sinatra
+        Then I should see a link to "git":/tags/git
+        Then I should see a link to "aerial":/tags/aerial

data/index.html

@@ -0,0 +1,164 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="content-type" content="text/html;charset=UTF-8"  />
+    <title>aerial</title>
+    <style type="text/css">
+      /* reset */
+      html, body, div, span, applet, object, iframe,
+      h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+      a, abbr, acronym, address, big, cite, code,
+      del, dfn, em, font, img, ins, kbd, q, s, samp,
+      small, strike, strong, sub, sup, tt, var,
+      dl, dt, dd, ul, li,
+      form, label, legend,
+      table, caption, tbody, tfoot, thead, tr, th, td {
+         margin: 0;
+         padding: 0;
+         border: 0;
+         outline: 0;
+         font-weight: inherit;
+         font-style: normal;
+         font-size: 100%;
+         font-family: inherit;
+         vertical-align: baseline;
+      }
+      :focus {
+         outline: 0;
+      }
+      body {
+         line-height: 1;
+            color: black;
+      background: white;
+      }
+      ul {
+         list-style: none;
+      }
+         table {
+         border-collapse: collapse;
+         border-spacing: 0;
+      }
+         caption, th, td {
+         text-align: left;
+         font-weight: normal;
+      }
+      blockquote:before, blockquote:after,
+         q:before, q:after {
+         content: "";
+      }
+      blockquote, q {
+         quotes: "" "";
+      }
+
+      /* styles */
+      body {
+         font-family: Verdana,Arial,sans-serif;
+         background: #f0f0f0;
+         color: #333;
+      }
+      #inset {
+         margin: 0 auto;
+         width: 860px;
+      }
+      #container {
+         background-color: #fff;
+         color: #000;
+         padding: 50px 100px;
+      }
+      p, h2 {
+         margin: 20px 0;
+      }
+      p {
+         line-height: 20px;
+      }
+      a {
+      color: #000;
+         text-decoration: none;
+         font-weight: bold;
+      }
+      a:hover {
+         color: #26B3CF;
+      }
+      h1 {
+         /* Hide generated title */
+         display: none;
+      }
+      h1.title {
+         display: block;
+         font-size: 3.8em;
+         margin-bottom: 3px;
+      }
+      h1.title .small {
+         font-size: 0.4em;
+      }
+      h1 a {
+         font-weight: normal;
+      }
+      h2 {
+         font-size: 1.5em;
+      }
+      li {
+         padding-bottom: 10px;
+      }
+      .ribbon {
+         float: right;
+      }
+      .description {
+         font-size: 1.2em;
+         margin-bottom: 30px;
+         margin-top: 30px;
+         font-style: italic;
+      }
+      pre {
+         background: #444;
+         color: #fff;
+         font-family:'Bitstream Vera Sans Mono','Courier',monospace;
+         padding: 15px;
+         -moz-border-radius: 5px;
+         -webkit-border-radius: 5px;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="inset">
+      <a href="http://github.com/mattsears/aerial">
+        <img class="ribbon" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" />
+      </a>
+      <div id="container">
+        <div class="description">
+          Aerial uses Git to store articles and pages.
+        </div>
+        <h1>Aerial</h1>
+        <p>Designed for Ruby developers, there is no admin interface and no SQL database. Articles are written in your favorite text editor and versioned with Git. Comments are also stored as plain-text files and pushed to the remote repository when created. It uses Grit (http://github.com/mojombo/grit) to interface with local and remote Git repositories.</p>
+        <h2>Installation</h2>
+
+        <p>via Rubygems:</p>
+        <pre><code>$ gem install aerial
+$ aerial install /home/user/myblog</code></pre>
+        <p>This will create a couple files and directories. Mainly, the views, public, and configuration files.  You may edit config.yml to your liking</p>
+        <p>The installer provides special configuration files for Thin and Passenger.</p>
+        <p>via Clone:</p>
+        <pre><code>$ git clone git://github.com/mattsears/aerial</code></pre>
+
+        <h2>Pasenger</h2>
+        <pre><code>$ aerial install /home/user/myblog --passenger
+$ cd /home/user/myblog</code></pre>
+        <p>Then, restart Passenger <b>$ touch tmp/restart.txt</b></p>
+        <h2>Thin</h2>
+        <p>Install Thin:</p>
+        <pre><code>$ gem install thin</code></pre>
+        <p>Run the installer:</p>
+        <pre><code>$ aerial install /home/user/myblog --thin
+$ cd /home/user/myblog</code></pre>
+        <p>Tweak the thin.yml</p>
+        <p>Start the thin server</p>
+        <pre><code>$ thin -C thin.yml -R config.ru start</code></pre>
+        <h2>Issues</h2>
+        <p>Find a bug? Want a feature? Submit an <a href="http://github.com/mattsears/aerial/issues">issue here</a>. Patches welcome!
+        </p
+      </div>
+    </div>
+  </body>
+</html>

data/lib/aerial.rb

@@ -1,100 +1,51 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 AERIAL_ROOT = File.join(File.dirname(__FILE__), '..') unless defined? AERIAL_ROOT
+CONFIG = YAML.load_file( File.join(AERIAL_ROOT, 'config', 'config.yml') ) unless defined?(CONFIG)
 
 # System requirements
 require 'rubygems'
 require 'grit'
 require 'yaml'
 require 'sinatra'
+require 'haml'
+require 'sass'
 require 'rdiscount'
 require 'aerial/base'
+require 'aerial/content'
+require 'aerial/article'
+require 'aerial/comment'
+require 'aerial/vendor/cache'
+require 'aerial/vendor/akismetor'
+require 'aerial/config'
+require 'aerial/app'
+
+module Aerial
+
+  # Make sure git is added to the env path
+  ENV['PATH'] = "#{ENV['PATH']}:/usr/local/bin"
+  VERSION = '0.1.0'
+
+  class << self
+    attr_accessor :debug, :logger, :repo, :config
+  end
+
+  def self.new(root, config_name = nil)
+    @root   ||= root
+    @logger ||= ::Logger.new(STDOUT)
+    @debug  ||= false
+    @repo   ||= Grit::Repo.new(@root)
+    config  = File.join(root, config_name)
+
+    if config.is_a?(String) && File.file?(config)
+      @config = Aerial::Config.new(YAML.load_file(config))
+    elsif config.is_a?(Hash)
+      @config = Aerial::Config.new(config)
+    end
+  end
+
+  def self.log(str)
+    logger.debug { str } if debug
+  end
 
-before do
-  # kill trailing slashes for all requests except '/'
-  request.env['PATH_INFO'].gsub!(/\/$/, '') if request.env['PATH_INFO'] != '/'
-end
-
-# Configuration
-configure do
-  set :views  => Aerial.config.theme_directory
-  set :public => Aerial.config.public.dir
-end
-
-# Helpers
-helpers do
-  include Rack::Utils
-  include Sinatra::Cache::Helpers
-  include Aerial::Helper
-  alias_method :h, :escape_html
-end
-
-# Homepage
-get '/' do
-  @articles = Aerial::Article.recent(:limit => 10)
-  cache haml(Aerial.config.views.default.to_sym)
-end
-
-# Articles
-get '/articles' do
-  @content_for_sidebar = partial(:sidebar)
-  @articles = Aerial::Article.recent(:limit => 10)
-  cache haml(:articles)
-end
-
-get '/feed*' do
-  content_type 'text/xml', :charset => 'utf-8'
-  @articles = Aerial::Article.all
-  cache haml(:rss, :layout => false)
-end
-
-# Sassy!
-get '/style.css' do
-  content_type 'text/css', :charset => 'utf-8'
-  cache sass(:style)
-end
-
-# Single page
-get '/:page' do
-  cache haml(params[:page])
-end
-
-# Single article page
-get '/:year/:month/:day/:article' do
-  link = [params[:year], params[:month], params[:day], params[:article]].join("/")
-  @content_for_sidebar = partial(:sidebar)
-  @article = Aerial::Article.with_permalink("/#{link}")
-  throw :halt, [404, not_found ] unless @article
-  @page_title = @article.title
-  cache haml(:post)
-end
-
-# Article tags
-get '/tags/:tag' do
-  @content_for_sidebar = partial(:sidebar)
-  @articles = Aerial::Article.with_tag(params[:tag])
-  cache haml(:articles)
-end
-
-# Article archives
-get '/archives/:year/:month' do
-  @content_for_sidebar = partial(:sidebar)
-  @articles = Aerial::Article.with_date(params[:year], params[:month])
-  cache haml(:articles)
-end
-
-# Add comment
-post '/article/:id/comments' do
-  @article = Aerial::Article.find(params[:id])
-  throw :halt, [404, not_found ] unless @article
-
-  comment = Aerial::Comment.new(params.merge!( {
-    :referrer    => request.referrer,
-    :user_agent  => request.user_agent,
-    :user_ip     => request.ip
-  }))
-
-  @article.comments << comment.save(@article.archive_name)
-  cache_expire( @article.permalink )
-  status 204
 end