tdiary 4.1.1 → 4.1.2

data/lib/tdiary/tasks/release.rake

@@ -34,24 +34,35 @@ def make_tarball( repo, version = nil )
 			sh "chmod +x index.rb index.fcgi update.rb update.fcgi"
 			sh 'rake doc'
 			Bundler.with_clean_env do
-					sh "bundle --path .bundle --without coffee:server:development:test"
+					sh "bundle --path .bundle --without coffee:development:test"
 			end
+
+			# reduce filesize
+			Dir.glob('.bundle/ruby/*/cache/*').each do |file|
+				# cached gem file
+				rm_rf file
+			end
+			Dir.glob('.bundle/ruby/*/gems/*/*/').each do |dir|
+				# spec, fixtures etc..
+				rm_rf dir unless File.basename(dir).match(/lib|data/)
+			end
+
 			Dir.chdir '.bundle/ruby' do
 				v = `ls`.chomp
 				case v
+				when '2.2.0'
+					FileUtils.cp_r '2.2.0', '2.0.0'
+					FileUtils.cp_r '2.2.0', '2.1.0'
 				when '2.1.0'
-					FileUtils.cp_r '2.1.0', '1.9.1'
 					FileUtils.cp_r '2.1.0', '2.0.0'
+					FileUtils.cp_r '2.1.0', '2.2.0'
 				when '2.0.0'
-					FileUtils.cp_r '2.0.0', '1.9.1'
 					FileUtils.cp_r '2.0.0', '2.1.0'
-				when '1.9.1'
-					FileUtils.cp_r '1.9.1', '2.0.0'
-					FileUtils.cp_r '1.9.1', '2.1.0'
+					FileUtils.cp_r '2.0.0', '2.2.0'
 				else
+					FileUtils.cp_r v, '2.2.0'
 					FileUtils.cp_r v, '2.1.0'
 					FileUtils.cp_r v, '2.0.0'
-					FileUtils.cp_r v, '1.9.1'
 					FileUtils.rm_rf v
 				end
 			end

data/lib/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '4.1.1'
+	VERSION = '4.1.2'
 end

data/lib/tdiary.rb

@@ -50,6 +50,7 @@ module TDiary
 	# Diary model class
 	autoload :Style,                    'tdiary/style'
 	autoload :Comment,                  'tdiary/comment'
+	autoload :DiaryContainer,           'tdiary/diary_container'
 
 	# Routing and Dispatch
 	autoload :Dispatcher,               'tdiary/dispatcher'

data/misc/paas/heroku/Gemfile.local

@@ -0,0 +1,8 @@
+ruby '2.2.0'
+gem 'thin', require: false
+gem 'tdiary-io-mongodb', github: 'tdiary/tdiary-io-mongodb'
+gem 'tdiary-contrib', github: 'tdiary/tdiary-contrib'
+gem 'omniauth'
+gem 'omniauth-twitter'
+gem 'dalli'
+gem 'memcachier'

data/misc/paas/heroku/app.json

@@ -0,0 +1,19 @@
+{
+  "name": "tDiary",
+  "website": "http://www.tdiary.org/",
+  "repository": "https://github.com/tdiary/tdiary-core/tree/heroku",
+  "addons": [
+    "sendgrid",
+    "memcachier",
+    "mongolab"
+  ],
+  "scripts": {
+    "postdeploy": "bundle exec rake mongodb:index"
+  },
+  "env": {
+    "TWITTER_KEY": "",
+    "TWITTER_SECRET": "",
+	 "TWITTER_NAME": "",
+    "RACK_ENV": "production"
+  }
+}

data/misc/paas/heroku/config.ru

@@ -0,0 +1,6 @@
+$:.unshift( File.join(File::dirname( __FILE__ ), 'lib' ).untaint )
+require 'tdiary/application'
+
+use ::Rack::Reloader unless ENV['RACK_ENV'] == 'production'
+base_dir = '/'
+run TDiary::Application.new( base_dir )

data/misc/paas/heroku/tasks/mongodb.rake

@@ -0,0 +1,12 @@
+namespace :mongodb do
+	desc "make index into mongoDB"
+	task :index do
+		require 'erb'
+		require 'tdiary'
+		conf = TDiary::Config.new
+		TDiary::DiaryContainer.new(conf, '2015', '01')
+		TDiary::IO::MongoDB::Diary.create_indexes
+		TDiary::IO::MongoDB::Comment.create_indexes
+		TDiary::IO::MongoDB::Plugin.create_indexes
+	end
+end

data/misc/paas/heroku/tdiary.conf

@@ -1,9 +1,13 @@
+#
+# tdiary.conf for Heroku
+#
 require 'tempfile'
 @data_path = Dir.tmpdir
 
 @style = 'Wiki'
 
-@io_class = TDiary::IO::Rdb
+@io_class = TDiary::IO::MongoDB
+@database_url = ENV['MONGOLAB_URI']
 
 @index = './'
 @update = 'update.rb'
@@ -21,21 +25,17 @@ require 'tempfile'
 
 @options['apply_plugin'] = true
 @options['sp.path'] = ['misc/plugin']
-@options['style.path'] = ['misc/style/gfm', 'tdiary/style']
-@options['sp.selected'] =
-"amazon.rb
-append-css.rb
-calendar2.rb
-dropdown_calendar.rb
-footnote.rb
-highlight.rb
-image.rb
-jdate.rb
-kw.rb
-my-ex.rb
-"
+@options['sp.selected'] = %w(amazon.rb append-css.rb calendar2.rb comment_ajax.rb comment_mail-smtp.rb dropdown_calendar.rb footnote.rb highlight.rb html_anchor.rb jdate.rb makerss.rb kw.rb my-ex.rb theme_online.rb ).join("\n")
 
 @options['dropdown_calendar.label'] = ''
+
+@options['comment_mail.smtp_host'] = 'smtp.sendgrid.net'
+@options['comment_mail.smtp_port'] = 587
+@options['comment_mail.user_name'] = ENV['SENDGRID_USERNAME']
+@options['comment_mail.password'] = ENV['SENDGRID_PASSWORD']
+@options['comment_mail.authentication'] = :plain
+@options['comment_mail.starttls'] = true
+
 @options['spamfilter.bad_comment_patts'] = "(href=|casino|gambling|betting|fastsearch\\.eu\\.com|ganzao|poker|holdem|hold.em|roulette|drug|tramadol|viagra|fioricet|oxycontin|biaxin|aldara|business cards|home depot|slot.?machine|insurance|getblog2|video-game|Good site|internet-all\\.com|deai|tdfms|comu2|omaha)\r\n"
 @options['spamfilter.bad_ip_addrs'] = ""
 @options['spamfilter.bad_mail_patts'] = "(mu@alloha\\.info|mumu2004@mail\\.com|zhongleibo|dfd@12\\.com|anonimous|aol\\.|yahoo\\.|google\\.|hotmail\\.|msn\\.|leroy\\.|ablare\\.|gmx\\.|lorazepam|\\.co$)"

data/misc/plugin/amazon.rb

@@ -46,6 +46,8 @@ if @conf['amazon.bitly'] and @conf['bitly.login'] and @conf['bitly.key'] then
 	add_js_setting( '$tDiary.plugin.bitly.apiKey', "'#{@conf['bitly.key']}'" )
 end
 
+class AmazonRedirectError < StandardError; end
+
 def amazon_fetch( url, limit = 10 )
 	raise ArgumentError, 'HTTP redirect too deep' if limit == 0
 
@@ -57,6 +59,8 @@ def amazon_fetch( url, limit = 10 )
 		res.body
 	when Net::HTTPRedirection
 		amazon_fetch( res['location'].untaint, limit - 1 )
+	when Net::HTTPForbidden, Net::HTTPServiceUnavailable
+		raise AmazonRedirectError.new( limit.to_s )
 	else
 		raise ArgumentError, res.error!
 	end
@@ -78,10 +82,14 @@ def amazon_call_ecs( asin, id_type, country )
 	url << "&ResponseGroup=Medium"
 	url << "&Version=#{@amazon_require_version}"
 
+	limit = 10
 	begin
-		Timeout.timeout( 10 ) do
+		Timeout.timeout( limit ) do
 			amazon_fetch( url )
 		end
+	rescue AmazonRedirectError
+		limit = $!.message.to_i
+		retry
 	rescue ArgumentError
 	end
 end

data/misc/plugin/category.rb

@@ -208,20 +208,6 @@ end
 
 module Category
 
-#
-# CGI (mock-up CGI class for Cache::recreate)
-#
-class CGI
-	attr_reader :params
-	def initialize
-		@params = Hash.new([])
-	end
-	def referer; nil; end
-	def user_agent; nil; end
-	def mobile_agent?; nil; end
-	def request_method; 'GET'; end
-end
-
 #
 # Info
 #
@@ -487,17 +473,13 @@ class Cache
 	# (re)create category cache
 	#
 	def recreate(years)
-		cgi = Category::CGI::new
-
 		list = []
 		@plugin.__send__(:transaction, 'category') do |db|
 			db.keys.each {|key|db.delete(key)}
 
 			years.each do |y, ms|
 				ms.each do |m|
-					ym = "#{y}#{m}"
-					cgi.params['date'] = [ym]
-					m = TDiaryMonthWithoutFilter.new(cgi, '', @conf)
+					m = DiaryContainer::find_by_month(@conf, "#{y}#{m}")
 					m.diaries.each do |ymd, diary|
 						next if !diary.visible? or !diary.categorizable?
 						categorized = categorize_diary(diary)

data/misc/plugin/category_autocomplete.rb

@@ -9,10 +9,10 @@
 
 if !@cgi.mobile_agent? && /\A(?:form|preview|append|edit|update)\z/ =~ @mode
 	add_header_proc do
-		%Q|<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css"/>|
+		%Q|<link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css"/>|
 	end
 
-	enable_js('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
+	enable_js('//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
 	enable_js('caretposition.js')
 	enable_js('category_autocomplete.js')
 

data/misc/plugin/comment_ajax.rb

@@ -1,5 +1,7 @@
 if @mode == 'day' and not bot? then
 	enable_js('comment_ajax.js')
+	add_js_setting('$tDiary.plugin.comment_ajax')
+	add_js_setting('$tDiary.plugin.comment_ajax.theme', %Q["#{theme_url}"])
 end
 
 # Local Variables:

data/misc/plugin/comment_emoji_autocomplete.rb

@@ -9,10 +9,10 @@
 
 if !@cgi.mobile_agent? && /\A(?:day)\z/ =~ @mode
 	add_header_proc do
-		%Q|<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css"/>|
+		%Q|<link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css"/>|
 	end
 
-	enable_js('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
+	enable_js('//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
 	enable_js('caretposition.js')
 	enable_js('comment_emoji_autocomplete.js')
 

data/misc/plugin/comment_mail-smtp.rb

@@ -2,7 +2,7 @@
 # comment_mail-smtp.rb
 #
 # SMTPプロトコルを使ってツッコミをメールで知らせる
-#   入れるだけで動作する
+#   同一ホスト内にSMTPサーバがある場合は有効にするだけで動作する
 #
 # Options:
 #   設定画面から指定できるもの(ツッコミメール系プラグイン共通):
@@ -25,18 +25,33 @@
 #     @options['comment_mail.smtp_port']
 #          それぞれ、メール送信に使うSMTPサーバのホスト名とポート番号。
 #          無指定時はそれぞれ「'localhost'」と「25」。
+#   以下は通常は不要。必要に応じて指定する:
+#     @options['comment_mail.user_name']
+#     @options['comment_mail.password']
+#          SMTP認証が必要な場合のユーザ名とパスワード
+#     @options['comment_mail.authentication']
+#          SMTP認証の方式。:plainや:loginなど(Mail gemに指定できるもの)
+#     @options['comment_mail.starttls']
+#          TLSに自動接続する(true/false) (Mail gem)
 #
-# Copyright (c) 2003 TADA Tadashi <sho@spc.gr.jp>
+# Copyright (c) 2015 TADA Tadashi <t@tdtds.jp>
 # You can distribute this file under the GPL2 or any later version.
 #
 def comment_mail( text, to )
 	begin
-		require 'net/smtp'
-		host = @conf['comment_mail.smtp_host'] || 'localhost'
-		port = @conf['comment_mail.smtp_port'] || 25
-		Net::SMTP.start( host, port ) do |smtp|
-			smtp.send_mail( text.force_encoding( 'US-ASCII' ), @conf.author_mail.untaint, to )
-		end
+		require 'mail'
+
+		mail = Mail.new( text )
+		delivery_opts = {
+			address: @conf['comment_mail.smtp_host'] || 'localhost',
+			port: @conf['comment_mail.smtp_port'] || 25,
+			authentication: @conf['comment_mail.authentication'],
+			user_name: @conf['comment_mail.user_name'],
+			password: @conf['comment_mail.password'],
+			enable_starttls_auto: @conf['comment_mail.starttls']
+		}.delete_if{|k,v| v == nil}
+		mail.delivery_method( :smtp, delivery_opts )
+		mail.deliver
 	rescue
 		$stderr.puts $!
 	end

data/misc/plugin/makerss.rb

@@ -28,7 +28,7 @@
 # Distributed under the GPL2 or any later version.
 #
 
-if /^append|replace|comment|showcomment$/ =~ @mode then
+if /^append|replace|comment|showcomment|startup$/ =~ @mode then
 	unless @conf.description
 		@conf.description = @conf['whatsnew_list.rdf.description']
 	end
@@ -486,6 +486,10 @@ add_edit_proc do
 	HTML
 end
 
+add_startup_proc do
+	makerss_update
+end
+
 def replace_entities( text )
 	unless @xml_entity_table then
 		@xml_entity_table = {

data/misc/plugin/recent_comment3.rb

@@ -95,13 +95,9 @@ def recent_comment3(ob_max = 'OBSOLUTE' ,sep = 'OBSOLUTE',ob_date_format = 'OBSO
 		if entries.size == 0
 			notfound_msg
 		else
-			cgi = CGI::new
-			def cgi.referer; nil; end
-
 			tree_order.each do |entry_date|
 				a_entry = @index + anchor(entry_date)
-				cgi.params['date'] = [entry_date]
-				diary = TDiaryDayWithoutFilter::new(cgi, '', @conf)
+				diary = DiaryContainer::find_by_day(@conf, entry_date)
 				title = diary.diaries[entry_date].title.gsub( /<[^>]*>/, '' ) if diary
 
 				if title.nil? || title.length == 0 || title.strip.delete('　').delete(' ').length == 0 then

data/misc/plugin/recent_list.rb

@@ -28,14 +28,10 @@ def recent_list( days = 30, date_format = nil, title_with_body = nil, show_size
 
 	result = %Q|<ul class="recent-list">\n|
 
-	cgi = CGI::new
-	def cgi.referer; nil; end
-
 	catch(:exit) {
 		@years.keys.sort.reverse_each do |year|
 			@years[year].sort.reverse_each do |month|
-				cgi.params['date'] = ["#{year}#{month}"]
-				m = TDiaryMonthWithoutFilter::new(cgi, '', @conf)
+				m = DiaryContainer::find_by_month(@conf, "#{year}#{month}")
 				m.diaries.keys.sort.reverse_each do |date|
 					next unless m.diaries[date].visible?
 					result << %Q|<li><a href="#{@index}#{anchor date}">#{m.diaries[date].date.strftime(date_format)}</a>\n|

data/misc/plugin/theme_online.rb

@@ -1,5 +1,8 @@
 # theme_online.rb: choice theme from online repository on tDiary.org
 #
+# options:
+#    @options['theme_online.url']: top level URL of another theme site
+#
 # Copyright (C) 2014 by TADA Tadashi <t@tdtds.jp>
 # You can distribute and/or modify it under GPL2 or any later version.
 #
@@ -7,8 +10,10 @@ require 'json'
 require 'open-uri'
 
 def theme_list_online(list)
+	url = @options['theme_online.url'] || 'http://theme.tdiary.org/'
+	url = "http:#{url}" if url =~ %r|\A//|
 	begin
-		online_list = JSON.load(open('http://theme.tdiary.org/themes.json', &:read))['themes']
+		online_list = JSON.load(open(File.join(url, 'themes.json'), &:read))['themes']
 		list + online_list.keys.map do |t|
 			title = online_list[t]['title']
 			label = t == title ? '' : " (#{title})"
@@ -21,5 +26,6 @@ def theme_list_online(list)
 end
 
 def theme_url_online(theme)
-	"http://theme.tdiary.org/#{h theme}/#{h theme}.css"
+	url = @options['theme_online.url'] || 'http://theme.tdiary.org/'
+	File.join(url, "#{h theme}/#{h theme}.css")
 end

data/spec/acceptance/save_conf_plugin_spec.rb

@@ -56,8 +56,8 @@ feature 'プラグイン選択設定の利用' do
 
 		expect(page.body).to be_include('caretposition.js')
 		expect(page.body).to be_include('category_autocomplete.js')
-		expect(page.body).to be_include('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
-		expect(page.body).not_to be_include('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js?')
+		expect(page.body).to be_include('//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
+		expect(page.body).not_to be_include('//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js?')
 	end
 end
 # Local Variables:

data/spec/core/application_spec.rb

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require 'rack/test'
+require 'tdiary/application'
+
+describe TDiary::Application do
+	include Rack::Test::Methods
+
+	before do
+	end
+
+	describe '#call' do
+		let(:app) { TDiary::Application.new }
+
+		context "when is accessed to index"
+		it do
+			get '/'
+			expect(last_response.status).to eq 200
+		end
+
+		context "when is accessed to update" do
+			it do
+				get '/update.rb'
+				expect(last_response.status).to eq 401
+			end
+		end
+
+		context "with base_dir" do
+			let(:app) { TDiary::Application.new('/diary') }
+
+			it do
+				get '/diary/'
+				expect(last_response.status).to eq 200
+			end
+
+			context "when access to root directory" do
+				it do
+					get '/'
+					expect(last_response.status).to eq 404
+				end
+			end
+		end
+
+		context "when the application raises exception" do
+			before do
+				allow(TDiary::Dispatcher).to receive_message_chain(:index).and_return(
+					lambda {|env| raise StandardError.new }
+				)
+			end
+
+			it do
+				get '/'
+				expect(last_response.status).to eq 500
+				expect(last_response.body).to match(/^StandardError/)
+			end
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/spec/core/diary_container_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+require 'tdiary'
+require 'tdiary/cache/file'
+require 'tdiary/io/default'
+require 'tdiary/diary_container'
+
+describe TDiary::DiaryContainer do
+	let(:conf) { TDiary::Configuration.new }
+	let(:today) { Time.local(2005, 1, 20, 12, 0, 0) }
+
+  let(:tdiary_conf_org) { File.join(TDiary::root, "spec/fixtures/tdiary.conf.webrick") }
+  let(:tdiary_conf) { File.join(TDiary::root, "tdiary.conf") }
+
+  before do
+  	# create sample confing
+		FileUtils.cp_r tdiary_conf_org, tdiary_conf, verbose: false
+
+		# create sample diary
+		tdiary = DummyTDiary.new
+		tdiary.conf = conf
+		io = TDiary::IO::Default.new(tdiary)
+		io.transaction(today) do |diaries|
+			date = today.strftime('%Y%m%d')
+			diary = io.diary_factory(date, "foo", "", "wiki")
+			diaries[date] = diary.append("bar")
+			TDiary::TDiaryBase::DIRTY_DIARY
+		end
+  end
+
+  after do
+    FileUtils.rm_f tdiary_conf
+		["/tmp/data/#{today.year}"].each do |dir|
+			FileUtils.rm_rf File.join(TDiary.root, dir)
+		end
+  end
+
+	context "with find_by_month" do
+		let(:diary) { TDiary::DiaryContainer.find_by_month(conf, "200501") }
+		it { expect(diary).to be_a_kind_of TDiary::DiaryContainer }
+
+		describe "#conf" do
+			subject { diary.conf }
+			it { expect(subject).to be_a_kind_of TDiary::Configuration	}
+		end
+
+		describe "#diaries" do
+			subject { diary.diaries }
+			it { expect(subject).to be_a_kind_of Hash }
+			it { expect(subject.keys).to include('20050120') }
+			it { expect(subject.values).to include(be_a_kind_of TDiary::Style::WikiDiary) }
+		end
+	end
+
+	context "with find_by_day" do
+		let(:diary) { TDiary::DiaryContainer.find_by_day(conf, "20050120") }
+		it { expect(diary).to be_a_kind_of TDiary::DiaryContainer }
+
+		describe "#conf" do
+			subject { diary.conf }
+			it { expect(subject).to be_a_kind_of TDiary::Configuration	}
+		end
+
+		describe "#diaries" do
+			subject { diary.diaries }
+			it { expect(subject).to be_a_kind_of Hash }
+			it { expect(subject.keys).to include('20050120') }
+			it { expect(subject.values).to include(be_a_kind_of TDiary::Style::WikiDiary) }
+		end
+	end
+end

data/spec/core/plugin_spec.rb

@@ -379,6 +379,19 @@ describe TDiary::Plugin do
 			it { expect { subject }.to raise_error }
 		end
 	end
+
+	describe '#startup_proc' do
+		let (:proc) { lambda { "some plugin" } }
+		let (:app) { lambda { "tdiary application" } }
+		before do
+			@plugin.__send__(:add_startup_proc, &proc)
+		end
+
+		it 'add_startup_procで登録したブロックが実行されること' do
+			expect(proc).to receive(:call).with(app)
+			@plugin.__send__(:startup_proc, app)
+		end
+	end
 end
 
 # Local Variables:

data/spec/fixtures/tdiary.conf.gem

@@ -38,8 +38,8 @@ recent_list.rb
 "
 
 @options['dropdown_calendar.label'] = ''
-@options['makerss.file'] = 'public/index.rdf'
-@options['makerss.no_comments.file'] = 'public/no_comments.rdf'
+@options['makerss.file'] = 'index.rdf'
+@options['makerss.no_comments.file'] = 'no_comments.rdf'
 
 @options['spamfilter.bad_comment_patts'] = "(href=|casino|gambling|betting|fastsearch\\.eu\\.com|ganzao|poker|holdem|hold.em|roulette|drug|tramadol|viagra|fioricet|oxycontin|biaxin|aldara|business cards|home depot|slot.?machine|insurance|getblog2|video-game|Good site|internet-all\\.com|deai|tdfms|comu2|omaha)\r\n"
 @options['spamfilter.bad_ip_addrs'] = ""

data/spec/fixtures/tdiary.conf.rack

@@ -38,8 +38,8 @@ recent_list.rb
 "
 
 @options['dropdown_calendar.label'] = ''
-@options['makerss.file'] = 'public/index.rdf'
-@options['makerss.no_comments.file'] = 'public/no_comments.rdf'
+@options['makerss.file'] = 'index.rdf'
+@options['makerss.no_comments.file'] = 'no_comments.rdf'
 
 @options['spamfilter.bad_comment_patts'] = "(href=|casino|gambling|betting|fastsearch\\.eu\\.com|ganzao|poker|holdem|hold.em|roulette|drug|tramadol|viagra|fioricet|oxycontin|biaxin|aldara|business cards|home depot|slot.?machine|insurance|getblog2|video-game|Good site|internet-all\\.com|deai|tdfms|comu2|omaha)\r\n"
 @options['spamfilter.bad_ip_addrs'] = ""

data/spec/fixtures/tdiary.conf.secure

@@ -37,8 +37,8 @@ my-ex.rb
 "
 
 @options['dropdown_calendar.label'] = ''
-@options['makerss.file'] = 'public/index.rdf'
-@options['makerss.no_comments.file'] = 'public/no_comments.rdf'
+@options['makerss.file'] = 'index.rdf'
+@options['makerss.no_comments.file'] = 'no_comments.rdf'
 
 @options['spamfilter.bad_comment_patts'] = "(href=|casino|gambling|betting|fastsearch\\.eu\\.com|ganzao|poker|holdem|hold.em|roulette|drug|tramadol|viagra|fioricet|oxycontin|biaxin|aldara|business cards|home depot|slot.?machine|insurance|getblog2|video-game|Good site|internet-all\\.com|deai|tdfms|comu2|omaha)\r\n"
 @options['spamfilter.bad_ip_addrs'] = ""

data/spec/fixtures/tdiary.conf.webrick

@@ -39,8 +39,8 @@ recent_list.rb
 "
 
 @options['dropdown_calendar.label'] = ''
-@options['makerss.file'] = 'public/index.rdf'
-@options['makerss.no_comments.file'] = 'public/no_comments.rdf'
+@options['makerss.file'] = 'index.rdf'
+@options['makerss.no_comments.file'] = 'no_comments.rdf'
 
 @options['spamfilter.bad_comment_patts'] = "(href=|casino|gambling|betting|fastsearch\\.eu\\.com|ganzao|poker|holdem|hold.em|roulette|drug|tramadol|viagra|fioricet|oxycontin|biaxin|aldara|business cards|home depot|slot.?machine|insurance|getblog2|video-game|Good site|internet-all\\.com|deai|tdfms|comu2|omaha)\r\n"
 @options['spamfilter.bad_ip_addrs'] = ""

data/spec/spec_helper.rb

@@ -26,10 +26,11 @@ RSpec.configure do |config|
 end
 
 class DummyTDiary
-	def conf
-		conf = DummyConf.new
-      conf.data_path = TDiary.root + "/tmp/"
-      conf
+	attr_accessor :conf
+
+	def initialize
+		@conf = DummyConf.new
+		@conf.data_path = TDiary.root + "/tmp/"
 	end
 
 	def ignore_parser_cache