tdiary 4.0.2.20140201 → 4.0.3

data/spec/core/plugin_spec.rb

@@ -16,13 +16,13 @@ describe TDiary::Plugin do
 		subject { @plugin }
 
 		it '読み込まれたプラグインのメソッドを呼び出せること' do
-			subject.sample.should eq 'sample plugin'
+			expect(subject.sample).to eq 'sample plugin'
 		end
 
 		it 'プラグイン一覧が @plugin_files で取得できること' do
 			# TODO: 実際にはPlugin.newした時点でload_pluginが呼ばれている
 			# @plugin_filesの追加もinitializeメソッド内で実行されている
-			subject.instance_variable_get(:@plugin_files).should include('spec/fixtures/plugin/sample.rb')
+			expect(subject.instance_variable_get(:@plugin_files)).to include('spec/fixtures/plugin/sample.rb')
 		end
 
 		context 'リソースファイルが存在する場合' do
@@ -32,7 +32,7 @@ describe TDiary::Plugin do
 			end
 
 			it 'Confファイルで指定した言語に対応するリソースが読み込まれること' do
-				@plugin.sample_ja.should eq 'サンプルプラグイン'
+				expect(@plugin.sample_ja).to eq 'サンプルプラグイン'
 			end
 		end
 	end
@@ -45,12 +45,12 @@ describe TDiary::Plugin do
 		subject { @plugin.eval_src(@src, false) }
 
 		it 'Pluginオブジェクト内でソースが実行されること' do
-			should eq 'hello sample plugin'
+			is_expected.to eq 'hello sample plugin'
 		end
 
 		context 'secureモード指定の場合' do
 			it 'Safeモード4で実行されること' do
-				Safe.should_receive(:safe).with(4)
+				expect(Safe).to receive(:safe).with(4)
 				@plugin.eval_src(@src, true)
 			end
 		end
@@ -72,7 +72,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:header_proc) }
 
 		it 'add_header_procで登録したブロックが実行されること' do
-			should eq 'header1 header2'
+			is_expected.to eq 'header1 header2'
 		end
 	end
 
@@ -84,7 +84,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:footer_proc) }
 
 		it 'add_footer_procで登録したブロックが実行されること' do
-			should eq 'footer1 footer2'
+			is_expected.to eq 'footer1 footer2'
 		end
 	end
 
@@ -98,14 +98,14 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:update_proc) }
 
 		it 'add_update_procで登録したブロックが実行されること' do
-			proc1.should_receive(:call)
-			proc2.should_receive(:call)
+			expect(proc1).to receive(:call)
+			expect(proc2).to receive(:call)
 			# should_receiveの場合はsubjectが使えないため明示的に実行
 			@plugin.__send__(:update_proc)
 		end
 
 		it '空の文字列を返すこと' do
-			should eq ''
+			is_expected.to eq ''
 		end
 	end
 
@@ -120,17 +120,17 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:title_proc, date, 'title') }
 
 		it 'add_title_procで登録したブロックを実行し、最後の結果を返すこと' do
-			should eq 'title2'
+			is_expected.to eq 'title2'
 		end
 
 		it '前のprocの結果が次のprocに渡されること' do
-			proc1.should_receive(:call).with(date, 'title').and_return('title1')
-			proc2.should_receive(:call).with(date, 'title1')
+			expect(proc1).to receive(:call).with(date, 'title').and_return('title1')
+			expect(proc2).to receive(:call).with(date, 'title1')
 			@plugin.__send__(:title_proc, date, 'title')
 		end
 
 		it 'apply_pluginメソッドを呼び出すこと' do
-			@plugin.should_receive(:apply_plugin)
+			expect(@plugin).to receive(:apply_plugin)
 			# should_receiveの場合はsubjectが使えないため明示的に実行
 			@plugin.__send__(:title_proc, date, 'title')
 		end
@@ -145,7 +145,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:body_enter_proc, date) }
 
 		it 'add_body_enter_procで登録したブロックが実行されること' do
-			should eq 'body1 body2'
+			is_expected.to eq 'body1 body2'
 		end
 	end
 
@@ -157,7 +157,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:body_leave_proc, @date) }
 
 		it 'add_body_leave_procで登録したブロックが実行されること' do
-			should eq 'body1 body2'
+			is_expected.to eq 'body1 body2'
 		end
 	end
 
@@ -173,15 +173,15 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:section_enter_proc, date1) }
 
 		it 'add_section_enter_procで登録したブロックを実行し、結果を連結して返すこと' do
-			should eq 'section1 section2'
+			is_expected.to eq 'section1 section2'
 		end
 
 		it '呼ばれた回数に応じてセクション番号の数が増加すること (日付単位)' do
-			proc1.should_receive(:call).with(date1, 1)
+			expect(proc1).to receive(:call).with(date1, 1)
 			@plugin.__send__(:section_enter_proc, date1)
-			proc1.should_receive(:call).with(date1, 2)
+			expect(proc1).to receive(:call).with(date1, 2)
 			@plugin.__send__(:section_enter_proc, date1)
-			proc1.should_receive(:call).with(date2, 1)
+			expect(proc1).to receive(:call).with(date2, 1)
 			@plugin.__send__(:section_enter_proc, date2)
 		end
 	end
@@ -198,18 +198,18 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:subtitle_proc, date1, 'subtitle') }
 
 		it 'add_subtitle_procで登録したブロックを実行し、最後の結果を返すこと' do
-			should eq 'subtitle2'
+			is_expected.to eq 'subtitle2'
 		end
 
 		it '前のprocの結果が次のprocに渡されること' do
-			proc1.should_receive(:call).with(date1, 1, 'subtitle').and_return('subtitle1')
-			proc2.should_receive(:call).with(date1, 1, 'subtitle1')
+			expect(proc1).to receive(:call).with(date1, 1, 'subtitle').and_return('subtitle1')
+			expect(proc2).to receive(:call).with(date1, 1, 'subtitle1')
 			@plugin.__send__(:section_enter_proc, date1)
 			@plugin.__send__(:subtitle_proc, date1, 'subtitle')
 		end
 
 		it 'apply_pluginメソッドを呼び出すこと' do
-			@plugin.should_receive(:apply_plugin)
+			expect(@plugin).to receive(:apply_plugin)
 			# should_receiveの場合はsubjectが使えないため明示的に実行
 			@plugin.__send__(:subtitle_proc, date1, 'title')
 		end
@@ -227,18 +227,18 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:section_leave_proc, date1) }
 
 		it 'add_section_leave_procで登録したブロックを実行し、結果を連結して返すこと' do
-			should eq 'section1 section2'
+			is_expected.to eq 'section1 section2'
 		end
 
 		it '呼ばれた回数に応じてセクション番号の数が増加すること (日付単位)' do
 			# セクション番号はsection_enter_procの呼び出し回数で決定する
-			proc1.should_receive(:call).with(date1, 1)
+			expect(proc1).to receive(:call).with(date1, 1)
 			@plugin.__send__(:section_enter_proc, date1)
 			@plugin.__send__(:section_leave_proc, date1)
-			proc1.should_receive(:call).with(date1, 2)
+			expect(proc1).to receive(:call).with(date1, 2)
 			@plugin.__send__(:section_enter_proc, date1)
 			@plugin.__send__(:section_leave_proc, date1)
-			proc1.should_receive(:call).with(date2, 1)
+			expect(proc1).to receive(:call).with(date2, 1)
 			@plugin.__send__(:section_enter_proc, date2)
 			@plugin.__send__(:section_leave_proc, date2)
 		end
@@ -253,7 +253,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:comment_leave_proc, date) }
 
 		it 'add_comment_leave_procで登録したブロックが実行されること' do
-			should eq 'comment1 comment2'
+			is_expected.to eq 'comment1 comment2'
 		end
 	end
 
@@ -266,7 +266,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:edit_proc, date) }
 
 		it 'add_edit_procで登録したブロックが実行されること' do
-			should eq 'edit1 edit2'
+			is_expected.to eq 'edit1 edit2'
 		end
 	end
 
@@ -279,7 +279,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:form_proc, date) }
 
 		it 'add_form_procで登録したブロックが実行されること' do
-			should eq 'form1 form2'
+			is_expected.to eq 'form1 form2'
 		end
 	end
 
@@ -290,21 +290,21 @@ describe TDiary::Plugin do
 		context '@modeがconfの場合' do
 			before { @plugin.instance_variable_set(:@mode, 'conf') }
 			it 'コールバックを登録すること' do
-				should include('label1')
+				is_expected.to include('label1')
 			end
 		end
 
 		context '@modeがsaveconfの場合' do
 			before { @plugin.instance_variable_set(:@mode, 'saveconf') }
 			it 'コールバックを登録すること' do
-				should include('label1')
+				is_expected.to include('label1')
 			end
 		end
 
 		context '@modeがconf, saveconf以外の場合' do
 			before { @plugin.instance_variable_set(:@mode, 'edit') }
 			it 'コールバックの登録を無視すること' do
-				should be_nil
+				is_expected.to be_nil
 			end
 		end
 	end
@@ -319,7 +319,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:conf_proc, 'key1') }
 
 		it 'add_conf_procで登録したブロックのうち、keyが一致するものを実行して結果を返すこと' do
-			should eq 'conf1'
+			is_expected.to eq 'conf1'
 		end
 	end
 
@@ -328,7 +328,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:remove_tag, @string) }
 
 		it '文字列からタグが除去されること' do
-			should eq 'test example.com'
+			is_expected.to eq 'test example.com'
 		end
 	end
 
@@ -339,22 +339,22 @@ describe TDiary::Plugin do
 
 		subject { @plugin.__send__(:apply_plugin, '<%= sample %>') }
 		it 'プラグインが再実行されること' do
-			should eq 'sample plugin'
+			is_expected.to eq 'sample plugin'
 		end
 
 		context '解釈できない文字列を渡された場合' do
 			subject { @plugin.__send__(:apply_plugin, '<%= undefined_method %>') }
-			it { should include 'Invalid Text' }
+			it { is_expected.to include 'Invalid Text' }
 		end
 
 		context '文字列がnilの場合' do
 			subject { @plugin.__send__(:apply_plugin, nil) }
-			it { should eq '' }
+			it { is_expected.to eq '' }
 		end
 
 		context 'remove_tagがtrueの場合' do
 			it 'remove_tagメソッドを呼び出すこと' do
-				@plugin.should_receive(:remove_tag)
+				expect(@plugin).to receive(:remove_tag)
 				@plugin.__send__(:apply_plugin, '', true)
 			end
 		end
@@ -371,7 +371,7 @@ describe TDiary::Plugin do
 		subject { @plugin.__send__(:content_proc, 'key1', date) }
 
 		it 'add_content_procで登録したブロックのうち、keyに相当するものを実行すること' do
-			should eq 'contents1'
+			is_expected.to eq 'contents1'
 		end
 
 		context 'keyに相当するブロックが存在しない場合' do

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

@@ -30,7 +30,7 @@ describe TDiary::Rack::Assets::Precompile do
 		end
 
 		it "JavaScript にコンパイルされる" do
-			FileTest.exist?("#{assets_path}/foo.js").should be_true
+			expect(FileTest.exist?("#{assets_path}/foo.js")).to be_truthy
 		end
 	end
 
@@ -46,7 +46,7 @@ describe TDiary::Rack::Assets::Precompile do
 			end
 
 			it "JavaScript が更新される" do
-				@jstime.should < File.mtime("#{assets_path}/foo.js").to_i
+				expect(@jstime).to be < File.mtime("#{assets_path}/foo.js").to_i
 			end
 		end
 
@@ -61,7 +61,7 @@ describe TDiary::Rack::Assets::Precompile do
 			end
 
 			it "JavaScript は更新されない" do
-				@jstime.should == File.mtime("#{assets_path}/foo.js").to_i
+				expect(@jstime).to eq(File.mtime("#{assets_path}/foo.js").to_i)
 			end
 		end
 	end

data/spec/core/rack/html_anchor_spec.rb

@@ -11,47 +11,47 @@ describe TDiary::Rack::HtmlAnchor do
 
 		it 'should not do anything for root access' do
 			get '/'
-			last_request.params['date'].should == nil
-			last_request.query_string.should == ''
+			expect(last_request.params['date']).to eq(nil)
+			expect(last_request.query_string).to eq('')
 		end
 
 		it 'should remove the file name from PATH_INFO' do
 			get '/20120501.html'
-			last_request.env['PATH_INFO'].should == '/'
+			expect(last_request.env['PATH_INFO']).to eq('/')
 			get '/diary/20120501.html'
-			last_request.env['PATH_INFO'].should == '/diary/'
+			expect(last_request.env['PATH_INFO']).to eq('/diary/')
 		end
 
 		it 'should add date query' do
 			get '/diary/0501.html'
-			last_request.params['date'].should == "0501"
+			expect(last_request.params['date']).to eq("0501")
 			get '/0501.html'
-			last_request.params['date'].should == "0501"
+			expect(last_request.params['date']).to eq("0501")
 			get '/201205.html'
-			last_request.params['date'].should == "201205"
+			expect(last_request.params['date']).to eq("201205")
 			get '/20120501.html'
-			last_request.params['date'].should == "20120501"
+			expect(last_request.params['date']).to eq("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"
+			expect(last_request.params['date']).to eq("20120501")
+			expect(last_request.params['p']).to eq("01")
 		end
 
 		it 'should replace date query' do
 			get '/20120501.html?date=20120101'
-			last_request.params['date'].should == "20120501"
+			expect(last_request.params['date']).to eq("20120501")
 		end
 
 		it 'should not break original query' do
 			get '/?date=20120501'
-			last_request.params['date'].should == "20120501"
+			expect(last_request.params['date']).to eq("20120501")
 			get '/index.rb?date=20120501'
-			last_request.params['date'].should == "20120501"
+			expect(last_request.params['date']).to eq("20120501")
 			get '/index.rb?date=20120501&p=01'
-			last_request.params['date'].should == "20120501"
-			last_request.params['p'].should == "01"
+			expect(last_request.params['date']).to eq("20120501")
+			expect(last_request.params['p']).to eq("01")
 		end
 	end
 end

data/spec/core/rack/static_spec.rb

@@ -11,17 +11,17 @@ describe TDiary::Rack::Static do
 
 		it 'should return the file in static directory' do
 			get '/README.md'
-			last_response.should be_ok
+			expect(last_response).to be_ok
 		end
 
 		it 'should run the app if file is not exist' do
 			get '/index.rb'
-			last_response.status.should be 500
+			expect(last_response.status).to be 500
 		end
 
 		it 'should run the app when post method' do
 			post '/index.rb'
-			last_response.status.should be 500
+			expect(last_response.status).to be 500
 		end
 	end
 end

data/spec/core/rack/valid_request_path_spec.rb

@@ -11,57 +11,57 @@ describe TDiary::Rack::ValidRequestPath do
 
 		it 'should return 200 for latest' do
 			get '/'
-			last_response.should be_ok
+			expect(last_response).to be_ok
 		end
 
 		it 'should return 200 for a nyear' do
 			get '/0501.html'
-			last_response.should be_ok
+			expect(last_response).to be_ok
 		end
 
 		it 'should return 200 for a month' do
 			get '/201205.html'
-			last_response.should be_ok
+			expect(last_response).to be_ok
 		end
 
 		it 'should return 200 for a day' do
 			get '/20120501.html'
-			last_response.should be_ok
+			expect(last_response).to be_ok
 		end
 
 		it 'should return 200 for a day with section_permalink_anchor plugin' do
 			get '/20120501p01.html'
-			last_response.should be_ok
+			expect(last_response).to be_ok
 		end
 
 		it 'should return 200 for a day with query' do
 			get '/?date=20120501'
-			last_response.should be_ok
+			expect(last_response).to 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
+			expect(last_response).to 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
+			expect(last_response).to be_ok
 		end
 
 		it 'should return 404 for access to the invalid file' do
 			get '/20120501'
-			last_response.status.should be 404
+			expect(last_response.status).to be 404
 			get '/invalid'
-			last_response.status.should be 404
+			expect(last_response.status).to be 404
 			head '/invalid'
-			last_response.status.should be 404
-			last_response.body.length.should be 0
+			expect(last_response.status).to be 404
+			expect(last_response.body.length).to be 0
 		end
 
 		it 'should return 404 for access to the invalid directory' do
 			get '/invalid/'
-			last_response.status.should == 404
+			expect(last_response.status).to eq(404)
 		end
 	end
 end

data/spec/core/style/tdiary_style_spec.rb

@@ -42,7 +42,7 @@ subTitle2
 </div>
 				EOF
 			end
-			it { @diary.to_html.should eq @html.chomp }
+			it { expect(@diary.to_html).to eq @html.chomp }
 		end
 
 		context 'CHTML' do
@@ -56,12 +56,12 @@ subTitle2
 <p>honbun</p><%= section_leave_proc( Time::at( 1041346800 ) ) %>
 				EOF
 			end
-			it { @diary.to_html({}, :CHTML).should eq @html }
+			it { expect(@diary.to_html({}, :CHTML)).to eq @html }
 		end
 
 
 		context 'to_src' do
-			it { @diary.to_src.should eq @source }
+			it { expect(@diary.to_src).to eq @source }
 		end
 	end
 
@@ -98,7 +98,7 @@ replaceTitle2
 </div>
 			EOF
 		end
-		it { @diary.to_html.should eq @html.chomp }
+		it { expect(@diary.to_html).to eq @html.chomp }
 	end
 
 	describe '#add_section' do
@@ -122,7 +122,7 @@ subTitle
 </div>
 			EOF
 		end
-		it { @diary.to_html.should eq @html.chomp }
+		it { expect(@diary.to_html).to eq @html.chomp }
 	end
 
 	describe '#delete_section' do
@@ -145,7 +145,7 @@ subTitle2
 </div>
 			EOF
 		end
-		it { @diary.to_html.should eq @html.chomp }
+		it { expect(@diary.to_html).to eq @html.chomp }
 	end
 
 	describe 'test_tdiary_style2' do
@@ -167,7 +167,7 @@ subTitle2
 </div>
 				EOF
 			end
-			it { @diary.to_html.should eq @html.chomp }
+			it { expect(@diary.to_html).to eq @html.chomp }
 		end
 
 		context 'CHTML' do
@@ -178,7 +178,7 @@ subTitle2
 <p>honbun</p><%= section_leave_proc( Time::at( 1041346800 ) ) %>
 				EOF
 			end
-			it { @diary.to_html({}, :CHTML).should eq @html }
+			it { expect(@diary.to_html({}, :CHTML)).to eq @html }
 		end
 	end
 
@@ -215,7 +215,7 @@ ge%><%= section_leave_proc( Time::at( 1041346800 ) ) %>
 </div>
 				EOF
 			end
-			it { @diary.to_html.should eq @html.chomp }
+			it { expect(@diary.to_html).to eq @html.chomp }
 		end
 
 		context 'CHTML' do
@@ -233,7 +233,7 @@ ge%>b
 ge%><%= section_leave_proc( Time::at( 1041346800 ) ) %>
 				EOF
 			end
-			it { @diary.to_html({}, :CHTML).should eq @html }
+			it { expect(@diary.to_html({}, :CHTML)).to eq @html }
 		end
 	end
 end