tdiary 3.2.2.20130507

data/tdiary/view_helper.rb

@@ -0,0 +1,15 @@
+module TDiary
+  module ViewHelper
+		def bot?
+			@conf.bot =~ @cgi.user_agent
+		end
+
+    def base_url
+      if @conf.options['base_url'] && @conf.options['base_url'].length > 0
+        @conf.options['base_url']
+      else
+        @cgi.base_url
+      end
+    end
+  end
+end

data/test/disp_referrer_test.rb

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+
+require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../test_plugin_helper', __FILE__)
+
+include TDiary::PluginTestStub
+
+require 'ja/disp_referrer'
+require 'nkf'
+require 'uri'
+
+# Test cases which are far from complete:
+# run this script to unit-test just small part of the features
+
+# I am sorry that the language resouce has been loaded to the
+# top level. Therefore, we will spit required objects defined
+# in tdiary.rb to the top level.
+
+# Stab for @conf
+class StabConf
+	def secure; false; end
+	def options; {}; end
+	def referer_table; []; end
+	def no_referer; []; end
+	def io_class; nil; end
+end
+@conf = StabConf.new
+
+# Required module and class structures
+module TDiary
+	class TDiaryLatest
+	end
+
+	class DefaultIO
+	end
+end
+
+# Methods that shuold have been defined in Plugin
+class Object
+	def referer_today; '本日のリンク元'; end
+end
+
+# load the main plugin file
+require 'disp_referrer'
+
+class TestSearchEngines < Test::Unit::TestCase
+	def setup
+		@dr2_setup = DispRef2Setup.new(StabConf.new, nil, true, [], '')
+	end
+
+	def match(url, keyword, provider = nil)
+		x = DispRef2URL.new(url).parse(@dr2_setup)
+		assert_equal(:search, x.category, url)
+		assert_equal(to_native(keyword), to_native(x.key), url)
+		assert_equal(to_native(provider), to_native(x.title_ignored), url) if provider
+	end
+
+	def test_search_engines
+		[
+			# simple test to test the unittest code
+			['http://www.google.com/search?q=test', 'test', '.comのGoogle検索'],
+			['http://www.google.com/search?q=test', 'test'],
+			['http://images.google.com/images?q=qwertz&start=240&ndsp=20&svnum=10&hl=fr&lr=&sa=N', 'qwertz'],
+			['http://bloger.x0.com/result/%E3%83%86%E3%82%B9%E3%83%88%E3%81%A7%E3%81%99%E3%81%A8/%E3%83%86%E3%82%B9%E3%83%88%E3%81%A7%E3%81%99%E3%81%A8', 'テストですと', 'YGブログ検索'],
+			['http://wordtantei.com/result/%E3%83%86%E3%82%B9%E3%83%88/%E3%83%86%E3%82%B9%E3%83%88', 'テスト', 'ワード探偵'],
+			['http://www.sfa-cms.net/word/zunda/zunda+%E3%81%9A%E3%82%93%E3%81%A0', 'zunda ずんだ', '入れ⇔替え検索'],
+			['http://search.hatena.ne.jp/search?word=zunda&site=', 'zunda', 'はてな検索'],
+			['http://search.live.com/results.aspx?q=%E3%81%8A%E3%81%BE%E3%81%AC%E3%81%91%E6%B4%BB%E5%8B%95%E6%97%A5%E8%AA%8C&go=%E6%A4%9C%E7%B4%A2&mkt=ja-jp&scope=&FORM=LIVSOP', 'おまぬけ活動日誌', 'Live Search'],
+		].each do |url, keyword, provider|
+			match(url, keyword, provider)
+		end
+	end
+
+	def test_cached_urls
+		[
+			['http://72.14.235.104/search?q=cache:gj71ka2AWYgJ:zunda.freeshell.org/d/20071019.html+rsync+error+error+in+file+IO&hl=ja&ct=clnk&cd=2&gl=jp', 'rsync error error in file IO', 'Google検索(zunda.freeshell.org/d/20071019.htmlのキャッシュ)'],
+		].each do |url, keyword, provider|
+			match(url, keyword, provider)
+		end
+	end
+
+	def test_recursive_conversion
+		[
+			['http://images.google.com/imgres?imgurl=http://zunda.freeshell.org/p/020302_GermanKbdSml.jpg&imgrefurl=http://zunda.freeshell.org/d/20050629.html&h=170&w=512&sz=30&hl=fr&start=256&tbnid=TlfDZCEB4H1PTM:&tbnh=43&tbnw=131&prev=/images%3Fq%3Dqwertz%26start%3D240%26ndsp%3D20%26svnum%3D10%26hl%3Dfr%26lr%3D%26sa%3DN', 'qwertz', '.comのGoogleイメージ検索'],
+			['http://translate.google.com/translate?hl=en&sl=ja&u=http://zunda.freeshell.org/d/20070706.html&sa=X&oi=translate&resnum=2&ct=result&prev=/search%3Fq%3Del%2Bcombote%2Binternational%2Blotto%2Bcommission%26hl%3Den', 'el combote international lotto commission', '.comのGoogle検索'],
+			['http://64.233.179.104/translate_c?hl=en&sl=ja&u=http://zunda.freeshell.org/d/20070501.html&prev=/search%3Fq%3Dhtaccess%2Bbrowser%2Bagent%2BDoCoMo/1.0/N505i/c20/TB/W20H10%26hl%3Den%26client%3Dfirefox-a%26rls%3Dorg.mozilla:en-US:official%26hs%3DKUR', 'htaccess browser agent DoCoMo/1.0/N505i/c20/TB/W20H10', 'Google検索'],
+			['http://216.239.37.104/translate_c?hl=en&sl=ja&u=http://zunda.freeshell.org/d/20050907.html&prev=/search%3Fq%3Drnbovdd.dll%26start%3D10%26hl%3Den%26lr%3D%26client%3Dfirefox-a%26rls%3Dorg.mozilla:en-US:official%26sa%3DN', 'rnbovdd.dll', 'Google検索'],
+			['http://66.249.93.104/translate_c?hl=en&sl=ja&u=http://zunda.freeshell.org/d/20051017.html&prev=/search%3Fq%3Dgperf%2Bwarning%2B%2522missing%2Binitializer%2522%26hl%3Den%26sa%3DG', 'gperf warning "missing initializer"']
+		].each do |url, keyword, provider|
+			match(url, keyword, provider)
+		end
+	end
+end

data/test/my-sequel_test.rb

@@ -0,0 +1,238 @@
+require File.expand_path('../test_helper', __FILE__)
+require 'my-sequel'
+require 'fileutils'
+require 'tmpdir'
+
+# test cases for updates of links: run this file as a Ruby script
+class TestMySequel < Test::Unit::TestCase
+	OrigLinks = {
+		'20061231#p01' => '20061101#p01',
+		'20061231#p02' => '20061001#p01',
+		'20061130#p01' => '20061001#p01',
+	}
+
+	def setup
+		@cache_path = File.join(Dir.tmpdir, "#{__FILE__}-#{$$}")
+		FileUtils.mkdir_p(@cache_path)
+
+		@orig_src_dates = OrigLinks.keys.map{|a| MySequel.date(a)}
+		@orig_dst_dates = OrigLinks.values.map{|a| MySequel.date(a)}
+		orig = MySequel.new(@cache_path)
+		orig.restore(@orig_src_dates)
+		@orig_src_dates.each do |date|
+			orig.clean_dsts(Time.local(*(date.scan(/(\d{4,4})(\d\d)(\d\d)/)[0])))
+		end
+		OrigLinks.each_pair do |src, dst|
+			orig.add(src, dst)
+		end
+		orig.clean_srcs
+		orig.commit
+	end
+
+	def testsrcs	# confirms setup really cached the OrigLinks
+		cached = MySequel.new(@cache_path)
+		cached.restore(@orig_dst_dates)
+		OrigLinks.values.uniq.each do |dst|
+			srcs = OrigLinks.find_all{|e| dst == e[1]}.map{|e| e[0]}
+			assert_equal(srcs.sort, cached.srcs(dst).sort)
+		end
+	end
+
+	def testadd	# confirms addition of a day
+		# write the diary for 2007-01-01
+		cached = MySequel.new(@cache_path)
+		cached.restore(@orig_dst_dates)
+		cached.clean_dsts(Time.local(2007,1,1))
+		cached.add('20070101#p01', '20060101#p01')
+		assert_equal(['20070101#p01'], cached.srcs('20060101#p01'))
+		cached.clean_srcs
+		cached.commit
+		# display the diary for 2006-01-01
+		cached = MySequel.new(@cache_path)
+		cached.restore(['20060101'])
+		assert_equal(['20070101#p01'], cached.srcs('20060101#p01'))
+		# confirmation of other links
+		testsrcs
+	end
+
+	def testadd_two_months	# http://zunda.freeshell.org/d/20070122.html#c01
+		# write the diary for 2007-02-15
+		cached = MySequel.new(@cache_path)
+		cached.restore('20070215')
+		cached.clean_dsts(Time.local(2007,2,15))
+		cached.add('20070215#p01', '20070115#p01')
+		cached.clean_srcs
+		cached.commit
+		# write the diary for 2007-03-10
+		cached = MySequel.new(@cache_path)
+		cached.restore('20070310')
+		cached.clean_dsts(Time.local(2007,3,10))
+		cached.add('20070310#p01', '20070115#p01')
+		cached.clean_srcs
+		cached.commit
+		# display the diary on 2007-01-15
+		cached = MySequel.new(@cache_path)
+		cached.restore('20070115')
+		assert_equal(['20070215#p01', '20070310#p01'], cached.srcs('20070115#p01'))
+
+	end
+
+	def testedit	# confirms edition of a link
+		# edit the diary for 2006-11-31
+		cached = MySequel.new(@cache_path)
+		cached.restore(@orig_dst_dates)
+		cached.clean_dsts(Time.local(2006,11,30))
+		cached.add('20061130#p01', '20060901#p01')
+		cached.clean_srcs
+		cached.commit
+		# display the diary on 2006-09-01
+		cached = MySequel.new(@cache_path)
+		cached.restore(['20060901'])
+		assert_equal(['20061130#p01'], cached.srcs('20060901#p01'))
+		# display the diary on 2006-10-01
+		cached.restore(['20061001'])
+		assert_equal(['20061231#p02'], cached.srcs('20061001#p01'))
+	end
+
+	def testdelete	# confirms deletion of a link
+		# edit the diary for 2006-11-31
+		cached = MySequel.new(@cache_path)
+		cached.restore(@orig_dst_dates)
+		cached.clean_dsts(Time.local(2006,11,30))
+		cached.clean_srcs
+		cached.commit
+		# display the diary on 2006-10-01
+		cached.restore(['20061001'])
+		assert_equal(['20061231#p02'], cached.srcs('20061001#p01'))
+	end
+
+	def teardown
+		FileUtils.rmtree(@cache_path)
+	end
+end
+
+class TestMySequelCss < Test::Unit::TestCase
+	def test_usual
+		assert_equal(<<"_TARGET", MySequel::css(<<'_INNER'))
+\t<style type="text/css" media="all"><!--
+\tdiv.sequel {
+\t\thogehoge: &lt;mogemoge&gt;
+\t}
+\t--></style>
+_TARGET
+hogehoge: <mogemoge>
+_INNER
+	end
+
+	def test_empty
+		assert_equal('', MySequel::css(''))
+	end
+
+	def test_space
+		assert_equal('', MySequel::css(' '))
+	end
+
+	def test_crlf
+		assert_equal('', MySequel::css("\r\n"))
+	end
+
+end
+
+class TestMySequelConf < Test::Unit::TestCase
+	include ERB::Util
+
+	def setup
+		@defaults = {
+			:label => {
+				:title => 'Link label',
+				:default => 'default label',
+				:index => 1,
+			},
+			:format => {
+				:title => 'Date format<sup>*</sup>',
+				:description => 'Format of the dates of the link',
+				:default => '<date>',
+				:index => 2,
+			},
+			:textarea => {
+				:title => 'Test to show text area',
+				:default => "a\nb\ncc",
+				:index => 3,
+				:textarea => true,
+			},
+			:textarea_with_size => {
+				:title => 'Test to show text area',
+				:default => "a\nb\ncc",
+				:index => 4,
+				:textarea => {:rows => 2},
+			}
+		}
+		@my_sequel_conf = MySequel::Conf.new(@defaults)
+	end
+
+	def testdefaults	# retrieve default configuration
+		assert_equal('default label', @my_sequel_conf[:label])
+	end
+
+	def testmerge
+		options = {'my_sequel.label' => 'configured label'}
+		@my_sequel_conf.merge_hash(options)
+		assert_equal('configured label', @my_sequel_conf[:label])
+	end
+
+	def testparams
+		options = {'label' => ['configured label']}
+		@my_sequel_conf.merge_params(options)
+		assert_equal('configured label', @my_sequel_conf[:label])
+	end
+
+	def testparams_with_empty_array
+		options = {'label' => ['configured label'], 'label.reset' => []}
+		@my_sequel_conf.merge_params(options)
+		assert_equal('configured label', @my_sequel_conf[:label])
+	end
+
+	def testtohash
+		testmerge
+		conf_hash = {'dummy' => 'dummy'}
+		@my_sequel_conf.to_conf_hash(conf_hash)
+		assert_equal({'my_sequel.label' => 'configured label', 'dummy' => 'dummy'}, conf_hash)
+	end
+
+	def testparams_with_empty
+		testmerge
+		options = {'label' => ['']}
+		@my_sequel_conf.merge_params(options)
+		assert_equal('', @my_sequel_conf[:label])
+	end
+
+	def testparams_with_reset
+		testmerge
+		options = {'label' => ['any value'], 'label.reset' => 't'}
+		@my_sequel_conf.merge_params(options)
+		assert_equal('default label', @my_sequel_conf[:label])
+	end
+
+	def test_delete_confhash
+		options = {'my_sequel.label' => 'configured label'}
+		@my_sequel_conf.merge_hash(options)
+		params = {'label' => ['any value'],'label.reset' => 't'}
+		@my_sequel_conf.merge_params(params)
+		@my_sequel_conf.to_conf_hash(options)
+		assert(!options.has_key?('my_sequel.label'))
+	end
+
+	def testparams_with_nil
+		testmerge
+		options = {'label' => nil}
+		@my_sequel_conf.merge_params(options)
+		assert_equal('configured label', @my_sequel_conf[:label])
+	end
+
+	def testparams_with_nokey
+		testmerge
+		options = {}
+		@my_sequel_conf.merge_params(options)
+		assert_equal('configured label', @my_sequel_conf[:label])
+	end
+end

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+['..', '../misc/plugin'].each do |path|
+  $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), path)).untaint
+end
+
+require 'tdiary/environment'
+require 'test/unit'

data/test/test_plugin_helper.rb

@@ -0,0 +1,64 @@
+module TDiary
+	module PluginTestStub
+		def add_header_proc(*args); end
+		def add_body_enter_proc(*args); end
+		def add_update_proc(*args); end
+		def add_conf_proc(*args); end
+		def add_title_proc(*args); end
+		def add_subtitle_proc(*args); end
+		def add_footer_proc(*args); end
+		def feed?; false; end
+		def enable_js(*args); end
+		def add_js_setting(*args); end
+		def to_native( str, charset = nil )
+			from = case charset
+				when /^utf-8$/i
+					'W'
+				when /^shift_jis/i
+					'S'
+				when /^EUC-JP/i
+					'E'
+				else
+					''
+			end
+			NKF::nkf( "-m0 -#{from}w", str )
+		end
+	end
+
+	module PluginTestHelper
+		def PluginTestHelper.absolute_path_of(plugin_relative_path)
+			File.expand_path(File.join(File.dirname(__FILE__), '..', plugin_relative_path))
+		end
+
+		def PluginTestHelper.resource_relative_path_of(plugin_relative_path, lang)
+			File.join(File.dirname(plugin_relative_path), lang, File.basename(plugin_relative_path))
+		end
+
+		def PluginTestHelper.resource_absolute_path_of(plugin_relative_path, lang)
+			ppath = PluginTestHelper.absolute_path_of(plugin_relative_path)
+			File.join(File.dirname(ppath), lang, File.basename(ppath))
+		end
+	end
+
+	class ConfStub
+		def style; 'tDiary'; end
+	end
+
+	class PluginTestCase < Test::Unit::TestCase
+		include TDiary::PluginTestStub
+
+		def add_stub_ivars
+			@options = {}
+			@conf_genre_label = {}
+			@conf = TDiary::ConfStub.new
+		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))}
+			File.open(ppath){|f| eval(f.read, context, plugin_relative_path)}
+		end
+	end
+end

data/test/test_plugin_helper_test.rb

@@ -0,0 +1,28 @@
+# Test cases for test_plugin_helper.rb
+require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../test_plugin_helper', __FILE__)
+
+class TestPluginHelper < TDiary::PluginTestCase
+	def test_absolute_path_of
+		abspath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'plugin', '00default.rb'))
+		assert_equal(abspath, TDiary::PluginTestHelper.absolute_path_of('plugin/00default.rb'))
+	end
+
+	def test_resource_absolute_path_of
+		abspath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'plugin', 'en', '00default.rb'))
+		assert_equal(abspath, TDiary::PluginTestHelper.resource_absolute_path_of('plugin/00default.rb', 'en'))
+	end
+
+	def test_resource_relative_path_of
+		abspath = File.join('plugin', 'en', '00default.rb')
+		assert_equal(abspath, TDiary::PluginTestHelper.resource_relative_path_of('plugin/00default.rb', 'en'))
+	end
+
+	def test_load_plugin_en
+		assert_nothing_raised{load_plugin('plugin/00default.rb', 'en', binding)}
+	end
+
+	def test_load_plugin_ja
+		assert_nothing_raised{load_plugin('plugin/00default.rb', 'ja', binding)}
+	end
+end