schreihals 0.0.1 → 0.0.2

data/README.md

@@ -32,3 +32,14 @@ Just a list of keywords I need to write about:
 * `google_analytics_id`
 * `link`
 * `read_more`
+
+## Version History
+
+### 0.0.2
+
+* Fix various stupid bugs from the initial release, including the broken example app. Duh!
+* When a post or page could not be found, we now display a proper 404 page (with correct status code.)
+
+### 0.0.1
+
+* Initial release.

data/example/Gemfile

@@ -1,5 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'schreihals', :path => '..'
-# temporary
-gem 'schnitzelstyle', :path => '../../schnitzelstyle'
+# In a real-world schreihals blog, remove the :path option, obviously.
+#
+gem 'schreihals', :path => '../'
+
+# For the time being, we need this fork of document_mapper.
+#
+gem 'document_mapper', :git => 'git://github.com/hmans/document_mapper.git', :branch => "after_load_hook"

data/example/config.ru

@@ -1,8 +1,8 @@
 require 'schreihals'
 
 class MyBlog < Schreihals::App
-  set :blog_title, "hmans.net"
-  set :author_name, "Hendrik Mans"
+  set :blog_title, "The Blog of AWESOME"
+  set :author_name, "Mr. Schreihals"
 end
 
 run MyBlog

data/lib/schreihals/version.rb

@@ -1,3 +1,3 @@
 module Schreihals
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/schreihals.rb

@@ -20,7 +20,9 @@ module Schreihals
       #
       self.attributes = {
         disqus: true,
-        status: 'published'
+        status: 'published',
+        summary: nil,
+        link: nil
       }.merge(attributes)
 
       # Set slug
@@ -65,6 +67,7 @@ module Schreihals
   class App < Sinatra::Application
     set :blog_title, "My Schreihals Blog"
     set :blog_url, ""
+    set :blog_description, ""
     set :author_name, "Author"
     set :disqus_name, nil
     set :google_analytics_id, nil
@@ -141,8 +144,12 @@ module Schreihals
       if @post = Post.where(:slug => slug).first
         haml :post
       else
-        "not found :("
+        halt 404
       end
     end
+
+    not_found do
+      haml :"404"
+    end
   end
 end

data/lib/views/404.haml

@@ -0,0 +1,5 @@
+%section
+  .container
+    %h2 400 + 4
+    %p
+      The document you requested could not be found.

data/lib/views/layout.haml

@@ -1,10 +1,9 @@
-!!!
+!!! 5
 %html
   %head
     %title= [@page_title, settings.blog_title].compact.join(" | ")
     %link{href: '/schreihals.css', media: "screen", rel: "stylesheet", type: "text/css"}
     %link{ href: '/atom.xml', title: "Subscribe via Atom Feed", rel: 'alternate', type: 'application/atom+xml' }
-    / %script{ src: asset_path('application.js') }
   %body
     %header
       .container

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schreihals
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70235432785300 !ruby/object:Gem::Requirement
+  requirement: &70220324705880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432785300
+  version_requirements: *70220324705880
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70235432784480 !ruby/object:Gem::Requirement
+  requirement: &70220324704580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432784480
+  version_requirements: *70220324704580
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70235432783340 !ruby/object:Gem::Requirement
+  requirement: &70220324702440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432783340
+  version_requirements: *70220324702440
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70235432780880 !ruby/object:Gem::Requirement
+  requirement: &70220324701320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432780880
+  version_requirements: *70220324701320
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70235432779440 !ruby/object:Gem::Requirement
+  requirement: &70220324700620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432779440
+  version_requirements: *70220324700620
 - !ruby/object:Gem::Dependency
   name: document_mapper
-  requirement: &70235432778420 !ruby/object:Gem::Requirement
+  requirement: &70220324699420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432778420
+  version_requirements: *70220324699420
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70235432777820 !ruby/object:Gem::Requirement
+  requirement: &70220324698340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432777820
+  version_requirements: *70220324698340
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70235432777320 !ruby/object:Gem::Requirement
+  requirement: &70220324697560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432777320
+  version_requirements: *70220324697560
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70235432776660 !ruby/object:Gem::Requirement
+  requirement: &70220324696600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432776660
+  version_requirements: *70220324696600
 - !ruby/object:Gem::Dependency
   name: rack-codehighlighter
-  requirement: &70235432776080 !ruby/object:Gem::Requirement
+  requirement: &70220324695840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70235432776080
+  version_requirements: *70220324695840
 - !ruby/object:Gem::Dependency
   name: schnitzelstyle
-  requirement: &70235432775280 !ruby/object:Gem::Requirement
+  requirement: &70220324695100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70235432775280
+  version_requirements: *70220324695100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70235432774640 !ruby/object:Gem::Requirement
+  requirement: &70220324694080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70235432774640
+  version_requirements: *70220324694080
 description: A simple blog engine for hackers.
 email:
 - hendrik@mans.de
@@ -160,10 +160,12 @@ files:
 - example/config.ru
 - example/posts/2010-06-17-pythton-is-great.md
 - example/posts/2011-12-22-ruby-is-great.md
+- example/public/media/.gitkeep
 - lib/public/.gitkeep
 - lib/public/favicon.ico
 - lib/schreihals.rb
 - lib/schreihals/version.rb
+- lib/views/404.haml
 - lib/views/atom.haml
 - lib/views/index.haml
 - lib/views/layout.haml