schnitzelpress 0.0.5 → 0.0.6

data/README.md

@@ -2,4 +2,6 @@
 
 ## A lean, mean blogging machine for hackers and fools.
 
+## http://schnitzelpress.org
+
 [![Build Status](https://secure.travis-ci.org/teamschnitzel/schnitzelpress.png?branch=master)](http://travis-ci.org/teamschnitzel/schnitzelpress)

data/lib/schnitzelpress/actions/admin.rb

@@ -34,7 +34,7 @@ module SchnitzelPress
           haml :'admin/edit'
         end
 
-        post '/admin/edit/:id/?' do
+        put '/admin/edit/:id/?' do
           @post = Post.find(params[:id])
           @post.attributes = params[:post]
           if @post.save

data/lib/schnitzelpress/actions/blog.rb

@@ -27,15 +27,21 @@ module SchnitzelPress
           redirect settings.feed_url
         end
 
+        get %r{^/(\d{4})/(\d{1,2})/(\d{1,2})/?$} do
+          year, month, day = params[:captures]
+          @posts = Post.latest.for_day(year.to_i, month.to_i, day.to_i)
+          haml :index
+        end
+
         get %r{^/(\d{4})/(\d{1,2})/?$} do
           year, month = params[:captures]
-          @posts = Post.for_month(year.to_i, month.to_i)
+          @posts = Post.latest.for_month(year.to_i, month.to_i)
           haml :index
         end
 
         get %r{^/(\d{4})/?$} do
           year = params[:captures].first
-          @posts = Post.for_year(year.to_i)
+          @posts = Post.latest.for_year(year.to_i)
           haml :index
         end
 

data/lib/schnitzelpress/app.rb

@@ -13,6 +13,7 @@ module SchnitzelPress
     use SchnitzelPress::Static
     use Rack::ShowExceptions
     use Rack::Cache
+    use Rack::MethodOverride
     use Rack::Session::Cookie
 
     helpers SchnitzelPress::Helpers
@@ -32,6 +33,8 @@ module SchnitzelPress
       set :footer, ""
       set :administrator, nil
       set :feed_url, '/posts.atom'
+
+      disable :protection
     end
 
     def cache_for(time)

data/lib/schnitzelpress/post.rb

@@ -8,6 +8,15 @@ module SchnitzelPress
     def block_code(code, language)
       CodeRay.highlight(code, language)
     end
+
+    def autolink(link, type)
+      if link =~ %r{youtube.com\/watch\?v=(.+)$}
+        youtube_id = $1
+        %q(<iframe width="600" height="335" src="http://www.youtube.com/embed/%s"></iframe>) % youtube_id
+      else
+        %q(<a href="%s">%s</a>) % [link, link]
+      end
+    end
   end
 
   class Post
@@ -39,8 +48,8 @@ module SchnitzelPress
 
     scope :published, where(:status => :published)
     scope :drafts,    where(:status => :draft)
-    scope :pages,     where(:published_at.exists => false)
-    scope :posts,     where(:published_at.exists => true)
+    scope :pages,     where(:published_at => nil)
+    scope :posts,     where(:published_at.ne => nil)
     scope :article_posts, -> { posts.where(:link => nil) }
     scope :link_posts, -> { posts.where(:link.ne => nil) }
     scope :for_year,  ->(year) { d = Date.new(year) ; where(published_at: (d.beginning_of_year)..(d.end_of_year)) }

data/lib/schnitzelpress/version.rb

@@ -1,3 +1,3 @@
 module SchnitzelPress
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/templates/new_blog/Gemfile

@@ -15,5 +15,5 @@ gem 'schnitzelpress',      git: 'git://github.com/teamschnitzel/schnitzelpress.g
 # If you'd prefer to use the officially released versions,
 # use these instead:
 #
-# gem 'schnitzelstyle', :path => '../schnitzelstyle'
-# gem 'schnitzelpress',     :path => '../schnitzelpress'
+# gem 'schnitzelstyle'
+# gem 'schnitzelpress'

data/lib/templates/new_blog/app.rb.tt

@@ -15,7 +15,7 @@ class App < SchnitzelPress::App
     set :blog_description, "A new blog powered by SchnitzelPress."
     set :author_name, "Your Name"
     set :footer, "powered by [SchnitzelPress](http://schnitzelpress.org)"
-    set :administrator, "browser_id:hendrik@mans.de"
+    set :administrator, "browser_id:your@email.com"
 
     # The following are optional:
     #

data/lib/views/partials/_post_form.haml

@@ -1,4 +1,5 @@
 %form.post{ action: @post.new_record? ? '/admin/new' : "/admin/edit/#{@post.id}", method: 'post' }
+  %input{ type: 'hidden', name: '_method', value: @post.new_record? ? 'post' : 'put'}
   = form_field @post, :title, placeholder: "Title of your post."
   = form_field @post, :link, placeholder: "Optional link to external URL."
   = form_field @post, :body, type: :textarea, placeholder: "Your post's body of text. Markdown formatting available."

data/schnitzelpress.gemspec

@@ -4,9 +4,9 @@ require File.expand_path('../lib/schnitzelpress/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Hendrik Mans"]
   gem.email         = ["hendrik@mans.de"]
-  gem.description   = %q{A simple blog engine for sane hackers.}
-  gem.summary       = %q{A simple blog engine for sane hackers.}
-  gem.homepage      = "http://www.schnitzelpress.org"
+  gem.description   = %q{A lean, mean blogging machine for hackers and fools.}
+  gem.summary       = %q{A lean, mean blogging machine for hackers and fools.}
+  gem.homepage      = "http://schnitzelpress.org"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
@@ -50,7 +50,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '>= 2.8.0'
   gem.add_development_dependency 'rspec-html-matchers'
   gem.add_development_dependency 'database_cleaner'
-  gem.add_development_dependency 'factory_girl'
+  gem.add_development_dependency 'factory_girl', '~> 2.6.0'
   gem.add_development_dependency 'ffaker'
   gem.add_development_dependency 'timecop'
   gem.add_development_dependency 'shotgun'

data/spec/app_spec.rb

@@ -43,13 +43,13 @@ describe SchnitzelPress::App do
   describe 'viewing a single post' do
     context 'when the post has multiple slugs' do
       before do
-        @post = Factory(:post, slugs: ['ancient-slug', 'old-slug', 'current-slug'])
+        @post = Factory(:published_post, published_at: "2011-12-10 12:00", slugs: ['ancient-slug', 'old-slug', 'current-slug'])
       end
 
       it 'should enforce the canonical URL' do
-        get "/#{@post.year}/#{@post.month}/#{@post.day}/ancient-slug/"
+        get "/2011/12/10/ancient-slug/"
         last_response.should be_redirect
-        last_response["Location"].should == "http://example.org/#{@post.year}/#{@post.month}/#{@post.day}/current-slug/"
+        last_response["Location"].should == "http://example.org/2011/12/10/current-slug/"
       end
     end
   end

data/spec/factories.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :post, class: SchnitzelPress::Post do
     title { Faker::Lorem.sentence }
     body  { Faker::Lorem.paragraphs }
-    published_at { rand(1.year).minutes.ago }
+    published_at { Time.now }
   end
 
   factory :published_post, parent: :post do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schnitzelpress
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000 Z
+date: 2012-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70309311394200 !ruby/object:Gem::Requirement
+  requirement: &70220455532900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309311394200
+  version_requirements: *70220455532900
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70309311393200 !ruby/object:Gem::Requirement
+  requirement: &70220455532400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70309311393200
+  version_requirements: *70220455532400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70309311392500 !ruby/object:Gem::Requirement
+  requirement: &70220455531940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309311392500
+  version_requirements: *70220455531940
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &70309311392040 !ruby/object:Gem::Requirement
+  requirement: &70220455531560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311392040
+  version_requirements: *70220455531560
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70309311391120 !ruby/object:Gem::Requirement
+  requirement: &70220455531020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311391120
+  version_requirements: *70220455531020
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70309311390200 !ruby/object:Gem::Requirement
+  requirement: &70220455530520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311390200
+  version_requirements: *70220455530520
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70309311389660 !ruby/object:Gem::Requirement
+  requirement: &70220455530140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311389660
+  version_requirements: *70220455530140
 - !ruby/object:Gem::Dependency
   name: omniauth-browserid
-  requirement: &70309311389100 !ruby/object:Gem::Requirement
+  requirement: &70220455529680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311389100
+  version_requirements: *70220455529680
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70309311388420 !ruby/object:Gem::Requirement
+  requirement: &70220455379940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311388420
+  version_requirements: *70220455379940
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70309311387660 !ruby/object:Gem::Requirement
+  requirement: &70220455378460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311387660
+  version_requirements: *70220455378460
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70309311386580 !ruby/object:Gem::Requirement
+  requirement: &70220455375280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311386580
+  version_requirements: *70220455375280
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70309311386040 !ruby/object:Gem::Requirement
+  requirement: &70220455374840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311386040
+  version_requirements: *70220455374840
 - !ruby/object:Gem::Dependency
   name: schnitzelstyle
-  requirement: &70309311385460 !ruby/object:Gem::Requirement
+  requirement: &70220455373360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70309311385460
+  version_requirements: *70220455373360
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70309311384900 !ruby/object:Gem::Requirement
+  requirement: &70220458978080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311384900
+  version_requirements: *70220458978080
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70309311384360 !ruby/object:Gem::Requirement
+  requirement: &70220458977540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309311384360
+  version_requirements: *70220458977540
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70309311383800 !ruby/object:Gem::Requirement
+  requirement: &70220458977120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311383800
+  version_requirements: *70220458977120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70309311383340 !ruby/object:Gem::Requirement
+  requirement: &70220458976660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311383340
+  version_requirements: *70220458976660
 - !ruby/object:Gem::Dependency
   name: wirble
-  requirement: &70309311382620 !ruby/object:Gem::Requirement
+  requirement: &70220458976240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311382620
+  version_requirements: *70220458976240
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70309311381980 !ruby/object:Gem::Requirement
+  requirement: &70220458975820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309311381980
+  version_requirements: *70220458975820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70309311381320 !ruby/object:Gem::Requirement
+  requirement: &70220458975320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70309311381320
+  version_requirements: *70220458975320
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70309311323420 !ruby/object:Gem::Requirement
+  requirement: &70220458974900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309311323420
+  version_requirements: *70220458974900
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70309311322360 !ruby/object:Gem::Requirement
+  requirement: &70220458974440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,21 +252,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309311322360
+  version_requirements: *70220458974440
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70309311321680 !ruby/object:Gem::Requirement
+  requirement: &70220458973940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70309311321680
+  version_requirements: *70220458973940
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70309311321160 !ruby/object:Gem::Requirement
+  requirement: &70220458973520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309311321160
+  version_requirements: *70220458973520
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70309311320580 !ruby/object:Gem::Requirement
+  requirement: &70220458973060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309311320580
+  version_requirements: *70220458973060
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70309311320100 !ruby/object:Gem::Requirement
+  requirement: &70220458972640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309311320100
+  version_requirements: *70220458972640
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70309311319440 !ruby/object:Gem::Requirement
+  requirement: &70220458972220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309311319440
+  version_requirements: *70220458972220
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70309311318920 !ruby/object:Gem::Requirement
+  requirement: &70220458971800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,10 +318,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309311318920
+  version_requirements: *70220458971800
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70309311318440 !ruby/object:Gem::Requirement
+  requirement: &70220458971380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -329,8 +329,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309311318440
-description: A simple blog engine for sane hackers.
+  version_requirements: *70220458971380
+description: A lean, mean blogging machine for hackers and fools.
 email:
 - hendrik@mans.de
 executables:
@@ -389,7 +389,7 @@ files:
 - spec/factories.rb
 - spec/post_spec.rb
 - spec/spec_helper.rb
-homepage: http://www.schnitzelpress.org
+homepage: http://schnitzelpress.org
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -401,24 +401,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3544895413977592589
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3544895413977592589
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: A simple blog engine for sane hackers.
+summary: A lean, mean blogging machine for hackers and fools.
 test_files:
 - spec/app_spec.rb
 - spec/factories.rb