schnitzelpress 0.0.10 → 0.0.11

data/lib/schnitzelpress/actions/blog.rb

@@ -4,14 +4,27 @@ module SchnitzelPress
       extend ActiveSupport::Concern
 
       included do
-        get %r{^\/(blog)?$} do
+        get '/' do
+          @show_description = true
+          if @post = Post.published.pages.where(slugs: 'home').first
+            render_post
+          else
+            render_blog
+          end
+        end
+
+        get '/blog/?' do
+          @show_description = true
+          render_blog
+        end
+
+        def render_blog
           total_count   = Post.latest.count
           skipped_count = params[:page].to_i * 10
           @posts = Post.latest.skip(skipped_count).limit(10)
           displayed_count = @posts.count(true)
 
           @show_previous_posts_button = total_count > skipped_count + displayed_count
-          @show_description = true
           haml :index
         end
 
@@ -57,17 +70,19 @@ module SchnitzelPress
           render_post
         end
 
-        get '/:slug/?' do |slug|
+        get '/*/?' do
+          slug = params[:splat].first
           @post = Post.where(slugs: slug).first
           render_post
         end
 
-        def render_post
+        def render_post(enforce_canonical_url = true)
           if @post
             # enforce canonical URL
-            if request.path != url_for(@post)
+            if enforce_canonical_url && request.path != url_for(@post)
               redirect url_for(@post)
             else
+              @show_description = (@post.slug == 'home')
               haml :post
             end
           else

data/lib/schnitzelpress/version.rb

@@ -1,3 +1,3 @@
 module SchnitzelPress
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/schnitzelpress.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rack', '~> 1.4.0'
   gem.add_dependency 'sinatra', '~> 1.3.2'
   gem.add_dependency 'activesupport', '~> 3.2.0'
-  gem.add_dependency 'rack-cache', '~> 1.1'
+  gem.add_dependency 'rack-cache', '~> 1.1.0'
 
   # database related
   gem.add_dependency 'mongo', '~> 1.5.2'
-  gem.add_dependency 'mongoid', '~> 2.4'
-  gem.add_dependency 'bson_ext', '~> 1.5'
+  gem.add_dependency 'mongoid', '~> 2.4.0'
+  gem.add_dependency 'bson_ext', '~> 1.5.0'
 
   # authentication
   gem.add_dependency 'omniauth', '~> 1.0.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schnitzelpress
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70123352615300 !ruby/object:Gem::Requirement
+  requirement: &70363258750300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70123352615300
+  version_requirements: *70363258750300
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70123352614800 !ruby/object:Gem::Requirement
+  requirement: &70363258734420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70123352614800
+  version_requirements: *70363258734420
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70123352614320 !ruby/object:Gem::Requirement
+  requirement: &70363258733960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70123352614320
+  version_requirements: *70363258733960
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70123352613840 !ruby/object:Gem::Requirement
+  requirement: &70363258733500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70123352613840
+  version_requirements: *70363258733500
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70123352613360 !ruby/object:Gem::Requirement
+  requirement: &70363258733020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,32 +65,32 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70123352613360
+  version_requirements: *70363258733020
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70123352612880 !ruby/object:Gem::Requirement
+  requirement: &70363258732520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70123352612880
+  version_requirements: *70363258732520
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70123352612400 !ruby/object:Gem::Requirement
+  requirement: &70363258732040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70123352612400
+  version_requirements: *70363258732040
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70123352592980 !ruby/object:Gem::Requirement
+  requirement: &70363258731580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70123352592980
+  version_requirements: *70363258731580
 - !ruby/object:Gem::Dependency
   name: omniauth-browserid
-  requirement: &70123352592500 !ruby/object:Gem::Requirement
+  requirement: &70363258731120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70123352592500
+  version_requirements: *70363258731120
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70123352592040 !ruby/object:Gem::Requirement
+  requirement: &70363258730640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70123352592040
+  version_requirements: *70363258730640
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70123352591560 !ruby/object:Gem::Requirement
+  requirement: &70363258730140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.1.15
   type: :runtime
   prerelease: false
-  version_requirements: *70123352591560
+  version_requirements: *70363258730140
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70123352591100 !ruby/object:Gem::Requirement
+  requirement: &70363258729540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70123352591100
+  version_requirements: *70363258729540
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70123352590640 !ruby/object:Gem::Requirement
+  requirement: &70363258729020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70123352590640
+  version_requirements: *70363258729020
 - !ruby/object:Gem::Dependency
   name: schnitzelstyle
-  requirement: &70123352590180 !ruby/object:Gem::Requirement
+  requirement: &70363258728300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70123352590180
+  version_requirements: *70363258728300
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70123352589720 !ruby/object:Gem::Requirement
+  requirement: &70363258727460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70123352589720
+  version_requirements: *70363258727460
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70123352588780 !ruby/object:Gem::Requirement
+  requirement: &70363258727000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70123352588780
+  version_requirements: *70363258727000
 - !ruby/object:Gem::Dependency
   name: ruby-oembed
-  requirement: &70123352587540 !ruby/object:Gem::Requirement
+  requirement: &70363258724460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.8.5
   type: :runtime
   prerelease: false
-  version_requirements: *70123352587540
+  version_requirements: *70363258724460
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70123352587060 !ruby/object:Gem::Requirement
+  requirement: &70363258724000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70123352587060
+  version_requirements: *70363258724000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70123352586580 !ruby/object:Gem::Requirement
+  requirement: &70363258723540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70123352586580
+  version_requirements: *70363258723540
 - !ruby/object:Gem::Dependency
   name: wirble
-  requirement: &70123352586000 !ruby/object:Gem::Requirement
+  requirement: &70363258723080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70123352586000
+  version_requirements: *70363258723080
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70123352585500 !ruby/object:Gem::Requirement
+  requirement: &70363258722620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -241,10 +241,10 @@ dependencies:
         version: 0.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70123352585500
+  version_requirements: *70363258722620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70123352585000 !ruby/object:Gem::Requirement
+  requirement: &70363258722160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70123352585000
+  version_requirements: *70363258722160
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70123352569000 !ruby/object:Gem::Requirement
+  requirement: &70363258721780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123352569000
+  version_requirements: *70363258721780
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70123352568540 !ruby/object:Gem::Requirement
+  requirement: &70363258721320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123352568540
+  version_requirements: *70363258721320
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70123352567720 !ruby/object:Gem::Requirement
+  requirement: &70363258720760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -285,10 +285,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70123352567720
+  version_requirements: *70363258720760
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70123352567000 !ruby/object:Gem::Requirement
+  requirement: &70363258720280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123352567000
+  version_requirements: *70363258720280
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70123352566300 !ruby/object:Gem::Requirement
+  requirement: &70363258719680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123352566300
+  version_requirements: *70363258719680
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70123352565800 !ruby/object:Gem::Requirement
+  requirement: &70363258719080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,10 +318,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123352565800
+  version_requirements: *70363258719080
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70123352565380 !ruby/object:Gem::Requirement
+  requirement: &70363258718320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -329,10 +329,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123352565380
+  version_requirements: *70363258718320
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70123352564900 !ruby/object:Gem::Requirement
+  requirement: &70363258717900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -340,10 +340,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123352564900
+  version_requirements: *70363258717900
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70123352564420 !ruby/object:Gem::Requirement
+  requirement: &70363258717480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -351,7 +351,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123352564420
+  version_requirements: *70363258717480
 description: A lean, mean blogging machine for hackers and fools.
 email:
 - hendrik@mans.de