@@ -9,5 +9,4 @@ vendor/plugins/rspec* public/assets .DS_Store config/deploy.rb -config/mongrel_cluster.yml Capfile .gitignore @@ -28,9 +28,10 @@ Nanoformats supported: == Dependencies -- gem install will_paginate -- gem install xml-simple -- gem install mechanize +sudo gem install will_paginate +sudo gem install xml-simple +sudo gem install mechanize +sudo gem install BlueCloth == Installation @@ -52,6 +53,7 @@ migrate_from_mephisto: Run: +# Make backup first ./script/runner db/migrate/from_mephisto.rb # Dump all mephisto articles to ./articles.yml ./script/runner db/migrate/from_mephisto.rb load_dump README @@ -24,6 +24,11 @@ class DashboardController < ApplicationController end end + def logout + session[:authenticated] = false + redirect_to(:action => :login) + end + def toggle @post = Post.find(params[:id]) @post.update_attribute(:is_deleted, !@post.is_deleted?) app/controllers/dashboard_controller.rb @@ -1,5 +1,5 @@ class PostsController < ApplicationController - before_filter :require_authentication, :except => [:index, :show, :archive] + before_filter :require_authentication, :except => [:index, :show, :archive, :articles] def show if params[:permalink] @@ -47,6 +47,7 @@ class PostsController < ApplicationController format.rss format.atom format.html do + require_authentication render(:layout => 'dashboard') end end app/controllers/posts_controller.rb @@ -5,6 +5,7 @@ <% form_tag do %> <div> <p><label for="password" title="Need this to get in.">Password: </label><%= password_field(:stream, :password) %></p> + <p><label for="blog_url" title="URL of this blog.">Blog URL: </label><%= text_field(:stream, :blog_url) %></p> <p><label for="title" title="Will be used for SEO and in the title $title - $subtitle.">Title: </label><%= text_field(:stream, :title) %></p> <p><label for="subtitle" title="Will be used for SEO and in the title $title - $subtitle.">Subtitle: </label><%= text_field(:stream, :subtitle) %></p> <p><label for="author" title="Used for feeds and for microformats.">Your name: </label><%= text_field(:stream, :author) %></p> app/views/dashboard/index.html.erb @@ -3,7 +3,7 @@ xml.feed(:xmlns => "http://www.w3.org/2005/Atom") do |feed| feed.title("#{@stream.title} - #{@stream.subtitle}") feed.id("tag:#{request.host},#{Time.now.year}:#{APPLICATION_NAME}") feed.link(:href => @stream.blog_url, :rel => "alternate", :type => "text/html") - feed.link(:href => File.join(@stream.blog_url, File.join(request.request_uri), :rel => "self", :type => "application/atom+xml") + feed.link(:href => File.join(@stream.blog_url.to_s, File.join(request.request_uri.to_s)), :rel => "self", :type => "application/atom+xml") feed.updated(@articles.first.published_at.iso8601) if @articles.first feed.generator(APPLICATION_NAME, :uri => 'http://dominiek.com/tag/maitako') @articles.each do |article| app/views/posts/articles.atom.builder @@ -7,7 +7,7 @@ xml.rss('version' => '2.0', xml.title("#{@stream.title} - #{@stream.subtitle}") xml.description("#{@stream.subtitle}") xml.link(@stream.blog_url) - xml.tag!('atom:link', :href => File.join(@stream.blog_url, File.join(request.request_uri), :rel => 'self', :type => 'application/rss+xml') + xml.tag!('atom:link', :href => File.join(@stream.blog_url.to_s, File.join(request.request_uri.to_s)), :rel => 'self', :type => 'application/rss+xml') xml.pubDate(@articles.first.published_at.to_s(:rfc822)) if @articles.first xml.generator(APPLICATION_NAME) @articles.each do |article| app/views/posts/articles.rss.builder dbf5bbded8428fea6e58070b1d2b346169f75a01 Dominiek ter Heide info@dominiek.com http://github.com/dominiek/kakuteru/commit/f2203b2493364cb5f0b3a6e759eb36f69a5b00af f2203b2493364cb5f0b3a6e759eb36f69a5b00af 2008-09-27T06:25:03-07:00 2008-09-27T06:25:03-07:00 Critical fixes f5473f3a9abb625401838e03806e7279b68ae77a Dominiek ter Heide info@dominiek.com