@@ -1,13 +1,5 @@ class ApplicationController < ActionController::Base protect_from_forgery - before_filter :init - - protected - def init - @title = "p0t" - @description = "ガチ鬱プログラマー日記" - @keywords = '鬱,Ruby,PHP,Rails' - end def authenticate authenticate_or_request_with_http_basic do |username, password| app/controllers/application_controller.rb @@ -41,7 +41,8 @@ class DocsController < ApplicationController # GET /docs/new # GET /docs/new.xml def new - @doc = Doc.new + time = Time.new + @doc = Doc.new(:created_at => time, :updated_at => time) respond_to do |format| format.html # new.html.erb @@ -62,7 +63,7 @@ class DocsController < ApplicationController respond_to do |format| if @doc.save flash[:notice] = t('Doc was successfully created.') - format.html { redirect_to(@doc) } + format.html { redirect_to doc_path(@doc) } format.xml { render :xml => @doc, :status => :created, :location => @doc } else format.html { render :action => 'new' } @@ -79,7 +80,7 @@ class DocsController < ApplicationController respond_to do |format| if @doc.update_attributes(params[:doc]) flash[:notice] = t('Doc was successfully updated.') - format.html { redirect_to(@doc) } + format.html { redirect_to doc_path(@doc) } format.xml { head :ok } else format.html { render :action => 'edit' } @@ -93,7 +94,7 @@ class DocsController < ApplicationController @doc.destroy respond_to do |format| - format.html { redirect_to(docs_url) } + format.html { redirect_to docs_path } format.xml { head :ok } end end app/controllers/docs_controller.rb @@ -1,2 +1,3 @@ +- title "Edit Doc - #{Application::TITLE}" .doc = render :partial => "form", :locals => {:submit_label => "Update"} app/views/docs/edit.html.haml @@ -3,7 +3,7 @@ atom_feed( 'xmlns:app' => 'http://www.w3.org/2007/app', 'xmlns:openSearch' => 'http://a9.com/-/spec/opensearch/1.1/' ) do |feed| - feed.title("p0t") + feed.title(Application::TITLE) feed.updated(@docs.first.updated_at) @docs.each do |d| @@ -11,7 +11,7 @@ atom_feed( entry.title(d.title) entry.content(d.body.to_s, :type => "html") entry.author do |a| - a.name("komagata") + a.name(Application::AUTHOR) end end end app/views/docs/index.atom.builder @@ -1,4 +1,4 @@ "id","title","body","created_at","updated_at" <%- for doc in @docs -%> -"<%= doc.id %>","<%= doc.title.gsub(/"/, '""') %>","<%= textilize doc.body.gsub(/"/, '""') %>","<%= doc.created_at.strftime("%Y-%m-%d %H:%M:%S") %>","<%= doc.updated_at.strftime("%Y-%m-%d %H:%M:%S") %>" +"<%= doc.id %>","<%= doc.title.gsub(/"/, '""') %>","<%= doc.body.gsub(/"/, '""') %>","<%= doc.created_at.strftime("%Y-%m-%d %H:%M:%S") %>","<%= doc.updated_at.strftime("%Y-%m-%d %H:%M:%S") %>" <%- end -%> app/views/docs/index.csv.erb @@ -1,4 +1,4 @@ -- title params[:q].present? ? "#{params[:q]} - p0t" : "p0t" +- title "#{params[:q]} - #{Application::TITLE}" if params[:q].present? .docs.autopagerize_page_element = render :partial => "doc", :collection => @docs = paginate @docs app/views/docs/index.html.haml @@ -1,2 +1,3 @@ +- title "New Doc - #{Application::TITLE}" .doc = render :partial => "form", :locals => {:submit_label => "Create"} app/views/docs/new.html.haml @@ -1,4 +1,4 @@ -- title @doc.title.present? ? "#{@doc.title} - p0t" : "p0t" +- title "#{@doc.title} - #{Application::TITLE}" if @doc.title.present? = render :partial => 'doc', :locals => {:doc => @doc} #comment-plnet %script{:type => "text/javascript", :src => "http://comments.komagata.org/widgets/comments_and_form.js"} app/views/docs/show.html.haml @@ -1,3 +1,5 @@ +- title_content = yield :title +- head_content = yield :head !!! XML !!! %html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "ja", :lang => "ja"} @@ -5,22 +7,23 @@ %meta{"http-equiv" => "Content-Type", "content" => "text/html; charset=utf-8"} %meta{"http-equiv" => "Content-Style-Type", "content" => "text/css"} %meta{"http-equiv" => "Content-Script-Type", "content" => "text/javascript"} - %meta{"name" => "description", "content" => @description} - %meta{"name" => "keywords", "content" => @keywords} - %title= @title - = auto_discovery_link_tag :atom, "/index.atom", {:title => @title} + %meta{"name" => "verify-v1", "content" => "+V1YA6UjlGAm1pJpxJFrPARQPzw8KexXsbdbJYcjRZw="} + %meta{"name" => "y_key", "content" => "82ad872ae8a41dc8"} + %meta{"name" => "description", "content" => Application::DESCRIPTION} + %meta{"name" => "keywords", "content" => Application::KEYWORDS} + %title= title_content || Application::TITLE + = auto_discovery_link_tag :atom, "/index.atom", {:title => Application::TITLE} - if params[:query].present? - = auto_discovery_link_tag :atom, find_doc_url(:q => params[:q], :format => "atom"), {:title => @title} + = auto_discovery_link_tag :atom, find_doc_url(:q => params[:q], :format => "atom"), {:title => Application::TITLE} %link{:href => "/favicon.ico", :rel => "shortcut icon"} - %link{:href => "/sitemap.xml", :rel => "alternate", :title => @title, :type => "application/rss+xml"} + %link{:href => "/sitemap.xml", :rel => "alternate", :title => Application::TITLE, :type => "application/rss+xml"} = stylesheet_link_tag "application" - - head_content = yield :head - if head_content = head_content %body .header - %h1.title= link_to "p0t", root_path - .description= @description + %h1.title= link_to Application::TITLE, root_path + .description= Application::DESCRIPTION %ul.menu %li= link_to "Profile", "http://komagata.org" %li= link_to "New Doc", new_doc_path @@ -32,7 +35,7 @@ %br{:style => "clear:both"} .footer writing by - = link_to "komagata", "http://komagata.org" + = link_to Application::AUTHOR, "http://komagata.org" - if Rails.env.production? :javascript var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); app/views/layouts/application.html.haml @@ -5,7 +5,7 @@ namespace :p0t do url = "http://docs.komagata.org/index.csv?per_page=65565" path = "db/seeds/docs.csv" csv = open(url) {|f| f.read } - open(path, "w") {|f| f.write(csv) } + open(path, "w") {|f| f.write(csv.gsub(/<%/, "<%%")) } end desc "Reset documents." lib/tasks/p0t.rake 780936b913770855595c8f3f651fdbbaa880f36c Masaki Komagata komagata@gmail.com http://github.com/komagata/cloister/commit/4ae17a91d41da709489488397a2ea06ce262b5f7 4ae17a91d41da709489488397a2ea06ce262b5f7 2009-09-26T11:16:56-07:00 2009-09-26T11:16:56-07:00 fixed 0484e5a1c78b39461b2b67aa247270734586069b Masaki Komagata komagata@gmail.com