tdiary 4.0.1 → 4.0.1.20130903

data/spec/acceptance_helper.rb

@@ -34,7 +34,7 @@ RSpec.configure do |config|
 	end
 
 	config.after(:all) do
-		FileUtils.rm_r work_conf
+		FileUtils.rm_rf work_conf
 	end
 
 	config.before(:each) do
@@ -42,7 +42,7 @@ RSpec.configure do |config|
 	end
 
 	config.after(:each) do
-		FileUtils.rm_r work_data_dir
+		FileUtils.rm_rf work_data_dir
 	end
 
 	if ENV['TEST_MODE'] == 'rdb'

data/spec/core/configuration_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+require 'tdiary'
+require 'tdiary/configuration'
+
+describe TDiary::Configuration do
+  let(:tdiary_conf) { File.expand_path("../../fixtures/tdiary.conf.webrick", __FILE__) }
+  let(:work_conf) { File.expand_path('../../../tdiary.conf', __FILE__) }
+
+  before do
+    FileUtils.cp_r tdiary_conf, work_conf, :verbose => false
+  end
+
+  after do
+    FileUtils.rm_rf work_conf
+  end
+
+  describe "TDiary.configuration" do
+    before do
+      @obj = TDiary.configuration
+    end
+
+    it { @obj.class.should eq TDiary::Configuration }
+    it "singleton" do
+      @obj.should eq TDiary.configuration
+    end
+  end
+
+  it "TDiary.configuration.attribute" do
+    TDiary.configuration.style.should == "Wiki"
+  end
+end

data/spec/core/style/emptdiary_style_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 require 'tdiary'
 require 'misc/style/emptdiary/emptdiary_style'
 
-describe TDiary::EmptdiaryDiary do
+describe TDiary::Style::EmptdiaryDiary do
 	before do
-		@diary = TDiary::EmptdiaryDiary.new(Time::at( 1041346800 ), "TITLE", "")
+		@diary = TDiary::Style::EmptdiaryDiary.new(Time::at( 1041346800 ), "TITLE", "")
 	end
 
 	describe '#append' do

data/spec/core/style/etdiary_style_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 require 'tdiary'
 require 'misc/style/etdiary/etdiary_style'
 
-describe TDiary::EtdiaryDiary do
+describe TDiary::Style::EtdiaryDiary do
 	before do
-		@diary = TDiary::EtdiaryDiary.new(Time::at( 1041346800 ), "TITLE", "")
+		@diary = TDiary::Style::EtdiaryDiary.new(Time::at( 1041346800 ), "TITLE", "")
 	end
 
 	describe '#append' do

data/spec/core/style/gfm_style_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 require 'tdiary'
 require 'misc/style/gfm/gfm_style'
 
-describe TDiary::GfmDiary do
+describe TDiary::Style::GfmDiary do
 	before do
-		@diary = TDiary::GfmDiary.new(Time.at( 1041346800 ), "TITLE", "")
+		@diary = TDiary::Style::GfmDiary.new(Time.at( 1041346800 ), "TITLE", "")
 	end
 
 	describe '#append' do

data/spec/core/style/rd_style_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 require 'tdiary'
 require 'misc/style/rd/rd_style'
 
-describe TDiary::RdDiary do
+describe TDiary::Style::RdDiary do
 	before do
-		@diary = TDiary::RdDiary.new(Time::at( 1041346800 ), "TITLE", "")
+		@diary = TDiary::Style::RdDiary.new(Time::at( 1041346800 ), "TITLE", "")
 	end
 
 	describe '#append' do

data/spec/core/style/tdiary_style_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 require 'tdiary'
 require 'tdiary/style/tdiary_style'
 
-describe TDiary::TdiaryDiary do
+describe TDiary::Style::TdiaryDiary do
 	before do
-		@diary = TDiary::TdiaryDiary.new(Time::at( 1041346800 ), "TITLE", "")
+		@diary = TDiary::Style::TdiaryDiary.new(Time::at( 1041346800 ), "TITLE", "")
 	end
 
 	describe '#append' do

data/spec/core/style/wiki_style_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 require 'tdiary'
 require 'tdiary/style/wiki_style'
 
-describe TDiary::WikiDiary do
+describe TDiary::Style::WikiDiary do
 	before do
-		@diary = TDiary::WikiDiary.new(Time.at( 1041346800 ), "TITLE", "")
+		@diary = TDiary::Style::WikiDiary.new(Time.at( 1041346800 ), "TITLE", "")
 	end
 
 	describe '#append' do

data/tdiary.rb

@@ -34,7 +34,8 @@ module TDiary
 	PATH = File::dirname( __FILE__ ).untaint
 
 	# tDiary configuration class, initialize tdiary.conf and stored configuration.
-	autoload :Config,                   'tdiary/config'
+	autoload :Configuration,            'tdiary/configuration'
+	autoload :Config,                   'tdiary/configuration'
 	# tDiary plugin class, loading all Plugin and eval plugins in view context.
 	autoload :Plugin,                   'tdiary/plugin'
 	# tDiary Filter class, all filters is loaded by in TDiaryView.
@@ -46,10 +47,7 @@ module TDiary
 	autoload :Application,              'tdiary/application'
 
 	# Diary model class
-	autoload :DiaryBase,                'tdiary/style'
-	autoload :SectionBase,              'tdiary/style'
-	autoload :CategorizableDiary,       'tdiary/style'
-	autoload :UncategorizableDiary,     'tdiary/style'
+	autoload :Style,                    'tdiary/style'
 	autoload :Comment,                  'tdiary/comment'
 	autoload :CommentManager,           'tdiary/comment_manager'
 	autoload :RefererManager,           'tdiary/referer_manager'
@@ -130,6 +128,10 @@ module TDiary
 		def server_root
 			Dir.pwd
 		end
+
+		def configuration
+			@@configuration ||= Configuration.new
+		end
 	end
 end
 

data/tdiary/{config.rb → configuration.rb}

@@ -1,10 +1,10 @@
-# -*- coding: utf-8; -*-
+# -*- coding: utf-8 -*-
 #
-# class Config
+# class Configuration
 #  configuration class
 #
 module TDiary
-	class Config
+	class Configuration
 		attr_reader :database_url
 
 		def initialize( cgi = nil, request = nil )
@@ -24,6 +24,22 @@ module TDiary
 			@io_class.save_cgi_conf(self, result)
 		end
 
+		#
+		# get/set/delete plugin options
+		#
+		def []( key )
+			@options[key]
+		end
+
+		def []=( key, val )
+			@options2[key] = @options[key] = val
+		end
+
+		def delete( key )
+			@options.delete( key )
+			@options2.delete( key )
+		end
+
 		# backword compatibility, you can use @cgi.mobile_agent?
 		def mobile_agent?
 			@request.mobile_agent?
@@ -49,22 +65,6 @@ module TDiary
 			end
 		end
 
-		#
-		# get/set/delete plugin options
-		#
-		def []( key )
-			@options[key]
-		end
-
-		def []=( key, val )
-			@options2[key] = @options[key] = val
-		end
-
-		def delete( key )
-			@options.delete( key )
-			@options2.delete( key )
-		end
-
 		def to_native( str, charset = nil )
 			str = str.dup
 			if str.encoding == Encoding::ASCII_8BIT
@@ -80,6 +80,55 @@ module TDiary
 		end
 
 	private
+
+		# loading tdiary.conf in @data_path.
+		def load_cgi_conf
+			def_vars1 = ''
+			def_vars2 = ''
+			[
+				:tdiary_version,
+				:html_title, :author_name, :author_mail, :index_page, :hour_offset,
+				:description, :icon, :banner, :x_frame_options,
+				:header, :footer,
+				:section_anchor, :comment_anchor, :date_format, :latest_limit, :show_nyear,
+				:theme, :css,
+				:show_comment, :comment_limit, :comment_limit_per_day,
+				:mail_on_comment, :mail_header,
+				:show_referer, :no_referer2, :only_volatile2, :referer_table2,
+				:options2,
+			].each do |var|
+				def_vars1 << "#{var} = nil\n"
+				def_vars2 << "@#{var} = #{var} unless #{var} == nil\n"
+			end
+
+			unless @io_class
+				require 'tdiary/io/cache/file'
+				require 'tdiary/io/default'
+				@io_class = DefaultIO
+			end
+
+			cgi_conf = @io_class.load_cgi_conf(self)
+			cgi_conf.untaint unless @secure
+
+			b = binding.taint
+			eval( def_vars1, b )
+			Safe::safe( @secure ? 4 : 1 ) do
+				begin
+					eval( cgi_conf, b, "(TDiary::Config#load_cgi_conf)", 1 )
+				rescue SyntaxError
+					enc = case @lang
+							when 'en'
+								'UTF-8'
+							else
+								'EUC-JP'
+							end
+					cgi_conf.force_encoding( enc )
+					retry
+				end
+			end if cgi_conf
+			eval( def_vars2, b )
+		end
+
 		# loading tdiary.conf in current directory
 		def configure_attrs
 			@secure = true unless @secure
@@ -149,56 +198,6 @@ module TDiary
 			@section_anchor = @paragraph_anchor unless @section_anchor
 		end
 
-		# loading tdiary.conf in @data_path.
-		def load_cgi_conf
-			def_vars1 = ''
-			def_vars2 = ''
-			[
-				:tdiary_version,
-				:html_title, :author_name, :author_mail, :index_page, :hour_offset,
-				:description, :icon, :banner, :x_frame_options,
-				:header, :footer,
-				:section_anchor, :comment_anchor, :date_format, :latest_limit, :show_nyear,
-				:theme, :css,
-				:show_comment, :comment_limit, :comment_limit_per_day,
-				:mail_on_comment, :mail_header,
-				:show_referer, :no_referer2, :only_volatile2, :referer_table2,
-				:options2,
-			].each do |var|
-				def_vars1 << "#{var} = nil\n"
-				def_vars2 << "@#{var} = #{var} unless #{var} == nil\n"
-			end
-
-			unless @io_class
-				require 'tdiary/io/cache/file'
-				require 'tdiary/io/default'
-				@io_class = DefaultIO
-			end
-
-			cgi_conf = @io_class.load_cgi_conf(self)
-			cgi_conf.untaint unless @secure
-
-			b = binding.taint
-			eval( def_vars1, b )
-			Safe::safe( @secure ? 4 : 1 ) do
-				begin
-					eval( cgi_conf, b, "(TDiary::Config#load_cgi_conf)", 1 )
-				rescue SyntaxError
-					enc = case @lang
-							when 'en'
-								'UTF-8'
-							else
-								'EUC-JP'
-							end
-					cgi_conf.force_encoding( enc )
-					retry
-				end
-			end if cgi_conf
-			eval( def_vars2, b )
-		end
-
-	private
-
 		def setup_attr_accessor_to_all_ivars
 			names = instance_variables().collect {|ivar| ivar.to_s.sub(/@/, '') }
 			(class << self; self; end).class_eval { attr_accessor *names }
@@ -227,6 +226,9 @@ module TDiary
 			nil
 		end
 	end
+
+	# backword compatibility
+	Config = Configuration
 end
 
 # Local Variables:

data/tdiary/io/base.rb

@@ -46,7 +46,7 @@ module TDiary
 				Dir.glob("#{path}/*_style.rb") do |style_file|
 					require style_file.untaint
 					style = File.basename(style_file).sub(/_style\.rb$/, '')
-					@styles[style] = TDiary.const_get("#{style.capitalize}Diary")
+					@styles[style] = TDiary::Style.const_get("#{style.capitalize}Diary")
 				end
 			end
 		end

data/tdiary/io/pstore.rb

@@ -132,7 +132,7 @@ end
 Management a day of diary
 =end
 class Diary
-	include TDiary::DiaryBase
+	include TDiary::BaseDiary
 	include TDiary::UncategorizableDiary
 
 	def initialize( date, title, body )

data/tdiary/style.rb

@@ -1,187 +1,181 @@
 # -*- coding: utf-8 -*-
 module TDiary
-	#
-	# module SectionBase
-	#  Base module of Section.
-	#
-	module SectionBase
-
-		attr_reader :subtitle, :author
-		attr_reader :categories, :stripped_subtitle
-		attr_reader :subtitle_to_html, :stripped_subtitle_to_html, :body_to_html
-
-		def body
-			@body.dup
-		end
+	module Style
+		module BaseSection
 
-		def body=(str)
-			@body = str
-		end
+			attr_reader :subtitle, :author
+			attr_reader :categories, :stripped_subtitle
+			attr_reader :subtitle_to_html, :stripped_subtitle_to_html, :body_to_html
 
-		def html4(date, idx, opt)
-			r = %Q[<div class="section">\n]
-			r << %Q[<%=section_enter_proc( Time.at( #{date.to_i} ) )%>\n]
-			r << do_html4( date, idx, opt )
-			r << %Q[<%=section_leave_proc( Time.at( #{date.to_i} ) )%>\n]
-			r << "</div>\n"
-		end
+			def body
+				@body.dup
+			end
 
-		def chtml(date, idx, opt)
-			r = %Q[<%=section_enter_proc( Time.at( #{date.to_i} ) )%>\n]
-			r << do_html4( date, idx, opt )
-			r << %Q[<%=section_leave_proc( Time.at( #{date.to_i} ) )%>\n]
-		end
+			def body=(str)
+				@body = str
+			end
 
-		def to_s
-			to_src
-		end
+			def html4(date, idx, opt)
+				r = %Q[<div class="section">\n]
+				r << %Q[<%=section_enter_proc( Time.at( #{date.to_i} ) )%>\n]
+				r << do_html4( date, idx, opt )
+				r << %Q[<%=section_leave_proc( Time.at( #{date.to_i} ) )%>\n]
+				r << "</div>\n"
+			end
 
-		def categories_to_string
-			@categories = categories
-			cat_str = ""
-			categories.each {|cat| cat_str << "[#{cat}]"}
-			cat_str << " " unless cat_str.empty?
-		end
-	end
+			def chtml(date, idx, opt)
+				r = %Q[<%=section_enter_proc( Time.at( #{date.to_i} ) )%>\n]
+				r << do_html4( date, idx, opt )
+				r << %Q[<%=section_leave_proc( Time.at( #{date.to_i} ) )%>\n]
+			end
 
-	#
-	# module DiaryBase
-	#  Base module of Diary.
-	#
-	module DiaryBase
-		include ERB::Util
-		include CommentManager
-		include RefererManager
-
-		def init_diary
-			init_comments
-			init_referers
-			@show = true
-		end
+			def to_s
+				to_src
+			end
 
-		def date
-			@date
+			def categories_to_string
+				@categories = categories
+				cat_str = ""
+				categories.each {|cat| cat_str << "[#{cat}]"}
+				cat_str << " " unless cat_str.empty?
+			end
 		end
 
-		def set_date( date )
-			if date.class == String then
-				y, m, d = date.scan( /^(\d{4})(\d\d)(\d\d)$/ )[0]
-				raise ArgumentError::new( 'date string needs YYYYMMDD format.' ) unless y
-				@date = Time::local( y, m, d )
-			else
-				@date = date
+		module BaseDiary
+			include ERB::Util
+			include CommentManager
+			include RefererManager
+
+			def init_diary
+				init_comments
+				init_referers
+				@show = true
 			end
-		end
 
-		def title
-			@title || ''
-		end
+			def date
+				@date
+			end
 
-		def set_title( title )
-			@title = title
-			@last_modified = Time::now
-		end
+			def set_date( date )
+				if date.class == String then
+					y, m, d = date.scan( /^(\d{4})(\d\d)(\d\d)$/ )[0]
+					raise ArgumentError::new( 'date string needs YYYYMMDD format.' ) unless y
+					@date = Time::local( y, m, d )
+				else
+					@date = date
+				end
+			end
 
-		def last_modified
-			# 日本語を含むツッコミを入れると diary.last_modified が String になる (原因不明)
-			# (PStore 保存前は Time だが, 保存後に String となる)
-			# 暫定的に String だったら Time へ変換する
-			if @last_modified.instance_of? String
-				@last_modified = Time.at(0)
-			elsif @last_modified
-				@last_modified
-			else
-				Time::at( 0 )
+			def title
+				@title || ''
 			end
-		end
 
-		def last_modified=( lm )
-			@last_modified  = lm
-		end
+			def set_title( title )
+				@title = title
+				@last_modified = Time::now
+			end
 
-		def visible?
-			@show != false;
-		end
+			def last_modified
+				# 日本語を含むツッコミを入れると diary.last_modified が String になる (原因不明)
+				# (PStore 保存前は Time だが, 保存後に String となる)
+				# 暫定的に String だったら Time へ変換する
+				if @last_modified.instance_of? String
+					@last_modified = Time.at(0)
+				elsif @last_modified
+					@last_modified
+				else
+					Time::at( 0 )
+				end
+			end
 
-		def show( s )
-			@show = s
-		end
+			def last_modified=( lm )
+				@last_modified  = lm
+			end
 
-		def replace(date, title, body)
-			set_date( date )
-			set_title( title )
-			@sections = []
-			append( body )
-		end
+			def visible?
+				@show != false;
+			end
 
-		def each_section
-			@sections.each do |section|
-				yield section
+			def show( s )
+				@show = s
 			end
-		end
 
-		def delete_section(index)
-			@sections.delete_at(index - 1)
-		end
+			def replace(date, title, body)
+				set_date( date )
+				set_title( title )
+				@sections = []
+				append( body )
+			end
 
-		def eval_rhtml( opt, path = '.' )
-			ERB.new(File.read("#{path}/skel/#{opt['prefix']}diary.rhtml").untaint).result(binding)
-		end
+			def each_section
+				@sections.each do |section|
+					yield section
+				end
+			end
 
-		def to_src
-			r = ''
-			each_section do |section|
-				r << section.to_src
+			def delete_section(index)
+				@sections.delete_at(index - 1)
 			end
-			r
-		end
 
-		def to_html( opt = {}, mode = :HTML )
-			case mode
-			when :CHTML
-				to_chtml( opt )
-			else
-				to_html4( opt )
+			def eval_rhtml( opt, path = '.' )
+				ERB.new(File.read("#{path}/skel/#{opt['prefix']}diary.rhtml").untaint).result(binding)
 			end
-		end
 
-		def to_html4(opt)
-			r = ''
-			idx = 1
-			each_section do |section|
-				r << section.html4( date, idx, opt )
-				idx += 1
+			def to_src
+				r = ''
+				each_section do |section|
+					r << section.to_src
+				end
+				r
 			end
-			r
-		end
 
-		def to_chtml( opt )
-			r = ''
-			idx = 1
-			each_section do |section|
-				r << section.chtml( date, idx, opt )
-				idx += 1
+			def to_html( opt = {}, mode = :HTML )
+				case mode
+				when :CHTML
+					to_chtml( opt )
+				else
+					to_html4( opt )
+				end
+			end
+
+			def to_html4(opt)
+				r = ''
+				idx = 1
+				each_section do |section|
+					r << section.html4( date, idx, opt )
+					idx += 1
+				end
+				r
+			end
+
+			def to_chtml( opt )
+				r = ''
+				idx = 1
+				each_section do |section|
+					r << section.chtml( date, idx, opt )
+					idx += 1
+				end
+				r
 			end
-			r
-		end
 
-		def to_s
-			"date=#{date.strftime('%Y%m%d')}, title=#{title}, body=[#{@sections.join('][')}]"
+			def to_s
+				"date=#{date.strftime('%Y%m%d')}, title=#{title}, body=[#{@sections.join('][')}]"
+			end
 		end
-	end
 
-	#
-	# module CategorizableDiary
-	#
-	module CategorizableDiary
-		def categorizable?; true; end
-	end
+		#
+		# module CategorizableDiary
+		#
+		module CategorizableDiary
+			def categorizable?; true; end
+		end
 
-	#
-	# module UncategorizableDiary
-	#
-	module UncategorizableDiary
-		def categorizable?; false; end
+		#
+		# module UncategorizableDiary
+		#
+		module UncategorizableDiary
+			def categorizable?; false; end
+		end
 	end
 end