aerial 0.0.0 → 0.1.0

data/{lib/spec → spec}/spec_helper.rb

@@ -8,7 +8,12 @@ require 'fileutils'
 require 'grit'
 require 'rack'
 require 'spec'
-require 'sinatra/test/rspec'
+require 'rack/test'
+
+def app
+  Aerial::App.set :root, File.expand_path( File.join(File.dirname(__FILE__), 'repo') )
+  Aerial::App
+end
 
 # Helper for matching html tags
 module TagMatchers
@@ -62,7 +67,6 @@ module GitHelper
 
   def new_git_repo
     delete_git_repo # delete the old repo first
-
     path = File.expand_path( File.join(File.dirname(__FILE__), 'repo') )
     data = File.expand_path( File.join(File.dirname(__FILE__), 'fixtures') )
     Dir.mkdir(path)
@@ -94,11 +98,14 @@ include GitHelper
 
 Spec::Runner.configure do |config|
   repo_path = new_git_repo
+
   CONFIG = YAML.load_file( File.join(File.dirname(__FILE__), 'fixtures', 'config.yml') ) unless defined?(CONFIG)
   AERIAL_ROOT = File.join(File.dirname(__FILE__), 'repo') unless defined?(AERIAL_ROOT)
-  require File.expand_path(File.dirname(__FILE__) + "/../aerial")
+
+  require File.expand_path(File.dirname(__FILE__) + "/../lib/aerial")
   config.include TagMatchers
   config.include GitHelper
+  config.include Rack::Test::Methods
   config.include Aerial
   config.include Aerial::Helper
 end
@@ -108,10 +115,15 @@ set :environment, :test
 set :run, false
 set :raise_errors, true
 set :logging, false
+set :views => File.join(File.dirname(__FILE__), "/..", "repo", "views"),
+:public => File.join(File.dirname(__FILE__), "/..", "repo", "public")
 
 include Aerial
 
 def setup_repo
   @repo_path = new_git_repo
+  @config_path = File.join(@repo_path, "config")
   Aerial.stub!(:repo).and_return(Grit::Repo.new(@repo_path))
+  Aerial.new(@repo_path, "config.yml")
+
 end

data/views/article.haml

@@ -0,0 +1,19 @@
+- article = @article if @article
+.article
+  %h2
+    %a{:href => article.permalink}
+      =article.title
+    %span
+      =article.comments.size
+  %h3
+    ="Posted by #{article.author} on #{humanized_date article.publish_date}"
+  %p.entry
+    =article.body_html
+  .meta
+    %span
+      Tags:
+    =link_to_tags article.tags
+    %br/
+    %span
+      Meta:
+    ="#{article.comments.size} comments, <a href='#{article.permalink}' rel='permalink'>permalink</a>"

data/views/articles.haml

@@ -0,0 +1,2 @@
+#articles
+  =partial :article, :collection => @articles

data/views/comment.haml

@@ -0,0 +1,8 @@
+.comment
+  %h2
+    %a{:href => comment.homepage}
+      =comment.author
+    %span
+      =comment.publish_date
+  %p
+    =comment.body

data/views/home.haml

@@ -0,0 +1,2 @@
+#articles
+  =partial :article, :collection => @articles

data/views/layout.haml

@@ -0,0 +1,22 @@
+!!! Strict
+%html
+  %head
+    %title= page_title
+    %script{ 'type' => "text/javascript", :src => "/javascripts/jquery-1.3.1.min.js" }
+    %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 => "#{base_url}/feed", :rel => 'alternate', :type => 'application/atom+xml', :title => "Feed for #{}" }
+  %body
+    #container
+      #header
+        #logo
+          %h1
+            %a{:href => '/'}= Aerial.config.title
+            %span
+              =Aerial.config.subtitle
+      #content= yield
+      #sidebar= partial :sidebar
+      #footer
+        %p#legal= "© #{Time.now.strftime('%Y')} #{Aerial.config.author}"
+        %p#powered= "powered by <a href='http://github.com/mattsears/aerial' title='Aerial'>Aerial</a>"

data/views/not_found.haml

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

data/views/post.haml

@@ -0,0 +1,27 @@
+=partial :article
+%h5
+  Comments
+#comments
+  =partial :comment, :collection => @article.comments
+
+%div{:id => "new_comment"}
+  %form{:action => "/article/#{@article.id}/comments"}
+    %p
+      %input{:type => "text", :id => "comment_author"}
+      %label{:id => "author_label"}
+        Your name (required)
+    %p
+      %input{:type => "text", :id => "comment_email"}
+      %label{:id => "email_label"}
+        Your email address (required)
+    %p
+      %input{:type => "text", :id => "comment_homepage"}
+      %label{:id => "homepage_label"}
+        Website
+    %p
+      %label{:id => "comment_label"}
+        Please enter your comment
+      %textarea{:id => "comment_body"}
+    %p
+      %button{:type => "submit", :id => "comment_submit", :onclick => "Comment.submit('#{@article.id}'); return false;"}
+        Submit Comment (Thanks)

data/views/rss.haml

@@ -0,0 +1,15 @@
+!!! XML
+%rss{"version" => "2.0"}
+  %channel
+    %title= "#{Aerial.config.title}"
+    %link= "#{base_url}"
+    %language= "en-us"
+    %ttl= "40"
+    %description= "#{Aerial.config.subtitle}"
+    - @articles.each do |article|
+      %item
+        %title= article.title
+        %link= full_hostname(article.permalink)
+        %description= article.body_html
+        %pubDate= article.publish_date
+        %guid{"isPermaLink" => "false"}= article.id

data/views/sidebar.haml

@@ -0,0 +1,29 @@
+#about
+  %h2 About
+  %p
+    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|
+    %li
+      %a{:href => "#{article.permalink}"}=article.title
+%h2 Categories
+%ul
+  -Aerial::Article.tags.each do |tag|
+    %li
+      %a{:href => "/tags/#{tag}"}=tag
+%h2 Archives
+%ul
+  -Aerial::Article.archives.each do |archive|
+    %li
+      %a{:href => "/archives/#{archive[0][0]}"}="#{archive[0][1]} (#{archive[1]})"

data/views/style.sass

@@ -0,0 +1,163 @@
+!red = #f00
+!black = #000
+!darkgrey = #555
+!lightgrey = #eeeeee
+!blue = #2168a6
+!red = #ed1e24
+
+=image-replacement
+  :text-indent -9999px
+  :margin-bottom 0.3em
+
+body
+  :color = !black
+  :font normal 12px Verdana, Arial, sans-serif
+  :font-size 88%
+  :line-height 1.5
+a
+  :text-decoration none
+  :color = !darkgrey
+  &:visited
+    :color = !darkgrey
+  &:hover, &:visited
+    :text-decoration underline
+h2
+  :font-size 100%
+
+ul
+  :padding 0
+  li
+    :list-style none
+    :line-height 1.2
+    :margin 0 0 5px 0
+    a
+      :text-decoration underline
+      &:hover
+        :text-decoration none
+form
+  :background = !lightgrey
+  :padding 10px
+  :border-top 1px solid #ddd
+  :font-size 100%
+  p
+    :margin 0 0 5px 0
+  label
+    :font-size 88%
+  label.error
+    :background-color = !red
+    :padding 2px
+    :color #fff
+  input
+    :border 1px solid
+    :padding 2px
+    :width 300px
+    :border-color = #ddd
+    :font-size 100%
+  textarea
+    :border 1px solid
+    :border-color = #ddd
+    :width 500px
+    :padding 3px
+    :height 75px
+    :font normal 14px Verdana, Arial, sans-serif
+
+#header
+  :height 60px
+  :width 100%
+  :border-bottom 1px dashed
+  :border-color = !lightgrey
+  #logo
+    :float left
+    :height 50px
+    h1
+      :font 300% arial, sans-serif
+      :padding 5px 0
+      :margin 0
+      a
+        :color = !blue
+        :text-decoration none
+      span
+        :font-size 16pt
+        :color = !darkgrey
+
+#container
+  :width 800px
+  :margin 0 auto
+
+#content
+  :width 575px
+  :float left
+  :border-right 1px dashed
+  :border-color = !lightgrey
+  :padding 10px 10px 0 0
+  h5
+    :font-size 110%
+    :background-color #ffd
+    :margin 1.2em 0 0.3em
+    :padding 3px
+    :border-bottom 1px dotted #aaa
+  .article, .page
+    h2
+      :color = !darkgrey
+      :font-family arial, sans-serif
+      :font-weight normal
+      :letter-spacing -1px
+      :font-size 28px
+      :margin 0 0 -9px 0
+      a
+        :text-decoration none
+    span
+      :color = !lightgrey
+    h3
+      :color #777
+      :font-weight normal
+      :margin 0 0 0 2px
+      :padding 0
+      :font-size 110%
+      :letter-spacing -0.5px
+  .meta
+    :font-size 8pt
+    :background = !lightgrey
+    :padding 5px
+    :border 1px solid #ddd
+    :margin 15px 0
+    span
+      :color = !darkgrey !important
+      :font-weight bold
+
+  .comment
+    :margin 15px 0
+    :padding 10px
+    :border 3px solid
+    :border-color = !lightgrey
+    h2
+      span
+        :font-size 88%
+        :margin-left 5px
+        :color #777
+
+#sidebar
+  :float right
+  :width 200px
+  :font-size 88%
+  p
+    :margin-top -7px
+  a
+    :color = !blue
+
+#footer
+  :width 100%
+  :height 100px
+  :float left
+  :margin-top 20px
+  :border-top 1px dashed
+  :border-color = !lightgrey
+  p
+    :margin-top 5px
+  #legal
+    :width 40%
+    :float left
+  #powered
+    :width  50%
+    :float right
+    :text-align right

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aerial
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Matt Sears
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -04:00
-default_executable: 
+date: 2009-10-21 00:00:00 -04:00
+default_executable: aerial
 dependencies: []
 
 description: A simple, blogish software build with Sinatra, jQuery, and uses Git for data storage
 email: matt@mattsears.com
-executables: []
-
+executables: 
+- aerial
 extensions: []
 
 extra_rdoc_files: 
@@ -27,48 +27,88 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- aerial.gemspec
+- articles/congratulations/congratulations-aerial-is-configured-correctly.article
+- bin/aerial
+- config/config.sample.ru
+- config/config.sample.yml
+- config/config.test.yml
 - config/config.yml
 - config/deploy.rb
+- config/thin.sample.yml
+- examples/articles/congratulations/congratulations-aerial-is-configured-correctly.article
+- examples/public/javascripts/application.js
+- examples/public/javascripts/jquery-1.3.1.min.js
+- examples/public/javascripts/jquery.template.js
+- examples/views/article.haml
+- examples/views/articles.haml
+- examples/views/comment.haml
+- examples/views/home.haml
+- examples/views/layout.haml
+- examples/views/not_found.haml
+- examples/views/post.haml
+- examples/views/rss.haml
+- examples/views/sidebar.haml
+- examples/views/style.sass
+- features/article.feature
+- features/home.feature
+- features/step_definitions/article_steps.rb
+- features/step_definitions/home_steps.rb
+- features/support/env.rb
+- features/support/pages/article.rb
+- features/support/pages/homepage.rb
+- index.html
 - lib/aerial.rb
+- lib/aerial/app.rb
 - lib/aerial/article.rb
 - lib/aerial/base.rb
 - lib/aerial/comment.rb
 - lib/aerial/config.rb
 - lib/aerial/content.rb
+- lib/aerial/installer.rb
 - lib/aerial/vendor/akismetor.rb
 - lib/aerial/vendor/cache.rb
-- lib/features/article.feature
-- lib/features/home.feature
-- lib/features/step_definitions/article_steps.rb
-- lib/features/step_definitions/home_steps.rb
-- lib/features/support/env.rb
-- lib/features/support/pages/article.rb
-- lib/features/support/pages/homepage.rb
-- lib/spec/aerial_spec.rb
-- lib/spec/article_spec.rb
-- lib/spec/base_spec.rb
-- lib/spec/comment_spec.rb
-- lib/spec/config_spec.rb
-- lib/spec/fixtures/articles/sample-article/sample-article.article
-- lib/spec/fixtures/articles/test-article-one/test-article.article
-- lib/spec/fixtures/articles/test-article-three/test-article.article
-- lib/spec/fixtures/articles/test-article-two/comment-missing-fields.comment
-- lib/spec/fixtures/articles/test-article-two/test-article.article
-- lib/spec/fixtures/articles/test-article-two/test-comment.comment
-- lib/spec/fixtures/config.yml
-- lib/spec/fixtures/public/javascripts/application.js
-- lib/spec/fixtures/public/javascripts/jquery-1.3.1.min.js
-- lib/spec/fixtures/public/javascripts/jquery.template.js
-- lib/spec/fixtures/views/article.haml
-- lib/spec/fixtures/views/articles.haml
-- lib/spec/fixtures/views/comment.haml
-- lib/spec/fixtures/views/home.haml
-- lib/spec/fixtures/views/layout.haml
-- lib/spec/fixtures/views/post.haml
-- lib/spec/fixtures/views/rss.haml
-- lib/spec/fixtures/views/sidebar.haml
-- lib/spec/fixtures/views/style.sass
-- lib/spec/spec_helper.rb
+- public/javascripts/application.js
+- public/javascripts/jquery-1.3.1.min.js
+- public/javascripts/jquery.template.js
+- spec/aerial_spec.rb
+- spec/app_spec.rb
+- spec/article_spec.rb
+- spec/base_spec.rb
+- spec/comment_spec.rb
+- spec/config_spec.rb
+- spec/fixtures/articles/congratulations-aerial-is-configured-correctly/congratulations-aerial-is-configured-correctly.article
+- spec/fixtures/articles/sample-article/sample-article.article
+- spec/fixtures/articles/test-article-one/test-article.article
+- spec/fixtures/articles/test-article-three/test-article.article
+- spec/fixtures/articles/test-article-two/comment-missing-fields.comment
+- spec/fixtures/articles/test-article-two/test-article.article
+- spec/fixtures/articles/test-article-two/test-comment.comment
+- spec/fixtures/config.yml
+- spec/fixtures/public/javascripts/application.js
+- spec/fixtures/public/javascripts/jquery-1.3.1.min.js
+- spec/fixtures/public/javascripts/jquery.template.js
+- spec/fixtures/views/article.haml
+- spec/fixtures/views/articles.haml
+- spec/fixtures/views/comment.haml
+- spec/fixtures/views/home.haml
+- spec/fixtures/views/layout.haml
+- spec/fixtures/views/not_found.haml
+- spec/fixtures/views/post.haml
+- spec/fixtures/views/rss.haml
+- spec/fixtures/views/sidebar.haml
+- spec/fixtures/views/style.sass
+- spec/spec_helper.rb
+- views/article.haml
+- views/articles.haml
+- views/comment.haml
+- views/home.haml
+- views/layout.haml
+- views/not_found.haml
+- views/post.haml
+- views/rss.haml
+- views/sidebar.haml
+- views/style.sass
 has_rdoc: true
 homepage: http://github.com/mattsears/aerial
 licenses: []
@@ -92,10 +132,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: aerial
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A simple, blogish software build with Sinatra, jQuery, and uses Git for data storage
-test_files: []
-
+test_files: 
+- spec/aerial_spec.rb
+- spec/app_spec.rb
+- spec/article_spec.rb
+- spec/base_spec.rb
+- spec/comment_spec.rb
+- spec/config_spec.rb
+- spec/spec_helper.rb