tdiary 4.0.2.20140201 → 4.0.3

data/plugin/00default.rb

@@ -397,7 +397,12 @@ def css_tag
 	if @mode =~ /conf$/ then
 		css = "#{h theme_url}/conf.css"
 	elsif @conf.theme and @conf.theme.length > 0
-		css = "#{h theme_url}/#{h @conf.theme}/#{h @conf.theme}.css"
+		location, name = @conf.theme.split(/\//, 2)
+		unless name
+			name = location
+			location = 'local'
+		end
+		css = __send__("theme_url_#{location}", name)
 	else
 		css = @conf.css
 	end
@@ -414,7 +419,7 @@ def smartphone_tag
 	<<-CSS
 <meta name = "viewport" content = "width = device-width">
 	<style type="text/css"><!--
-	form.comment textarea { 
+	form.comment textarea {
 		width: 80%;
 	}
 	--></style>
@@ -443,7 +448,7 @@ def title_of_day( date, title )
 	r = <<-HTML
 	<span class="date">
 	<a href="#{h @conf.index}#{anchor( date.strftime( '%Y%m%d' ) )}">#{date.strftime @conf.date_format}</a>
-	</span> 
+	</span>
 	<span class="title">#{title}</span>
 	HTML
 	return r.gsub( /^\t+/, '' ).chomp
@@ -455,7 +460,6 @@ end
 
 def nyear_link( date, title )
 	if @conf.show_nyear and @mode != 'nyear' and !@cgi.mobile_agent? then
-		y = date.strftime( '%Y' )
 		m = date.strftime( '%m' )
 		d = date.strftime( '%d' )
 		years = @years.find_all {|year, months| months.include? m}
@@ -533,7 +537,7 @@ end
 # make anchor tag in my diary
 #
 def my( a, str, title = nil )
-	date, noise, frag = a.scan( /^(\d{4}|\d{6}|\d{8}|\d{8}-\d+)([^\d]*)?#?([pct]\d+)?$/ )[0]
+	date, _, frag = a.scan( /^(\d{4}|\d{6}|\d{8}|\d{8}-\d+)([^\d]*)?#?([pct]\d+)?$/ )[0]
 	anc = frag ? "#{date}#{frag}" : date
 	index = /^https?:/ =~ @conf.index ? '' : base_url
 	index += @conf.index.sub(%r|^\./|, '')
@@ -710,7 +714,7 @@ def comment_mail_send
 	mail = @comment.mail
 	mail = @conf.author_mail unless mail =~ %r<[0-9a-zA-Z_.-]+@[\(\)%!0-9a-zA-Z_$@.&+-,'"*-]+>
 	mail = receivers[0] if mail.empty?
-	
+
 	now = Time::now
 	g = now.dup.gmtime
 	l = Time::local( g.year, g.month, g.day, g.hour, g.min, g.sec )
@@ -816,7 +820,7 @@ end
 # themes
 def conf_theme_list
 	r = ''
-	t = 0
+	t = -1
 	@conf_theme_list.each_with_index do |theme, index|
 		if theme[0] == @conf.theme then
 			select = " selected"
@@ -824,40 +828,43 @@ def conf_theme_list
 		end
 		r << %Q|<option value="#{h theme[0]}"#{select}>#{theme[1]}</option>|
 	end
-	img = t == 0 ? 'nowprinting' : @conf.theme
+	img = t == -1 ? 'nowprinting' : @conf.theme.sub(/^.*\//, '')
 	r << <<-HTML
 	</select>
-	<input name="css" size="50" value="#{h @conf.css}">
+	<input name="css" size="30" value="#{h @conf.css}">
 	</p>
 	<p><img id="theme_thumbnail" src="http://www.tdiary.org/theme.image/#{img}.jpg" alt="#{@theme_thumbnail_label}"></p>
-	<script language="JavaScript"><!--
-		function changeTheme( image, list ) {
-			var theme = '';
-			if ( list.selectedIndex == 0 ) {
-				theme = 'nowprinting';
-			} else {
-				theme = list.options[list.selectedIndex].value;
-			}
-			image.src = 'http://www.tdiary.org/theme.image/' + theme + '.jpg'
-		}
-	--></script>
 	#{@theme_location_comment unless @cgi.mobile_agent?}
 	HTML
 end
 
+def theme_list_local(list)
+	theme_paths = [::TDiary::PATH, TDiary.server_root].map {|d| "#{d}/theme/*" }
+	Dir::glob( theme_paths ).sort.map {|dir|
+		theme = dir.sub( %r[.*/theme/], '')
+		next unless FileTest::file?( "#{dir}/#{theme}.css".untaint )
+		name = theme.split( /_/ ).collect{|s| s.capitalize}.join( ' ' )
+		list << ["local/#{theme}",name]
+	}
+	list
+end
+
+def theme_url_local(theme)
+	"#{h theme_url}/#{h theme}/#{h theme}.css"
+end
+
 def saveconf_theme
 	if @mode == 'saveconf' then
 		@conf.theme = @cgi.params['theme'][0]
 		@conf.css = @cgi.params['css'][0]
 	end
-
-	theme_paths = [::TDiary::PATH, TDiary.server_root].map {|d| "#{d}/theme/*" }
-	@conf_theme_list = Dir::glob( theme_paths ).sort.map {|dir|
-		theme = dir.sub( %r[.*/theme/], '')
-		next unless FileTest::file?( "#{dir}/#{theme}.css".untaint )
-		name = theme.split( /_/ ).collect{|s| s.capitalize}.join( ' ' )
-		[theme,name]
-	}.compact.uniq
+	@conf_theme_list = methods.inject([]) {|conf_theme_list, method|
+		if /^theme_list_/ =~ method.to_s
+			__send__(method, conf_theme_list)
+		else
+			conf_theme_list
+		end
+	}.sort.compact.uniq
 end
 
 # comments

data/plugin/50sp.rb

@@ -72,7 +72,7 @@ def sp_list_plugins( sp_opt )
 		r += @sp_label_please_select
 		unless unknown.empty? then
 			r += @sp_label_new
-			r += "<ul>\n" 
+			r += "<ul>\n"
 			r += sp_li_plugins( unknown, sp_option( 'usenew' ) )
 			r += "</ul>\n"
 		end

data/plugin/60sf.rb

@@ -69,7 +69,7 @@ def sf_list_plugins( sf_opt )
 		r += @sf_label_please_select
 		unless unknown.empty? then
 			r += @sf_label_new
-			r += "<ul>\n" 
+			r += "<ul>\n"
 			r += sf_li_plugins( unknown, sf_option( 'usenew' ) )
 			r += "</ul>\n"
 		end

data/plugin/90migrate.rb

@@ -6,7 +6,7 @@
 if !@conf.tdiary_version && @conf.io_class.to_s == 'TDiary::IO::Default'
 	def convert_pstore( file )
 		require "pstore"
-	
+
 		db = PStore.new( file )
 		begin
 			roots = db.transaction{ db.roots }
@@ -27,7 +27,7 @@ if !@conf.tdiary_version && @conf.io_class.to_s == 'TDiary::IO::Default'
 			end
 		end
 	end
-	
+
 	def convert_element( data )
 		case data
 		when Hash, Array

data/plugin/en/00default.rb

@@ -233,7 +233,7 @@ add_conf_proc( 'theme', 'Themes', 'theme' ) do
 	<h3 class="subtitle">Theme</h3>
 	#{"<p>Specify the design of your diary using Theme or CSS. When you select \"CSS specify\", input URL of CSS into the field right side.</p>" unless @cgi.mobile_agent?}
 	<p>
-	<select name="theme" onChange="changeTheme( theme_thumbnail, this )">
+	<select name="theme" id="theme_selection">
 		<option value="">CSS Specify-&gt;</option>
 	HTML
 	r << conf_theme_list

data/plugin/ja/00default.rb

@@ -265,7 +265,7 @@ add_conf_proc( 'theme', 'テーマ選択', 'theme' ) do
 	<h3 class="subtitle">テーマの指定</h3>
 	#{"<p>日記のデザインをテーマ、もしくはCSSの直接入力で指定します。ドロップダウンメニューから「CSS指定→」を選択した場合には、右の欄にCSSのURLを入力してください。</p>" unless @cgi.mobile_agent?}
 	<p>
-	<select name="theme" onChange="changeTheme( theme_thumbnail, this )">
+	<select name="theme" id="theme_selection">
 		<option value="">CSS指定→</option>
 	HTML
 	r << conf_theme_list

data/spec/acceptance/append_comment_spec.rb

@@ -12,24 +12,24 @@ feature 'ツッコミの更新' do
 BODY
 
 		click_button '投稿'
-		page.should have_content "Click here!"
+		expect(page).to have_content "Click here!"
 
 		visit "/"
 		within('div.day div.comment div.commentshort') {
 			within('span.commentator') {
-				page.should have_content "alpha"
+				expect(page).to have_content "alpha"
 			}
-			page.should have_content "こんにちは!こんにちは!"
+			expect(page).to 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" }
+				within('span.commenttime'){ expect(page).to have_content "%04d年%02d月%02d日" % [t.year, t.month, t.day] }
+				within('span.commentator'){ expect(page).to have_content "alpha" }
 			}
-			page.should have_content "こんにちは!こんにちは!"
+			expect(page).to have_content "こんにちは!こんにちは!"
 		}
 	end
 
@@ -44,25 +44,25 @@ BODY
 BODY
 
 		click_button '投稿'
-		page.should have_content "Click here!"
+		expect(page).to 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 "こんばんは!こんばんは!"
+			expect(page).to have_content "alpha"
+			expect(page).to have_content "bravo"
+			expect(page).to have_content "こんにちは!こんにちは!"
+			expect(page).to 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 "こんばんは!こんばんは!"
+			expect(page).to have_content "%04d年%02d月%02d日" % [t.year, t.month, t.day]
+			expect(page).to have_content "alpha"
+			expect(page).to have_content "bravo"
+			expect(page).to have_content "こんにちは!こんにちは!"
+			expect(page).to have_content "こんばんは!こんばんは!"
 		}
 	end
 
@@ -76,11 +76,11 @@ BODY
 BODY
 
 		click_button '投稿'
-		page.should have_content "Click here!"
+		expect(page).to have_content "Click here!"
 
 		visit "/"
 		within('ol.recent-comment > li') do
-			page.should have_content "alpha"
+			expect(page).to have_content "alpha"
 		end
 	end
 end

data/spec/acceptance/append_diary_spec.rb

@@ -5,29 +5,29 @@ feature '日記の追記' do
 	scenario '更新画面のデフォルト表示' do
 		visit '/'
 		click_link '追記'
-		page.should have_content('日記の更新')
+		expect(page).to have_content('日記の更新')
 
 		y, m, d = Date.today.to_s.split('-').map {|t| t.sub(/^0+/, "") }
-		within('span.year') { page.should have_field('year', with: y) }
-		within('span.month') { page.should have_field('month', with: m) }
-		within('span.day') { page.should have_field('day', with: d) }
+		within('span.year') { expect(page).to have_field('year', with: y) }
+		within('span.month') { expect(page).to have_field('month', with: m) }
+		within('span.day') { expect(page).to have_field('day', with: d) }
 	end
 
 	scenario '今日の日記を書く' do
 		append_default_diary
 
 		visit '/'
-		within('div.day span.title'){ page.should have_content "tDiaryのテスト" }
+		within('div.day span.title'){ expect(page).to have_content "tDiaryのテスト" }
 		within('div.day div.section'){
-			within('h3') { page.should have_content "さて、テストである。" }
-			page.should have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
+			within('h3') { expect(page).to have_content "さて、テストである。" }
+			expect(page).to have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
 		}
 		today = Date.today.strftime('%Y年%m月%d日')
 		page.find('h2', text: today).click_link today
-		within('div.day span.title'){ page.should have_content "tDiaryのテスト" }
+		within('div.day span.title'){ expect(page).to have_content "tDiaryのテスト" }
 		within('div.day div.section'){
-			within('h3') { page.should have_content "さて、テストである。" }
-			page.should have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
+			within('h3') { expect(page).to have_content "さて、テストである。" }
+			expect(page).to have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
 		}
 	end
 
@@ -36,10 +36,10 @@ feature '日記の追記' do
 
 		visit '/'
 		page.find('h2', text: '2001年04月23日').click_link '2001年04月23日'
-		within('div.day span.title'){ page.should have_content "tDiaryのテスト" }
+		within('div.day span.title'){ expect(page).to have_content "tDiaryのテスト" }
 		within('div.day div.section'){
-			within('h3') { page.should have_content "さて、テストである。" }
-			page.should have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
+			within('h3') { expect(page).to have_content "さて、テストである。" }
+			expect(page).to have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
 		}
 	end
 
@@ -57,15 +57,15 @@ BODY
 		}
 
 		click_button "追記"
-		page.should have_content "Click here!"
+		expect(page).to have_content "Click here!"
 
 		visit '/'
-		within('div.day span.title'){ page.should have_content "Hikiのテスト" }
+		within('div.day span.title'){ expect(page).to have_content "Hikiのテスト" }
 		within('div.body'){
-			page.should have_content "さて、テストである。"
-			page.should have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
-			page.should have_content "さて、Hikiのテストである。"
-			page.should have_content "とみせかけてtDiary:-)"
+			expect(page).to have_content "さて、テストである。"
+			expect(page).to have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
+			expect(page).to have_content "さて、Hikiのテストである。"
+			expect(page).to have_content "とみせかけてtDiary:-)"
 		}
 	end
 
@@ -81,10 +81,10 @@ BODY
 		}
 
 		click_button 'プレビュー'
-		page.should have_content "tDiaryのテスト"
+		expect(page).to have_content "tDiaryのテスト"
 		within('div.day div.section'){
-			within('h3') { page.should have_content "さて、テストである。" }
-			page.should have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
+			within('h3') { expect(page).to have_content "さて、テストである。" }
+			expect(page).to have_content "とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P"
 		}
 	end
 end

data/spec/acceptance/bugfix/encoding_error_spec.rb

@@ -14,7 +14,7 @@ feature '1.9 でエンコーディングエラーとなるリファラ' do
 
 		visit "/?date=#{Date.today.strftime('%Y%m%d')}"
 
-		page.should have_content "さて、テストである。"
+		expect(page).to have_content "さて、テストである。"
 	end
 end
 

data/spec/acceptance/save_conf_comment_spec.rb

@@ -14,9 +14,9 @@ feature 'ツッコミ設定の利用' do
 
 		click_link '最新'
 		within('div.day div.comment') {
-			page.should have_no_css('div[class="commentshort"]')
-			page.should have_no_content "alpha"
-			page.should have_no_content "こんにちは!こんにちは!"
+			expect(page).to have_no_css('div[class="commentshort"]')
+			expect(page).to have_no_content "alpha"
+			expect(page).to have_no_content "こんにちは!こんにちは!"
 		}
 	end
 
@@ -32,7 +32,7 @@ feature 'ツッコミ設定の利用' do
 BODY
 
 		click_button '投稿'
-		page.should have_content "Click here!"
+		expect(page).to have_content "Click here!"
 
 		visit '/update.rb?conf=comment'
 		fill_in 'comment_limit', with: '1'
@@ -42,19 +42,19 @@ BODY
 
 		click_link '最新'
 		within('div.day div.comment div.commentshort') {
-			page.should have_no_content "alpha"
-			page.should have_content "bravo"
-			page.should have_no_content "こんにちは!こんにちは!"
-			page.should have_content "こんばんは!こんばんは!"
+			expect(page).to have_no_content "alpha"
+			expect(page).to have_content "bravo"
+			expect(page).to have_no_content "こんにちは!こんにちは!"
+			expect(page).to have_content "こんばんは!こんばんは!"
 		}
 
 		today = Date.today.strftime('%Y年%m月%d日')
 		page.find('h2', text: today).click_link today
-		within('div.day div.comment div.commentbody') { 
-			page.should have_content "alpha"
-			page.should have_content "bravo"
-			page.should have_content "こんにちは!こんにちは!"
-			page.should have_content "こんばんは!こんばんは!"
+		within('div.day div.comment div.commentbody') {
+			expect(page).to have_content "alpha"
+			expect(page).to have_content "bravo"
+			expect(page).to have_content "こんにちは!こんにちは!"
+			expect(page).to have_content "こんばんは!こんばんは!"
 		}
 	end
 
@@ -72,8 +72,8 @@ BODY
 		today = Date.today.strftime('%Y年%m月%d日')
 		page.find('h2', text: today).click_link today
 		within('div#comment-form-section') {
-			within('div.caption') { page.should have_content('本日の日記はツッコミ数の制限を越えています。') }
-			page.should have_no_css('form')
+			within('div.caption') { expect(page).to have_content('本日の日記はツッコミ数の制限を越えています。') }
+			expect(page).to have_no_css('form')
 		}
 	end
 end

data/spec/acceptance/save_conf_default_spec.rb

@@ -22,12 +22,12 @@ feature '基本設定の利用' do
 		# within('title') { page.should have_content('ただの日記') }
 
 		visit '/update.rb?conf=default'
-		page.should have_field "author_name", with: "ただただし"
-		page.should have_field "html_title", with: "ただの日記"
-		page.should have_field "author_mail", with: "t@tdtds.jp"
-		page.should have_field "index_page", with: "http://www.example.com"
-		page.should have_field "description", with: "ただただしによる日々の記録"
-		page.should have_field "icon", with: "http://tdtds.jp/favicon.png"
+		expect(page).to have_field "author_name", with: "ただただし"
+		expect(page).to have_field "html_title", with: "ただの日記"
+		expect(page).to have_field "author_mail", with: "t@tdtds.jp"
+		expect(page).to have_field "index_page", with: "http://www.example.com"
+		expect(page).to have_field "description", with: "ただただしによる日々の記録"
+		expect(page).to have_field "icon", with: "http://tdtds.jp/favicon.png"
 		# TODO banner の値が fill_in されない
 		# page.should have_field("banner", with: "http://sho.tdiary.net/images/banner.png")
 	end
@@ -49,16 +49,16 @@ FOOTER
 		#within('title') { page.should have_content('(設定完了)') }
 
 		click_link '最新'
-		within('h1') { page.should have_content('alpha') }
-		within('div.sidebar') { page.should have_content('bravo')}
+		within('h1') { expect(page).to have_content('alpha') }
+		within('div.sidebar') { expect(page).to have_content('bravo')}
 
 		visit '/update.rb?conf=header'
-		page.should have_field "header", with: <<-HEADER
+		expect(page).to have_field "header", with: <<-HEADER
 <%= navi %>
 <h1>alpha</h1>
 <div class="main">
 HEADER
-		page.should have_field "footer", with: <<-FOOTER
+		expect(page).to have_field "footer", with: <<-FOOTER
 </div>
 <div class="sidebar">
 bravo
@@ -85,12 +85,12 @@ FOOTER
 		# within('title') { page.should have_content('(設定完了)') }
 
 		click_link '最新'
-		page.should have_content('★')
-		page.should have_content('●')
+		expect(page).to have_content('★')
+		expect(page).to have_content('●')
 		titles = page.all('h2 span.date a').map{|t| t.text }
-		titles.should include("#{today.year}:#{'%02d' % today.month}:#{'%02d' % today.day}")
-		titles.should_not include("#{yestarday.year}:#{'%02d' % yestarday.month}:#{'%02d' % yestarday.day}")
-		page.should_not have_content("長年日記")
+		expect(titles).to include("#{today.year}:#{'%02d' % today.month}:#{'%02d' % today.day}")
+		expect(titles).not_to include("#{yestarday.year}:#{'%02d' % yestarday.month}:#{'%02d' % yestarday.day}")
+		expect(page).not_to have_content("長年日記")
 	end
 
 	scenario 'ログレベルの選択の設定' do
@@ -104,7 +104,7 @@ FOOTER
 		# TODO ログレベルの確認
 
 		visit '/update.rb?conf=logger'
-		within('select option[selected]'){ page.should have_content 'DEBUG' }
+		within('select option[selected]'){ expect(page).to have_content 'DEBUG' }
 	end
 
 	scenario '時差調整が保存される' do
@@ -116,13 +116,13 @@ FOOTER
 
 		click_link '追記'
 		y, m, d = (Date.today - 1).to_s.split('-').map {|t| t.sub(/^0+/, "") }
-		within('span.year') { page.should have_field('year', with: y) }
-		within('span.month') { page.should have_field('month', with: m) }
-		within('span.day') { page.should have_field('day', with: d) }
+		within('span.year') { expect(page).to have_field('year', with: y) }
+		within('span.month') { expect(page).to have_field('month', with: m) }
+		within('span.day') { expect(page).to have_field('day', with: d) }
 
 		click_link '設定'
 		click_link '時差調整'
-		page.should have_field('hour_offset', with: '-24.0')
+		expect(page).to have_field('hour_offset', with: '-24.0')
 	end
 
 	scenario 'Rack 環境でテーマ選択が保存される', :exclude_selenium do
@@ -132,12 +132,12 @@ FOOTER
 		page.all('div.saveconf').first.click_button "OK"
 
 		click_link '最新'
-		page.body.should be_include('href="assets/base.css"')
-		page.body.should be_include('href="assets/tdiary1/tdiary1.css"')
+		expect(page.body).to be_include('href="assets/base.css"')
+		expect(page.body).to be_include('href="assets/tdiary1/tdiary1.css"')
 
 		visit '/update.rb?conf=theme'
 		within('select option[selected]'){
-			page.should have_content 'Tdiary1'
+			expect(page).to have_content 'Tdiary1'
 		}
 	end
 
@@ -149,13 +149,13 @@ FOOTER
 
 		click_link '最新'
 		within('head') {
-			page.should have_css('link[href="theme/base.css"]')
-			page.should have_css('link[href="theme/tdiary1/tdiary1.css"]')
+			expect(page).to have_css('link[href="theme/base.css"]')
+			expect(page).to have_css('link[href="theme/tdiary1/tdiary1.css"]')
 		}
 
 		visit '/update.rb?conf=theme'
 		within('select option[selected]'){
-			page.should have_content 'Tdiary1'
+			expect(page).to have_content 'Tdiary1'
 		}
 	end
 end

data/spec/acceptance/save_conf_dnsbl_spec.rb

@@ -11,13 +11,13 @@ feature 'spamフィルタ設定の利用', :exclude_selenium do
 		page.all('div.saveconf').first.click_button 'OK'
 
 		visit '/update.rb?conf=dnsblfilter'
-		page.should have_no_content "dnsbl.spam-champuru.livedoor.com"
-		page.should have_content "bsb.spamlookup.net"
+		expect(page).to have_no_content "dnsbl.spam-champuru.livedoor.com"
+		expect(page).to have_content "bsb.spamlookup.net"
 	end
 
 	scenario 'IPベースのブラックリストが動作する' do
-		IPSocket.stub(:getaddress) { '127.0.0.1' }
-		Resolv.stub(:getaddress) { '127.0.0.1' }
+		allow(IPSocket).to receive(:getaddress) { '127.0.0.1' }
+		allow(Resolv).to receive(:getaddress) { '127.0.0.1' }
 
 		append_default_diary
 
@@ -37,12 +37,12 @@ BODY
 		click_button '投稿'
 
 		visit "/"
-		page.should have_no_content "alpha"
-		page.should have_no_content "こんにちは!こんにちは!"
+		expect(page).to have_no_content "alpha"
+		expect(page).to have_no_content "こんにちは!こんにちは!"
 	end
 
 	scenario 'IPベースのブラックリストでセーフの場合' do
-		IPSocket.stub(:getaddress) { raise TimeoutError }
+		allow(IPSocket).to receive(:getaddress) { raise TimeoutError }
 
 		append_default_diary
 
@@ -62,12 +62,12 @@ BODY
 		click_button '投稿'
 
 		visit "/"
-		page.should have_content "alpha"
-		page.should have_content "こんにちは!こんにちは!"
+		expect(page).to have_content "alpha"
+		expect(page).to have_content "こんにちは!こんにちは!"
 	end
 
 	scenario 'ドメインベースのブラックリストが動作する' do
-		Resolv.stub(:getaddress) { '127.0.0.1' }
+		allow(Resolv).to receive(:getaddress) { '127.0.0.1' }
 
 		append_default_diary
 
@@ -87,12 +87,12 @@ BODY
 		click_button '投稿'
 
 		visit "/"
-		page.should have_no_content "alpha"
-		page.should have_no_content "こんにちは!こんにちは!"
+		expect(page).to have_no_content "alpha"
+		expect(page).to have_no_content "こんにちは!こんにちは!"
 	end
 
 	scenario 'ドメインベースのブラックリストでセーフの場合' do
-		Resolv.stub(:getaddress) { raise TimeoutError }
+		allow(Resolv).to receive(:getaddress) { raise TimeoutError }
 
 		append_default_diary
 
@@ -112,13 +112,13 @@ BODY
 		click_button '投稿'
 
 		visit "/"
-		page.should have_content "alpha"
-		page.should have_content "こんにちは!こんにちは!"
+		expect(page).to have_content "alpha"
+		expect(page).to have_content "こんにちは!こんにちは!"
 	end
 
 	scenario 'ブラックリストに問い合わせないリストが動作する' do
-		IPSocket.should_receive(:getaddress).exactly(0)
-		Resolv.should_receive(:getaddress).exactly(0)
+		expect(IPSocket).to receive(:getaddress).exactly(0)
+		expect(Resolv).to receive(:getaddress).exactly(0)
 
 		append_default_diary
 
@@ -138,8 +138,8 @@ BODY
 		click_button '投稿'
 
 		visit "/"
-		page.should have_content "alpha"
-		page.should have_content "こんにちは!こんにちは!"
+		expect(page).to have_content "alpha"
+		expect(page).to have_content "こんにちは!こんにちは!"
 	end
 end