tdiary 3.2.2.20130507

data/spec/core/rack/assets/precompile_spec.rb

@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'rack/test'
+require 'fileutils'
+require 'tdiary/rack/assets/precompile'
+
+if defined?(Encoding)
+	describe TDiary::Rack::Assets::Precompile do
+		include Rack::Test::Methods
+
+		let(:app) do
+			TDiary::Rack::Assets::Precompile.new(lambda{|env| [200, {}, ['Awesome']]}, @environment)
+		end
+		let(:assets_path) {"#{TDiary::PATH}/tmp/assets"}
+
+		before do
+			FileUtils.mkdir_p assets_path
+			@environment = Sprockets::Environment.new
+			@environment.append_path assets_path
+		end
+
+		after do
+			FileUtils.rm_rf assets_path
+		end
+
+		context "JavaScript が無い場合" do
+			before do
+				FileUtils.touch "#{assets_path}/foo.coffee"
+				get '/'
+			end
+
+			it "JavaScript にコンパイルされる" do
+				FileTest.exist?("#{assets_path}/foo.js").should be_true
+			end
+		end
+
+		context "JavaScript がある場合" do
+			context "CoffeeScript の方が新しい場合" do
+				before do
+					FileUtils.touch "#{assets_path}/foo.js"
+					sleep 1
+					FileUtils.touch "#{assets_path}/foo.coffee"
+					@jstime = File.mtime("#{assets_path}/foo.js").to_i
+
+					get '/'
+				end
+
+				it "JavaScript が更新される" do
+					@jstime.should < File.mtime("#{assets_path}/foo.js").to_i
+				end
+			end
+
+			context "JavaScript の方が新しい場合" do
+				before do
+					FileUtils.touch "#{assets_path}/foo.coffee"
+					sleep 1
+					FileUtils.touch "#{assets_path}/foo.js"
+					@jstime = File.mtime("#{assets_path}/foo.js").to_i
+
+					get '/'
+				end
+
+				it "JavaScript は更新されない" do
+					@jstime.should == File.mtime("#{assets_path}/foo.js").to_i
+				end
+			end
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/spec/core/rack/html_anchor_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+require 'rack/test'
+require 'tdiary/rack/html_anchor'
+
+describe TDiary::Rack::HtmlAnchor do
+	include Rack::Test::Methods
+
+	describe "html anchor" do
+		let(:app) { TDiary::Rack::HtmlAnchor.new(
+			lambda{|env| [200, {}, ['Awesome']]} )}
+
+		it 'should not do anything for root access' do
+			get '/'
+			last_request.params['date'].should == nil
+			last_request.query_string.should == ''
+		end
+
+		it 'should remove the file name from PATH_INFO' do
+			get '/20120501.html'
+			last_request.env['PATH_INFO'].should == '/'
+			get '/diary/20120501.html'
+			last_request.env['PATH_INFO'].should == '/diary/'
+		end
+
+		it 'should add date query' do
+			get '/diary/0501.html'
+			last_request.params['date'].should == "0501"
+			get '/0501.html'
+			last_request.params['date'].should == "0501"
+			get '/201205.html'
+			last_request.params['date'].should == "201205"
+			get '/20120501.html'
+			last_request.params['date'].should == "20120501"
+		end
+
+		it 'should add date query when using section_permalink_anchor plugin' do
+			get '/20120501p01.html'
+			last_request.params['date'].should == "20120501"
+			last_request.params['p'].should == "01"
+		end
+
+		it 'should replace date query' do
+			get '/20120501.html?date=20120101'
+			last_request.params['date'].should == "20120501"
+		end
+
+		it 'should not break original query' do
+			get '/?date=20120501'
+			last_request.params['date'].should == "20120501"
+			get '/index.rb?date=20120501'
+			last_request.params['date'].should == "20120501"
+			get '/index.rb?date=20120501&p=01'
+			last_request.params['date'].should == "20120501"
+			last_request.params['p'].should == "01"
+		end
+	end
+end

data/spec/core/rack/valid_request_path_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+require 'rack/test'
+require 'tdiary/rack/valid_request_path'
+
+describe TDiary::Rack::ValidRequestPath do
+	include Rack::Test::Methods
+
+	describe "valid request" do
+		let(:app) { TDiary::Rack::ValidRequestPath.new(
+			lambda{|env| [200, {}, ['Awesome']]} )}
+
+		it 'should return 200 for latest' do
+			get '/'
+			last_response.should be_ok
+		end
+
+		it 'should return 200 for a nyear' do
+			get '/0501.html'
+			last_response.should be_ok
+		end
+
+		it 'should return 200 for a month' do
+			get '/201205.html'
+			last_response.should be_ok
+		end
+
+		it 'should return 200 for a day' do
+			get '/20120501.html'
+			last_response.should be_ok
+		end
+
+		it 'should return 200 for a day with section_permalink_anchor plugin' do
+			get '/20120501p01.html'
+			last_response.should be_ok
+		end
+
+		it 'should return 200 for a day with query' do
+			get '/?date=20120501'
+			last_response.should be_ok
+		end
+
+		it 'should return 200 for a day with query and section_permalink_anchor plugin' do
+			get '/?date=20120501&p=01'
+			last_response.should be_ok
+		end
+
+		it 'should return 200 for a day with index.rb and query' do
+			get '/index.rb?date=20120501'
+			last_response.should be_ok
+		end
+
+		it 'should return 404 for access to the invalid file' do
+			get '/20120501'
+			last_response.status.should be 404
+			get '/invalid'
+			last_response.status.should be 404
+			head '/invalid'
+			last_response.status.should be 404
+			last_response.body.length.should be 0
+		end
+
+		it 'should return 404 for access to the invalid directory' do
+			get '/invalid/'
+			last_response.status.should == 404
+		end
+	end
+end

data/spec/core/style/emptdiary_style_spec.rb

@@ -0,0 +1,165 @@
+# -*- coding: utf-8; -*-
+require 'spec_helper'
+
+require 'tdiary'
+require 'misc/style/emptdiary/emptdiary_style'
+
+describe TDiary::EmptdiaryDiary do
+	before do
+		@diary = TDiary::EmptdiaryDiary.new(Time::at( 1041346800 ), "TITLE", "")
+	end
+
+	describe '#append' do
+		before do
+			source = <<-'EOF'
+subTitle
+<p>honbun</p>
+
+subTitle2
+<p>honbun</p>
+			EOF
+			@diary.append(source)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle" ) %></h3>
+<p>honbun</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div><div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle2" ) %></h3>
+<p>honbun</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html.chomp }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<H3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle" ) %></H3>
+<p>honbun</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<H3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle2" ) %></H3>
+<p>honbun</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({}, :CHTML).should eq @html }
+		end
+	end
+
+	describe '#replace' do
+		before do
+			source = <<-'EOF'
+subTitle
+<p>honbun</p>
+
+subTitle2
+<p>honbun</p>
+			EOF
+			@diary.append(source)
+
+			replaced = <<-'EOF'
+replaceTitle
+<p>replace</p>
+
+replaceTitle2
+<p>replace</p>
+
+			EOF
+			@diary.replace(Time::at( 1041346800 ), "TITLE", replaced)
+
+			@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "replaceTitle" ) %></h3>
+<p>replace</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div><div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "replaceTitle2" ) %></h3>
+<p>replace</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+			EOF
+		end
+		it { @diary.to_html.should eq @html.chomp }
+	end
+
+	describe 'test_emptdiary_style_plugin' do
+		before do
+			source = <<-'EOF'
+sectionTitle
+<p>body</p>
+<%=pre <<'_PRE'
+#include <stdio.h>
+
+/* comment */
+int
+main (int argc, char *argv[])
+{
+  puts ("Hello world.");
+}
+_PRE
+%>
+			EOF
+			@diary.append(source)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "sectionTitle" ) %></h3>
+<p>body</p>
+<%=pre <<'_PRE'
+#include <stdio.h>
+
+/* comment */
+int
+main (int argc, char *argv[])
+{
+  puts ("Hello world.");
+}
+_PRE
+%><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html.chomp }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<H3><%= subtitle_proc( Time::at( 1041346800 ), "sectionTitle" ) %></H3>
+<p>body</p>
+<%=pre <<'_PRE'
+#include <stdio.h>
+
+/* comment */
+int
+main (int argc, char *argv[])
+{
+  puts ("Hello world.");
+}
+_PRE
+%><%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({}, :CHTML).should eq @html }
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/spec/core/style/etdiary_style_spec.rb

@@ -0,0 +1,512 @@
+# -*- coding: utf-8; -*-
+require 'spec_helper'
+
+require 'tdiary'
+require 'misc/style/etdiary/etdiary_style'
+
+describe TDiary::EtdiaryDiary do
+	before do
+		@diary = TDiary::EtdiaryDiary.new(Time::at( 1041346800 ), "TITLE", "")
+	end
+
+	describe '#append' do
+		before do
+			@source = <<-'EOF'
+hogehoge
+fugafuga
+
+fugahoge
+hogera
+
+<<subTitle>>
+honbun
+
+<<<>subTitleH4>>
+honbun
+
+<h4>notParagraph</h4>
+
+<div>
+Content of block element with blank line.
+
+<blockquote>
+hogehoge
+</blockquote>
+</div>
+
+ <b>Paragraph</b> begin with tag.
+
+<pre>
+In <pre>, < and > are automatically escaped.
+</pre>
+
+<<>>
+Section without title and anchor.
+
+<<<>>>
+Section without title.
+			EOF
+			@diary.append(@source)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<p>
+hogehoge
+fugafuga
+</p>
+<p>
+fugahoge
+hogera
+</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle" ) %></h3>
+<p>
+honbun
+</p>
+<h4><%= subtitle_proc( Time::at( 1041346800 ), "subTitleH4" ) %>:</h4>
+<p>
+honbun
+</p>
+<h4>notParagraph</h4>
+<div>
+Content of block element with blank line.
+
+<blockquote>
+hogehoge
+</blockquote>
+</div>
+<p>
+ <b>Paragraph</b> begin with tag.
+</p>
+<pre>
+In &lt;pre&gt;, &lt; and &gt; are automatically escaped.
+</pre>
+<p><%= subtitle_proc( Time::at( 1041346800 ), nil ) %>
+Section without title and anchor.
+</p>
+<p><a name="p04"></a>
+Section without title.
+</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<P>
+hogehoge
+fugafuga
+</P>
+<P>
+fugahoge
+hogera
+</P>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<H3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle" ) %></H3>
+<P>
+honbun
+</P>
+<P><%= subtitle_proc( Time::at( 1041346800 ), "subTitleH4" ) %>: 
+honbun
+</P>
+<h4>notParagraph</h4>
+<div>
+Content of block element with blank line.
+
+<blockquote>
+hogehoge
+</blockquote>
+</div>
+<P>
+ <b>Paragraph</b> begin with tag.
+</P>
+<PRE>
+In &lt;pre&gt;, &lt; and &gt; are automatically escaped.
+</PRE>
+<P><%= subtitle_proc( Time::at( 1041346800 ), nil ) %>
+Section without title and anchor.
+</P>
+<P><A NAME="p04"></A>
+Section without title.
+</P>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({'anchor' => true, 'index' => true}, :CHTML).should eq @html }
+		end
+
+		context 'to_src' do
+			it { @diary.to_src.should eq @source }
+		end
+	end
+
+	describe '#add_section' do
+		before do
+			source = <<-'EOF'
+<<subTitle>>
+honbun
+
+<<<>subTitleH4>>
+honbun
+
+			EOF
+			@diary.append(source)
+			@diary.add_section('subTitle2', 'honbun')
+
+			@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle" ) %></h3>
+<p>
+honbun
+</p>
+<h4><%= subtitle_proc( Time::at( 1041346800 ), "subTitleH4" ) %>:</h4>
+<p>
+honbun
+</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle2" ) %></h3>
+<p>
+honbun
+</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+			EOF
+		end
+		it { @diary.to_html.should eq @html }
+	end
+
+	describe '#delete_section' do
+		before do
+			source = <<-'EOF'
+<<subTitle>>
+honbun
+
+<<subTitle2>>
+honbun
+
+			EOF
+			@diary.append(source)
+			@diary.delete_section(1)
+
+			@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle2" ) %></h3>
+<p>
+honbun
+</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+			EOF
+		end
+		it { @diary.to_html.should eq @html }
+	end
+
+	describe '#replace' do
+		before do
+			source = <<-'EOF'
+<<subTitle>>
+honbun
+
+<<<>subTitleH4>>
+honbun
+
+			EOF
+			@diary.append(source)
+
+			replaced = <<-'EOF'
+<<replaceTitle>>
+replace
+
+<<<>replaceTitleH4>>
+replace
+
+			EOF
+			@diary.replace(Time::at( 1041346800 ), "TITLE", replaced)
+
+			@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "replaceTitle" ) %></h3>
+<p>
+replace
+</p>
+<h4><%= subtitle_proc( Time::at( 1041346800 ), "replaceTitleH4" ) %>:</h4>
+<p>
+replace
+</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+			EOF
+		end
+		it { @diary.to_html.should eq @html }
+	end
+
+	describe 'test_etdiary_unterminated_tag' do
+		before do
+			source = <<-'EOF'
+<p>
+paragraph
+</q>
+			EOF
+			@diary.append(source)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<p>
+paragraph
+</q>
+
+</p>(tDiary warning: tag &lt;p&gt; is not terminated.)
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<p>
+paragraph
+</q>
+
+</p>(tDiary warning: tag &lt;p&gt; is not terminated.)
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({'anchor' => true, 'index' => true}, :CHTML).should eq @html }
+		end
+	end
+
+	describe 'test_etdiary_null' do
+		before do
+			source = <<-'EOF'
+			EOF
+			@diary.append(source)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<p>
+</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<P>
+</P>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({'anchor' => true, 'index' => true}, :CHTML).should eq @html }
+		end
+	end
+
+	describe 'test_etdiary_sectionAtBeginning' do
+		before do
+			source = <<-'EOF'
+<<hoge>>
+fuga
+			EOF
+			@diary.append(source)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "hoge" ) %></h3>
+<p>
+fuga
+</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<H3><%= subtitle_proc( Time::at( 1041346800 ), "hoge" ) %></H3>
+<P>
+fuga
+</P>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({'anchor' => true, 'index' => true}, :CHTML).should eq @html }
+		end
+	end
+
+	describe 'test_etdiary_appending' do
+		before do
+			source = <<-'EOF'
+<p>para1</p>
+			EOF
+
+			sourceAppended = <<-'EOF'
+<p>para2</p>
+			EOF
+			@diary.append(source)
+			@diary.append(sourceAppended)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<p>para1</p>
+<p>para2</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<p>para1</p>
+<p>para2</p>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({'anchor' => true, 'index' => true}, :CHTML).should eq @html }
+		end
+	end
+
+	# 2004.08.12 Reported by Shun-ichi TAHARA, thanks!
+	describe 'test_etdiary_subsequentPREtoSectionTitle' do
+		before do
+			source = <<-'EOF'
+<<hoge>>
+<pre>
+hoge
+
+fuga
+</pre>
+			EOF
+			@diary.append(source)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "hoge" ) %></h3>
+<pre>
+hoge
+
+fuga
+</pre>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<H3><%= subtitle_proc( Time::at( 1041346800 ), "hoge" ) %></H3>
+<PRE>
+hoge
+
+fuga
+</PRE>
+<%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({'anchor' => true, 'index' => true}, :CHTML).should eq @html }
+		end
+	end
+
+	# 2004.08.19 Reported by Shun-ichi TAHARA, thanks!
+	describe 'test_etdiary_badAnchorNumber' do
+		before do
+			source = <<-'EOF'
+sect0-para0
+
+<<sect1>>
+sect1-para0
+
+sect1-para1
+
+sect1-para2
+
+<<sect2>>
+sect2-para0
+			EOF
+
+			@diary.append(source)
+			sections = []
+			@diary.each_section { |sect|
+				sections << sect
+			}
+
+			@anchorNumber = 0
+			@section = sections.find do |sect|
+				@anchorNumber += 1
+				(sect.subtitle == "sect2")
+			end
+		end
+		it { @section.should_not be_nil }
+		it { @anchorNumber.should eq 2 }
+		# github issue #271
+		it { @section.body_to_html.should eq "<p>sect2-para0\n</p>\n" }
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End: