tdiary 3.2.2.20130507

data/skel/preview.rhtml.en

@@ -0,0 +1,72 @@
+<%%=navi%>
+
+<h1><%=h @conf.html_title %> [<%%=preview_label%>]</h1>
+<%
+param = {
+	'date_format' => @conf.date_format,
+	'index' => @conf.index,
+	'section_anchor' => @conf.section_anchor,
+	'comment_anchor' => @conf.comment_anchor,
+	'long_mode' => false,
+	'show_referer' => false,
+	'referer_limit' => 100,
+	'referer_table' => @conf.referer_table,
+	'show_comment' => false,
+	'comment_limit' => -1,
+	'multi_user' => @conf.multi_user,
+	'hide_comment_form' => true,
+	'anchor' => false,
+	'show_nyear' => @conf.show_nyear,
+} %>
+<% if @show_result %>
+	<%= @diary.eval_rhtml( param, PATH ) %>
+<% else %>
+	<div class="day">
+	<h2><span class="title">Plugin Error</span></h2>
+	<div class="body">
+	<div class="section">
+		<h3><%=h @exception.class.to_s %></h3>
+		<pre><%=h @exception.to_s %></pre>
+	</div>
+	</div>
+	</div>
+<% end %>
+
+<hr class="sep">
+
+<div class="update day">
+<h2><span class="title">Updating Form</span></h2>
+<div class="form">
+	<form class="update" method="post" action="<%=h @conf.update %>"><div>
+		<%=@csrf_protection%>
+		<input type="hidden" name="old" value="<%=h @old_date %>">
+		<span class="field year">
+			<input type="hidden" id="year" name="year" value="<%= @date.year %>"><%= @date.year %>-
+		</span>
+		<span class="field month">
+			<input type="hidden" id="month" name="month" value="<%= @date.mon %>"><%= @date.mon %>-
+		</span>
+		<span class="field day">
+			<input type="hidden" id="day" name="day" value="<%= @date.day %>"><%= @date.day %>
+		</span>
+		<div class="field title">
+			Title: <input class="field" id="title" name="title" tabindex="5" accesskey="T" size="40" value="<%=h @diary.title %>">
+		</div>
+		<div class="textarea">
+			Article(<span id="style"><%=h @conf.style %></span> style<%%= style_howto %>):<textarea id="body" name="body" tabindex="6" accesskey="C" cols="70" rows="15"><%=h @diary.to_src %></textarea>
+		</div>
+		<%%=edit_proc( @date )%>
+		<span class="button preview">
+			<input type="submit" tabindex="998" accesskey="P" name="<%%= preview_command %>" value="<%%= preview_label %>">
+		</span>
+		<span class="button append">
+			<input type="submit" tabindex="999" accesskey="A" name="<%%= submit_command %>" value=" <%%= submit_label %> ">
+		</span>
+		<span class="checkbox hidediary"><label for="hide">
+			<input type="checkbox" id="hide" name="hide" value="true" <% unless @diary.visible? then %>checked <% end %>tabindex="1000" accesskey="H">Hide this day
+		</label></span>
+	</div></form>
+</div>
+</div>
+
+<hr class="sep">

data/skel/referer.rhtml

@@ -0,0 +1,24 @@
+<div class="day">
+<% if @cgi.params['referer'][0] == 'no' then %>
+<h2><span class="title"><%%=label_no_referer%></span></h2>
+<div class="body">
+<ul>
+<%= (@conf.no_referer - @conf.no_referer2).collect{|r| "<li>#{h r}</li>\n" }.join %>
+</ul>
+</div>
+<% elsif @cgi.params['referer'][0] == 'volatile' %>
+<h2><span class="title"><%%=label_only_volatile%></span></h2>
+<div class="body">
+<ul>
+<%= (@conf.only_volatile - @conf.only_volatile2).collect{|r| "<li>#{h r}</li>\n" }.join %>
+</ul>
+</div>
+<% else %>
+<h2><span class="title"><%%=label_referer_table%></span></h2>
+<div class="body">
+<table>
+<%= (@conf.referer_table - @conf.referer_table2).collect{|r,n| "<td><td>#{h r}</td><td>#{h n}</td></tr>\n" }.join %>
+</table>
+</div>
+<% end %>
+</div>

data/skel/search.rhtml

@@ -0,0 +1,14 @@
+<%# search.rhtml %>
+<%= @conf.header %>
+<hr class="sep">
+<div class="day">
+<h2><%%= search_title %></h2>
+<div class="body">
+<%%= search_result %>
+</div>
+<div class="comment">
+</div>
+</div>
+<hr class="sep">
+
+<%= @conf.footer %>

data/skel/tdiary.rconf

@@ -0,0 +1,76 @@
+#
+# tdiary automatic generated configuration file
+#
+# DO NOT EDIT THIS FILE BY YOURSELF.
+# USE PREFERENCES PAGE OF YOUR DIARY.
+#
+tdiary_version = "<%= TDIARY_VERSION %>"
+
+#
+# basic
+#
+author_name = <%= @author_name.force_encoding('ASCII-8BIT').dump %>
+author_mail = <%= (@author_mail || '').force_encoding('ASCII-8BIT').dump %>
+index_page = <%= @index_page.force_encoding('ASCII-8BIT').dump %>
+hour_offset = <%= @hour_offset %>
+description = <%= (@description || '' ).force_encoding('ASCII-8BIT').dump %>
+icon = <%= (@icon || '').force_encoding('ASCII-8BIT').dump %>
+banner = <%= (@banner || '').force_encoding('ASCII-8BIT').dump %>
+x_frame_options = <%= @x_frame_options ? @x_frame_options.force_encoding('ASCII-8BIT').dump : 'nil' %>
+
+#
+# header / footer
+#
+html_title = <%= @html_title.force_encoding('ASCII-8BIT').dump %>
+header = <<END_OF_HEADER
+<%= @header.gsub( /\\/, '\\\\\\\\' ).sub( /\n+\z/, "" ) %>
+END_OF_HEADER
+footer = <<END_OF_FOOTER
+<%= @footer.gsub( /\\/, '\\\\\\\\' ).sub( /\n+\z/, "" ) %>
+END_OF_FOOTER
+
+#
+# display(1) - basic
+#
+section_anchor = <%= @section_anchor.force_encoding('ASCII-8BIT').dump %>
+comment_anchor = <%= @comment_anchor.force_encoding('ASCII-8BIT').dump %>
+date_format = <%= @date_format.force_encoding('ASCII-8BIT').dump %>
+latest_limit = <%= @latest_limit %>
+show_nyear = <%= @show_nyear %>
+
+#
+# display(2) - theme
+#
+theme = <%= @theme.force_encoding('ASCII-8BIT').dump %>
+css = <%= @css.force_encoding('ASCII-8BIT').dump %>
+
+#
+# display(3) - comment
+#
+show_comment = <%= @show_comment %>
+comment_limit = <%= @comment_limit %>
+comment_limit_per_day = <%= @comment_limit_per_day %>
+
+#
+# display(4) - referer
+#
+show_referer = <%= @show_referer %>
+no_referer2 = <%= @no_referer2.inspect %>
+only_volatile2 = <%= @only_volatile2.inspect %>
+referer_table2 = <%= @referer_table2.inspect %>
+
+#
+# options for plugins
+#
+options2 = {
+<% @options2.keys.sort.each do |k|
+	if @options2[k].class.to_s == "String" then
+		v = @options2[k].force_encoding('ASCII-8BIT').dump
+	elsif @options2[k].class.to_s =~ /^(Fixnum|FalseClass|TrueClass|NilClass)$/
+		v = @options2[k].inspect
+	else
+		next
+	end %>
+	'<%= k %>' => <%= v %>,<% end %>
+}
+

data/skel/update.rhtml

@@ -0,0 +1,103 @@
+<%
+## accesskeys
+if @conf.accesskey_enabled
+accesskeys = {
+		'year'    => ' accesskey="Y"',
+		'month'   => ' accesskey="M"',
+		'day'     => ' accesskey="D"',
+		'edit'    => ' accesskey="E"',
+		'body'    => ' accesskey="C"',
+		'preview' => ' accesskey="P"',
+		'submit'  => ' accesskey="A"',
+		'hide'    => ' accesskey="H"',
+	}
+else
+	accesskeys = {}
+end
+%>
+<%%=navi%>
+
+<h1><%=h @conf.html_title %> [<%%= submit_label %>]</h1>
+
+<div class="update day">
+<h2><span class="title">日記の更新</span></h2>
+<div class="form">
+	<form class="update" method="post" action="<%=h @conf.update %>"><div>
+		<h3 class="subtitle">日記本文</h3>
+		<input type="hidden" name="old" value="<%= @date.strftime( '%Y%m%d' ) %>">
+		<%=@csrf_protection%>
+		<span class="field year">
+			<input class="field" id="year" name="year" tabindex="1"<%= accesskeys['year'] %> size="4" value="<%= @date.year %>">年
+		</span>
+		<span class="field month">
+			<input class="field" id="month" name="month" tabindex="2"<%= accesskeys['month'] %> size="2" value="<%= @date.mon %>">月
+		</span>
+		<span class="field day">
+			<input class="field" id="day" name="day" tabindex="3"<%= accesskeys['day'] %> size="2" value="<%= @date.day %>">日
+		</span>
+		<span class="button edit">
+			<input type="submit" tabindex="4"<%= accesskeys['edit'] %> name="edit" value="この日付の日記を編集">
+		</span>
+		<div class="field title">
+			タイトル: <input class="field" id="title" name="title" tabindex="5"<%= accesskeys['title'] %> size="40" value="<%=h @diary.title %>">
+		</div>
+		<div class="textarea">
+			本文(<span id="style"><%=h @conf.style %></span>スタイル<%%= style_howto %>):<textarea id="body" name="body" tabindex="6"<%= accesskeys['body'] %> cols="70" rows="15"><%=h @diary.to_src %></textarea>
+		</div>
+		<%%=edit_proc( @date )%>
+		<span class="button preview">
+			<input type="submit" tabindex="998"<%= accesskeys['preview'] %> name="<%%= preview_command %>" value="<%%= preview_label %>">
+		</span>
+		<span class="button append">
+			<input type="submit" tabindex="999"<%= accesskeys['submit'] %> name="<%%= submit_command %>" value=" <%%= submit_label %> ">
+		</span>
+		<span class="checkbox hidediary"><label for="hide">
+			<input type="checkbox" id="hide" name="hide" value="true" <% unless @diary.visible? then %>checked <% end %>tabindex="1000"<%= accesskeys['hide'] %>>この日の日記を隠す
+		</label></span>
+	</div></form>
+</div>
+
+<%%=form_proc( @date )%>
+
+<hr class="sep">
+
+<div class="comment">
+	<div class="caption"><%%=comment_today%></div>
+	<form class="commentstat" method="post" action="<%=h @conf.update %>"><div>
+		<input type="hidden" name="year" value="<%= @date.year %>">
+		<input type="hidden" name="month" value="<%= @date.month %>">
+		<input type="hidden" name="day" value="<%= @date.day %>">
+		<%=@csrf_protection%>
+		<div class="commentbody"><%
+		idx = 0
+		@diary.each_comment do |comment|
+			comment_checkbox_id = "commentcheckboxr#{idx}" %>
+			<div class="commentator">
+				<span class="checkbox">
+					<input class="checkbox" type="checkbox" id="<%= comment_checkbox_id %>" tabindex="<%=2000+idx%>" name="<%= idx += 1 %>" value="true"<% if comment.visible? then %> checked<% end %>>
+				</span>
+				<label for="<%= comment_checkbox_id %>">
+					<span class="commentator"><%=h comment.name %><%=h( " <#{comment.mail}>" ) unless comment.mail.empty? %></span>
+					<span class="commenttime"><%%=comment_date( Time::at( <%=comment.date.to_i%> ) )%></span>
+				</label>
+			</div>
+			<p><%= comment.body.make_link.gsub( /\n/, "<br>" ).gsub( /<br><br>\Z/, '' ) %></p><%
+		end
+		if idx > 0 then %>
+			<div class="button">
+				<input type="submit" tabindex="<%=2000+idx%>" name="comment" value="ツッコミ表示状態変更">
+			</div><%
+		end %>
+		</div>
+	</div></form>
+</div>
+
+<hr class="sep">
+
+<div class="refererlist">
+	<%%= referer_of_today_long( @diaries['<%=@date.strftime( '%Y%m%d' )%>'], 100 )%>
+</div>
+
+</div>
+
+<hr class="sep">

data/skel/update.rhtml.en

@@ -0,0 +1,83 @@
+<%%=navi%>
+
+<h1><%=h @conf.html_title %> [<%%= submit_label %>]</h1>
+
+<div class="update day">
+<h2><span class="title">Updating Diary</span></h2>
+<div class="form">
+	<form class="update" method="post" action="<%=h @conf.update %>"><div>
+		<h3 class="subtitle">Diary Body</h3>
+		<input type="hidden" name="old" value="<%= @date.strftime( '%Y%m%d' ) %>">
+		<%=@csrf_protection%>
+		<span class="field year">
+			<input class="field" id="year" name="year" tabindex="1" accesskey="Y" size="4" value="<%= @date.year %>">-
+		</span>
+		<span class="field month">
+			<input class="field" id="month" name="month" tabindex="2" accesskey="M" size="2" value="<%= @date.mon %>">-
+		</span>
+		<span class="field day">
+			<input class="field" id="day" name="day" tabindex="3" accesskey="D" size="2" value="<%= @date.day %>">
+		</span>
+		<span class="button edit">
+			<input type="submit" tabindex="4" accesskey="E" name="edit" value="Edit this day">
+		</span>
+		<div class="field title">
+			Title: <input class="field" id="title" name="title" tabindex="5" accesskey="T" size="40" value="<%=h @diary.title %>">
+		</div>
+		<div class="textarea">
+			Article(<span id="style"><%=h @conf.style %></span> style<%%= style_howto %>):<textarea id="body" name="body" tabindex="6" accesskey="C" cols="70" rows="15"><%=h @diary.to_src %></textarea>
+		</div>
+		<%%=edit_proc( @date )%>
+		<span class="button preview">
+			<input type="submit" tabindex="998" accesskey="P" name="<%%= preview_command %>" value="<%%= preview_label %>">
+		</span>
+		<span class="button append">
+			<input type="submit" tabindex="999" accesskey="A" name="<%%= submit_command %>" value=" <%%= submit_label %> ">
+		</span>
+		<span class="checkbox hidediary"><label for="hide">
+			<input type="checkbox" id="hide" name="hide" value="true" <% unless @diary.visible? then %>checked <% end %>tabindex="1000" accesskey="H">Hide this day
+		</label></span>
+	</div></form>
+</div>
+
+<%%=form_proc( @date )%>
+
+<hr class="sep">
+
+<div class="comment">
+	<div class="caption"><%%=comment_today%></div>
+	<form class="commentstat" method="post" action="<%=h @conf.update %>"><div>
+		<%=@csrf_protection%>
+		<input type="hidden" name="year" value="<%= @date.year %>">
+		<input type="hidden" name="month" value="<%= @date.month %>">
+		<input type="hidden" name="day" value="<%= @date.day %>">
+		<div class="commentbody"><%
+		idx = 0
+		@diary.each_comment do |comment| %>
+			<div class="commentator">
+				<span class="checkbox">
+					<input class="checkbox" type="checkbox" tabindex="<%=2000+idx%>" name="<%= idx += 1 %>" value="true"<% if comment.visible? then %> checked<% end %>>
+				</span>
+				<span class="commentator"><%=h comment.name %><%=h(" <#{comment.mail}>" ) unless comment.mail.empty? %></span>
+				<span class="commenttime"><%%=comment_date( Time::at( <%=comment.date.to_i%> ) )%></span>
+			</div>
+			<p><%= comment.body.make_link.gsub( /\n/, "<br>" ).gsub( /<br><br>\Z/, '' ) %></p><%
+		end
+		if idx > 0 then %>
+			<div class="button">
+				<input type="submit" tabindex="<%=2000+idx%>" name="comment" value="Change display status of TSUKKOMI">
+			</div><%
+		end %>
+		</div>
+	</div></form>
+</div>
+
+<hr class="sep">
+
+<div class="refererlist">
+	<%%= referer_of_today_long( @diaries['<%=@date.strftime( '%Y%m%d' )%>'], 100 )%>
+</div>
+
+</div>
+
+<hr class="sep">

data/spec/acceptance/append_comment_spec.rb

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+require 'acceptance_helper'
+
+feature 'ツッコミの更新' do
+	scenario 'ツッコミを入れてlatestとdayで表示する' do
+		append_default_diary
+		visit '/'
+		click_link 'ツッコミを入れる'
+		fill_in "name", :with => "alpha"
+		fill_in "body", :with => <<-BODY
+こんにちは!こんにちは!
+BODY
+
+		click_button '投稿'
+		page.should have_content "Click here!"
+
+		visit "/"
+		within('div.day div.comment div.commentshort') {
+			within('span.commentator') {
+				page.should have_content "alpha"
+			}
+			page.should have_content "こんにちは!こんにちは!"
+		}
+		today = Date.today.strftime('%Y年%m月%d日')
+		page.find('h2', :text => today).click_link today
+		within('div.day div.comment div.commentbody') {
+			within('div.commentator'){
+				t = Time.now
+				within('span.commenttime'){ page.should have_content "%04d年%02d月%02d日" % [t.year, t.month, t.day] }
+				within('span.commentator'){ page.should have_content "alpha" }
+			}
+			page.should have_content "こんにちは!こんにちは!"
+		}
+	end
+
+	scenario 'ツッコミを2回入れる' do
+		append_default_diary
+		append_default_comment
+		visit "/"
+		click_link 'ツッコミを入れる'
+		fill_in "name", :with => "bravo"
+		fill_in "body", :with => <<-BODY
+こんばんは!こんばんは!
+BODY
+
+		click_button '投稿'
+		page.should have_content "Click here!"
+
+		visit "/"
+		within('div.day div.comment div.commentshort') {
+			page.should have_content "alpha"
+			page.should have_content "bravo"
+			page.should have_content "こんにちは!こんにちは!"
+			page.should have_content "こんばんは!こんばんは!"
+		}
+
+		today = Date.today.strftime('%Y年%m月%d日')
+		page.find('h2', :text => today).click_link today
+		within('div.day div.comment div.commentbody') {
+			t = Time.now
+			page.should have_content "%04d年%02d月%02d日" % [t.year, t.month, t.day]
+			page.should have_content "alpha"
+			page.should have_content "bravo"
+			page.should have_content "こんにちは!こんにちは!"
+			page.should have_content "こんばんは!こんばんは!"
+		}
+	end
+
+	scenario 'recent_comment3.rb', :exclude_secure do
+		append_default_diary
+		visit '/'
+		click_link 'ツッコミを入れる'
+		fill_in "name", :with => "alpha"
+		fill_in "body", :with => <<-BODY
+こんにちは!こんにちは!
+BODY
+
+		click_button '投稿'
+		page.should have_content "Click here!"
+
+		visit "/"
+		within('ol.recent-comment > li') do
+			page.should have_content "alpha"
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3