tdiary 4.0.2 → 4.0.2.20140201

data/spec/acceptance/update_diary_spec.rb

@@ -4,11 +4,11 @@ require 'acceptance_helper'
 feature '日記の更新' do
 	scenario '特定の日記の内容を更新する' do
 		visit '/update.rb'
-		fill_in "year", :with => '2001'
-		fill_in "month", :with => '4'
-		fill_in "day", :with => '23'
-		fill_in "title", :with => "tDiaryのテスト"
-		fill_in "body", :with => <<-BODY
+		fill_in "year", with: '2001'
+		fill_in "month", with: '4'
+		fill_in "day", with: '23'
+		fill_in "title", with: "tDiaryのテスト"
+		fill_in "body", with: <<-BODY
 !さて、テストである。
 とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P
 
@@ -19,7 +19,7 @@ BODY
 		click_button "追記"
 
 		visit '/'
-		page.find('h2', :text => '2001年04月23日').click_link '2001年04月23日'
+		page.find('h2', text: '2001年04月23日').click_link '2001年04月23日'
 		within('div.day span.title'){ page.should have_content "tDiaryのテスト" }
 		within('div.body'){
 			page.should have_content "さて、テストである。"
@@ -30,12 +30,12 @@ BODY
 		}
 
 		visit '/update.rb'
-		fill_in "year", :with => '2001'
-		fill_in "month", :with => '4'
-		fill_in "day", :with => '23'
+		fill_in "year", with: '2001'
+		fill_in "month", with: '4'
+		fill_in "day", with: '23'
 		click_button 'この日付の日記を編集'
 
-		fill_in "body", :with => <<-BODY
+		fill_in "body", with: <<-BODY
 !もう一度テストである。
 本当に動くかな?
 BODY
@@ -43,7 +43,7 @@ BODY
 		click_button "登録"
 
 		visit '/'
-		page.find('h2', :text => '2001年04月23日').click_link '2001年04月23日'
+		page.find('h2', text: '2001年04月23日').click_link '2001年04月23日'
 		within('div.day span.title'){ page.should have_content "tDiaryのテスト" }
 		within('div.body'){
 			page.should have_no_content "さて、テストである。"
@@ -58,12 +58,12 @@ BODY
 		append_default_diary
 
 		visit '/update.rb'
-		fill_in "year", :with => Date.today.year
-		fill_in "month", :with => Date.today.month
-		fill_in "day", :with => Date.today.day
+		fill_in "year", with: Date.today.year
+		fill_in "month", with: Date.today.month
+		fill_in "day", with: Date.today.day
 		click_button 'この日付の日記を編集'
 
-		within('div.textarea') { fill_in "body", :with => '' }
+		within('div.textarea') { fill_in "body", with: '' }
 
 		click_button "登録"
 		page.should have_content "Click here!"
@@ -76,9 +76,9 @@ BODY
 		append_default_diary
 
 		visit '/update.rb'
-		fill_in "year", :with => Date.today.year
-		fill_in "month", :with => Date.today.month
-		fill_in "day", :with => Date.today.day
+		fill_in "year", with: Date.today.year
+		fill_in "month", with: Date.today.month
+		fill_in "day", with: Date.today.day
 		click_button 'この日付の日記を編集'
 		check 'hide'
 
@@ -95,9 +95,9 @@ BODY
 		append_default_diary('20010504')
 
 		visit '/update.rb'
-		fill_in "year", :with => '2001'
-		fill_in "month", :with => '5'
-		fill_in "day", :with => '3'
+		fill_in "year", with: '2001'
+		fill_in "month", with: '5'
+		fill_in "day", with: '3'
 		click_button 'この日付の日記を編集'
 
 		page.should have_content('«前の日記(2001年05月02日)')

data/spec/acceptance/view_category_spec.rb

@@ -8,11 +8,11 @@ feature 'カテゴリ機能の動作' do
 		visit '/'
 		click_link '追記'
 
-		within('span.year') { fill_in "year", :with => '2001' }
-		within('span.month') { fill_in "month", :with => '4' }
-		within('span.day') { fill_in "day", :with => '23' }
+		within('span.year') { fill_in "year", with: '2001' }
+		within('span.month') { fill_in "month", with: '4' }
+		within('span.day') { fill_in "day", with: '23' }
 		within('div.textarea') {
-			fill_in "body", :with => <<-BODY
+			fill_in "body", with: <<-BODY
 ![category] さて、テストである。
 とりあえず自前の環境ではちゃんと動いているが、きっと穴がいっぱいあるに違いない:-P
 
@@ -24,7 +24,7 @@ BODY
 		click_button "追記"
 
 		visit '/'
-		page.find('a', :text => "category").click
+		page.find('a', text: "category").click
 		page.should have_content 'Categories'
 	end
 end

data/spec/acceptance/view_comment_spec.rb

@@ -16,7 +16,7 @@ feature 'ツッコミの表示' do
 		page.should have_no_content "こんにちは!こんにちは!"
 
 		today = Date.today.strftime("%Y年%m月%d日")
-		page.find('h2', :text => today).click_link today
+		page.find('h2', text: today).click_link today
 		page.should have_no_content "alpha"
 		page.should have_no_content "こんにちは!こんにちは!"
 	end
@@ -26,15 +26,15 @@ feature 'ツッコミの表示' do
 
 		visit "/"
 		click_link 'ツッコミを入れる'
-		fill_in "name", :with => "寿司"
-		fill_in "body", :with => <<-BODY
+		fill_in "name", with: "寿司"
+		fill_in "body", with: <<-BODY
 :sushi: は美味しい
 BODY
 		click_button '投稿'
 
 		visit "/"
 		today = Date.today.strftime("%Y年%m月%d日")
-		page.find('h2', :text => today).click_link today
+		page.find('h2', text: today).click_link today
 		within('div.day div.comment div.commentbody') {
 			page.body.should be_include "<img src='http://www.emoji-cheat-sheet.com/graphics/emojis/sushi.png' width='20' height='20' title='sushi' alt='sushi' class='emoji' /> は美味しい"
 		}
@@ -45,8 +45,8 @@ BODY
 
 		visit "/"
 		click_link 'ツッコミを入れる'
-		fill_in "name", :with => "寿司"
-		fill_in "body", :with => <<-BODY
+		fill_in "name", with: "寿司"
+		fill_in "body", with: <<-BODY
 :sushi: は美味しい
 BODY
 		click_button '投稿'

data/spec/acceptance/view_diary_spec.rb

@@ -19,7 +19,7 @@ feature '日記を読む' do
 		after_day = '2010年05月01日'
 
 		visit '/'
-		page.find('h2', :text => before_day).click_link "#{before_day}"
+		page.find('h2', text: before_day).click_link "#{before_day}"
 		within('div.adminmenu'){ page.should have_content "次の日記(#{after_day})"}
 
 		click_link "次の日記(#{after_day})"
@@ -54,7 +54,7 @@ feature '日記を読む' do
 		append_default_diary('20030423')
 
 		visit '/'
-		page.find('h2', :text => "2001年04月23日").click_link '2001年04月23日'
+		page.find('h2', text: "2001年04月23日").click_link '2001年04月23日'
 		click_link '長年日記'
 
 		titles = page.all('h2 span.date a').map{|t| t.text }
@@ -79,12 +79,12 @@ feature '日記を読む' do
 
 		visit '/'
 		click_link '追記'
-		within('span.year') { fill_in "year", :with => 2001 }
-		within('span.month') { fill_in "month", :with => 01 }
-		within('span.day') { fill_in "day", :with => 31 }
-		within('div.title') { fill_in "title", :with => "tDiaryのテスト" }
+		within('span.year') { fill_in "year", with: 2001 }
+		within('span.month') { fill_in "month", with: 01 }
+		within('span.day') { fill_in "day", with: 31 }
+		within('div.title') { fill_in "title", with: "tDiaryのテスト" }
 		within('div.textarea') {
-			fill_in "body", :with => <<-BODY
+			fill_in "body", with: <<-BODY
 !さて、月末である。
 今月も終わる
 BODY
@@ -93,12 +93,12 @@ BODY
 
 		visit '/'
 		click_link '追記'
-		within('span.year') { fill_in "year", :with => 2001 }
-		within('span.month') { fill_in "month", :with => 02 }
-		within('span.day') { fill_in "day", :with => 01 }
-		within('div.title') { fill_in "title", :with => "tDiaryのテスト" }
+		within('span.year') { fill_in "year", with: 2001 }
+		within('span.month') { fill_in "month", with: 02 }
+		within('span.day') { fill_in "day", with: 01 }
+		within('div.title') { fill_in "title", with: "tDiaryのテスト" }
 		within('div.textarea') {
-			fill_in "body", :with => <<-BODY
+			fill_in "body", with: <<-BODY
 !さて、月始めである。
 今月も始まる
 BODY

data/spec/acceptance/view_referer_spec.rb

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 require 'acceptance_helper'
 
-feature 'リンク元の表示', :exclude_selenium => true do
+feature 'リンク元の表示', exclude_selenium: true do
 	scenario '日表示にリンク元が表示されている' do
 		append_default_diary
 		visit '/'
 		today = Date.today.strftime("%Y年%m月%d日")
-		page.find('h2', :text => today).click_link today
+		page.find('h2', text: today).click_link today
 		within('div.day') {
 			page.should have_css('div[class="refererlist"]')
 			within('div.refererlist') { page.should have_content "http://www.example.com" }
@@ -17,7 +17,7 @@ feature 'リンク元の表示', :exclude_selenium => true do
 		append_default_diary
 		visit "/"
 		today = Date.today.strftime("%Y年%m月%d日")
-		page.find('h2', :text => today).click_link today
+		page.find('h2', text: today).click_link today
 		within('div.day div.refererlist') { page.should have_link "http://www.example.com" }
 	end
 end

data/spec/acceptance_helper.rb

@@ -30,7 +30,7 @@ RSpec.configure do |config|
 	work_conf = File.expand_path('../../tdiary.conf', __FILE__)
 
 	config.before(:all) do
-		FileUtils.cp_r tdiary_conf, work_conf, :verbose => false
+		FileUtils.cp_r tdiary_conf, work_conf, verbose: false
 	end
 
 	config.after(:all) do
@@ -39,7 +39,7 @@ RSpec.configure do |config|
 
 	config.before(:each) do
 		FileUtils.mkdir_p work_data_dir
-		FileUtils.cp_r(fixture_conf, File.join(work_data_dir, "tdiary.conf"), :verbose => false) unless fixture_conf.empty?
+		FileUtils.cp_r(fixture_conf, File.join(work_data_dir, "tdiary.conf"), verbose: false) unless fixture_conf.empty?
 	end
 
 	config.after(:each) do

data/spec/core/configuration_spec.rb

@@ -8,7 +8,7 @@ describe TDiary::Configuration do
   let(:work_conf) { File.expand_path('../../../tdiary.conf', __FILE__) }
 
   before do
-    FileUtils.cp_r tdiary_conf, work_conf, :verbose => false
+    FileUtils.cp_r tdiary_conf, work_conf, verbose: false
   end
 
   after do

data/spec/core/io/default_spec.rb

@@ -46,7 +46,7 @@ describe TDiary::IO::Default do
       end
     end
 
-    subject { File.open(TDiary.root + "/tmp/#{Time.now.year}/#{Time.now.year}#{Time.now.month}.td2").read }
+    subject { File.open(TDiary.root + "/tmp/#{Time.now.year}/#{Time.now.strftime('%Y%m')}.td2").read }
     it { expect(subject).to be_include "foo" }
     it { expect(subject).to be_include "bar" }
 
@@ -68,7 +68,7 @@ describe TDiary::IO::Default do
         end
       end
 
-      subject { File.open(TDiary.root + "/tmp/#{Time.now.year}/#{Time.now.year}#{Time.now.month}.td2").read }
+      subject { File.open(TDiary.root + "/tmp/#{Time.now.year}/#{Time.now.strftime('%Y%m')}.td2").read }
 
       it "update contents of diary" do
         expect(subject).to_not be_nil
@@ -81,6 +81,34 @@ describe TDiary::IO::Default do
 
   end
 
+  describe "#style" do
+    context "given Foo style" do
+      let(:io) { TDiary::IO::Default.new(DummyTDiary.new) }
+
+      before do
+        TDiary::Style.const_set(:FooSection, Class.new)
+        TDiary::Style.const_set(:FooDiary, Class.new)
+      end
+
+      it "activates a style automatically" do
+        style = io.style("Foo")
+        expect(style).to eq TDiary::Style::FooDiary
+        expect(style).to be < TDiary::Style::BaseDiary
+        expect(style).to be < TDiary::Style::CategorizableDiary
+        expect(TDiary::Style::FooSection).to be < TDiary::Style::BaseSection
+      end
+
+      it "raises a BadStyleError when style is unknown" do
+        expect { io.style("Bar") }.to raise_error(TDiary::BadStyleError)
+      end
+
+      after do
+        TDiary::Style.send(:remove_const, :FooSection)
+        TDiary::Style.send(:remove_const, :FooDiary)
+      end
+    end
+  end
+
   before(:all) do
     ["/tmp/tdiary.conf", "/tmp/#{Time.now.year}"].each do |file|
       FileUtils.rm_rf TDiary.root + file

data/spec/core/plugin_spec.rb

@@ -8,7 +8,7 @@ describe TDiary::Plugin do
 	before do
 		config = PluginFake::Config.new
 		config.plugin_path = 'spec/fixtures/plugin'
-		@plugin = TDiary::Plugin.new({ :conf => config, :debug => true })
+		@plugin = TDiary::Plugin.new({ conf: config, debug: true })
 	end
 
 	describe '#load_plugin' do

data/tdiary/application/configuration.rb

@@ -4,7 +4,6 @@ module TDiary
 			attr_accessor :assets_paths, :assets_precompile, :plugin_paths, :path, :builder_procs, :authenticate_proc
 
 			def initialize
-				@assets_paths = []
 				# if you need to auto compilation for CoffeeScript
 				@assets_precompile = false;
 				@plugin_paths = []

data/tdiary/application/extensions/omniauth.rb

@@ -4,7 +4,7 @@ require 'tdiary/rack/auth/omniauth'
 
 TDiary::Application.configure do
 	config.builder do
-		use ::Rack::Session::Pool, :expire_after => 2592000
+		use ::Rack::Session::Pool, expire_after: 2592000
 		use OmniAuth::Builder do
 			configure {|conf| conf.path_prefix = "/auth" }
 			provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']

data/tdiary/application.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+require 'tdiary'
 require 'rack/builder'
 require 'tdiary/application/configuration'
 require 'tdiary/rack'
@@ -41,12 +42,6 @@ module TDiary
 	end
 
 	Application.configure do
-		config.assets_paths.concat %w(js theme).map {|path|
-			[TDiary.root, TDiary.server_root].map {|base_dir|
-				File.join(base_dir, path)
-			}
-		}.flatten.uniq
-
 		config.builder do
 			map Application.config.path[:index] do
 				use TDiary::Rack::HtmlAnchor
@@ -62,9 +57,11 @@ module TDiary
 
 			map Application.config.path[:assets] do
 				environment = Sprockets::Environment.new
-				Application.config.assets_paths.each do |path|
-					environment.append_path path
-				end
+				TDiary::Extensions::constants.map {|extension|
+					TDiary::Extensions::const_get( extension ).assets_path
+				}.flatten.uniq.each {|assets_path|
+					environment.append_path assets_path
+				}
 
 				if Application.config.assets_precompile
 					require 'tdiary/rack/assets/precompile'

data/tdiary/cli.rb

@@ -12,7 +12,7 @@ module TDiary
 		end
 
 		desc "new DIR_NAME", "Create a new tDiary directory"
-		method_option "skip-bundle", :type => :boolean, :banner =>
+		method_option "skip-bundle", type: :boolean, banner:
 			"don't run bundle and .htpasswd generation"
 		def new(name)
 			target = File.join(Dir.pwd, name)
@@ -35,7 +35,7 @@ module TDiary
 		end
 
 		desc "update", "update tDiary"
-		method_option "skip-bundle", :type => :boolean, :banner =>
+		method_option "skip-bundle", type: :boolean, banner:
 			"don't run bundle"
 		def update
 			target = Dir.pwd
@@ -88,13 +88,13 @@ module TDiary
 		end
 
 		desc "server", "Start tDiary server"
-		method_option "rack", :type => :string, :banner =>
+		method_option "rack", type: :string, banner:
 			"start server with rack interface (default)"
-		method_option "cgi", :type => :string, :banner =>
+		method_option "cgi", type: :string, banner:
 			"start server with cgi interface"
-		method_option "bind", :aliases => "b", :type => :string, :default => "0.0.0.0", :banner =>
+		method_option "bind", aliases: "b", type: :string, default: "0.0.0.0", banner:
 			"bind to the IP"
-		method_option "port", :aliases => "p", :type => :numeric, :default => 19292, :banner =>
+		method_option "port", aliases: "p", type: :numeric, default: 19292, banner:
 			"use PORT"
 		def server
 			require 'tdiary/environment'

data/tdiary/configuration.rb

@@ -71,10 +71,10 @@ module TDiary
 				str.force_encoding(charset || 'utf-8')
 			end
 			unless str.valid_encoding?
-				str.encode!('utf-16be', {:invalid => :replace, :undef => :replace})
+				str.encode!('utf-16be', {:invalid => :replace, undef: :replace})
 			end
 			unless str.encoding == Encoding::UTF_8
-				str.encode!('utf-8', {:invalid => :replace, :undef => :replace})
+				str.encode!('utf-8', {:invalid => :replace, undef: :replace})
 			end
 			str
 		end

data/tdiary/extensions/core.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+module TDiary
+	module Extensions
+		class Core
+			def self.sp_path
+			end
+
+			def self.assets_path
+				%w(js theme).map {|path|
+					[TDiary.root, TDiary.server_root].map {|base_dir|
+						File.join(base_dir, path)
+					}
+				}
+			end
+		end
+	end
+end

data/tdiary/extensions.rb

@@ -0,0 +1,6 @@
+require 'tdiary/extensions/core'
+
+module TDiary
+  module Extensions
+  end
+end

data/tdiary/io/base.rb

@@ -45,14 +45,18 @@ module TDiary
 					path = path.sub(/\/+$/, '').untaint
 					Dir.glob("#{path}/*.rb") {|style_file| require style_file.untaint }
 				end
-				(["tdiary", "wiki"] + [@tdiary.conf.style].map(&:downcase)).flatten.uniq.each do |style|
-					klass = TDiary::Style.const_get("#{style.capitalize}Diary")
-					klass.send(:include, TDiary::Style::BaseDiary)
-					klass.send(:include, TDiary::Style::CategorizableDiary)
-					if TDiary::Style.const_defined? ("#{style.capitalize}Section")
-						TDiary::Style.const_get("#{style.capitalize}Section").send(:include, TDiary::Style::BaseSection)
+				TDiary::Style.constants(false).each do |name|
+					prefix = name.slice(/\A(.*)Diary\z/, 1)
+					if prefix && /\A(Base|Categorizable)\z/ !~ prefix
+						klass = TDiary::Style.const_get(name)
+						klass.send(:include, TDiary::Style::BaseDiary)
+						klass.send(:include, TDiary::Style::CategorizableDiary)
+						section_class_name = "#{prefix}Section"
+						if TDiary::Style.const_defined?(section_class_name)
+							TDiary::Style.const_get(section_class_name).send(:include, TDiary::Style::BaseSection)
+						end
+						@styles[prefix.downcase] = klass
 					end
-					@styles[style] = klass
 				end
 			end
 

data/tdiary/lang/ja.rb

@@ -23,11 +23,11 @@ def mobile_encoding
 end
 
 def to_mobile( str )
-	str.encode(mobile_encoding, {:invalid => :replace, :undef => :replace})
+	str.encode(mobile_encoding, {:invalid => :replace, undef: :replace})
 end
 
 def to_mail( str )
-	str.encode('iso-2022-jp', {:invalid => :replace, :undef => :replace})
+	str.encode('iso-2022-jp', {:invalid => :replace, undef: :replace})
 end
 
 def migrate_to_utf8( str )

data/tdiary/server.rb

@@ -30,7 +30,7 @@ module TDiary
 
 		def initialize( opts )
 			@server = WEBrick::HTTPServer.new(
-				:Port => opts[:port], :BindAddress => opts[:bind],
+				:Port => opts[:port], BindAddress: opts[:bind],
 				:DocumentRoot => TDiary.root,
 				:MimeTypes => tdiary_mime_types,
 				:Logger => webrick_logger_to( opts[:logger] ),

data/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '4.0.2'
+	VERSION = '4.0.2.20140201'
 end

data/tdiary.rb

@@ -45,6 +45,7 @@ module TDiary
 	autoload :Server,                   'tdiary/server'
 	# Rack Application, TODO: integrate Server and Application
 	autoload :Application,              'tdiary/application'
+	autoload :Extensions,               'tdiary/extensions'
 
 	# Diary model class
 	autoload :Style,                    'tdiary/style'
@@ -124,7 +125,7 @@ module TDiary
 
 		# directory where the server was started
 		def server_root
-			Dir.pwd
+			Dir.pwd.untaint
 		end
 
 		def configuration

data/test/test_plugin_helper.rb

@@ -42,23 +42,67 @@ module TDiary
 
 	class ConfStub
 		def style; 'tDiary'; end
+
+		def initialize
+			@conf = Hash.new
+		end
+
+		def []=(k,v)
+			@conf[k] = v
+		end
+
+		def [](k)
+			return @conf[k]
+		end
 	end
 
-	class PluginTestCase < Test::Unit::TestCase
+	class StubPlugin
+		def self.inherited(child)
+			super
+			child.module_eval(<<-EOS)
+				def context
+					binding
+				end
+			EOS
+		end
+
 		include TDiary::PluginTestStub
 
-		def add_stub_ivars
-			@options = {}
-			@conf_genre_label = {}
-			@conf = TDiary::ConfStub.new
+		def StubPlugin::_load_plugin(plugin_relative_path, lang = 'en')
+			plugin_class = Class.new(StubPlugin)
+			plugin = plugin_class.new(lang)
+			plugin.load(plugin_relative_path)
+			return plugin_class, plugin
 		end
 
-		def load_plugin(plugin_relative_path, lang = 'en', context = binding)
-			add_stub_ivars
-			ppath = PluginTestHelper.absolute_path_of(plugin_relative_path)
-			pl10n = PluginTestHelper.resource_absolute_path_of(plugin_relative_path, lang)
-			File.open(pl10n){|f| eval(f.read, context, PluginTestHelper.resource_relative_path_of(plugin_relative_path, lang))}
+		def StubPlugin::load_plugin(plugin_relative_path, lang = 'en')
+			return StubPlugin::_load_plugin(plugin_relative_path, lang = 'en')[1]
+		end
+
+		def StubPlugin::new_plugin(plugin_relative_path, lang = 'en')
+			return StubPlugin::_load_plugin(plugin_relative_path, lang = 'en')[0]
+		end
+
+		attr_accessor :conf
+		attr_accessor :options
+
+		def initialize(lang = 'en')
+			@lang = lang
+			reset
+		end
+
+		def load(plugin_relative_path)
+			reset
+			ppath = TDiary::PluginTestHelper.absolute_path_of(plugin_relative_path)
+			pl10n = TDiary::PluginTestHelper.resource_absolute_path_of(plugin_relative_path, @lang)
+			File.open(pl10n){|f| eval(f.read, context, TDiary::PluginTestHelper.resource_relative_path_of(plugin_relative_path, @lang))}
 			File.open(ppath){|f| eval(f.read, context, plugin_relative_path)}
 		end
+
+		def reset
+			@options = {}
+			@conf_genre_label = {}
+			@conf = TDiary::ConfStub.new
+		end
 	end
 end