tdiary 3.2.2.20130507

data/spec/javascripts/00default_spec.js

@@ -0,0 +1,35 @@
+describe("$tDiary", function() {
+  beforeEach(function() {
+  });
+
+  it("should exist a global $tDiary object", function() {
+    expect($tDiary).toEqual(jasmine.any(Object));
+    expect($tDiary.plugin).toEqual(jasmine.any(Object));
+  });
+});
+
+describe("$", function() {
+  describe("#makePluginTag", function() {
+    describe("when Wiki style", function() {
+      beforeEach(function() {
+        $tDiary.style = 'wiki';
+      });
+
+      it('should create wiki style plugin tag', function() {
+        var tag = $.makePluginTag("plugin_name", ["param1", "param2"]);
+        expect(tag).toEqual('{{plugin_name "param1", "param2"}}');
+        loadFixtures('00default.html');
+      });
+    });
+  });
+
+  describe("#insertAtCaret", function() {
+    beforeEach(function() {
+      loadFixtures('00default.html');
+    });
+    it('should insert text to the textarea', function() {
+      $('#body').insertAtCaret('[category] ');
+      expect($('#body').val()).toEqual('[category] sample diary');
+    });
+  });
+});

data/spec/javascripts/fixtures/00default.html

@@ -0,0 +1 @@
+<textarea id="body" name="body">sample diary</textarea>

data/spec/javascripts/support/jasmine.yml

@@ -0,0 +1,76 @@
+# src_files
+#
+# Return an array of filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# src_files:
+#   - lib/source1.js
+#   - lib/source2.js
+#   - dist/**/*.js
+#
+src_files:
+    - vendor/jquery-1.8/jquery.js # load first
+    - vendor/jasmine-jquery-1.4.2/jasmine-jquery.js
+    - js/00default.js
+#    - js/**/*.js
+
+# stylesheets
+#
+# Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
+# Default: []
+#
+# EXAMPLE:
+#
+# stylesheets:
+#   - css/style.css
+#   - stylesheets/*.css
+#
+stylesheets:
+
+# helpers
+#
+# Return an array of filepaths relative to spec_dir to include before jasmine specs.
+# Default: ["helpers/**/*.js"]
+#
+# EXAMPLE:
+#
+# helpers:
+#   - helpers/**/*.js
+#
+helpers:
+
+# spec_files
+#
+#  Return an array of filepaths relative to spec_dir to include.
+# Default: ["**/*[sS]pec.js"]
+#
+# EXAMPLE:
+#
+# spec_files:
+#   - **/*[sS]pec.js
+#
+spec_files:
+
+# src_dir
+#
+# Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
+# Default: project root
+#
+# EXAMPLE:
+#
+# src_dir: public
+#
+src_dir:
+
+# spec_dir
+#
+# Spec directory path. Your spec_files must be returned relative to this path.
+# Default: spec/javascripts
+#
+# EXAMPLE:
+#
+# spec_dir: spec/javascripts
+#
+spec_dir:

data/spec/plugin/bq_spec.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require File.expand_path('../plugin_helper', __FILE__)
+
+describe "bq plugin w/" do
+	def setup_bq_plugin( mode )
+		fake_plugin(:bq) { |plugin|
+			plugin.mode = mode
+		}
+	end
+
+	describe "src only." do
+		before do
+			plugin = setup_bq_plugin('lateste')
+			@body_snippet = plugin.bq('foo')
+		end
+
+		it { @body_snippet.should == expected_html_body(
+				:src => 'foo') }
+	end
+
+	def expected_html_body(options)
+		expected = %|<blockquote>\n<p>#{options[:src]}</p>\n</blockquote>\n|
+	end
+end

data/spec/plugin/plugin_helper.rb

@@ -0,0 +1,203 @@
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '../../misc/plugin')).untaint
+
+require File.dirname(__FILE__) + "/../spec_helper"
+require 'erb'
+
+# FIXME PluginFake in under construction.
+class PluginFake
+	include ERB::Util
+
+	attr_reader :conf
+	attr_accessor :mode, :date
+
+	def initialize
+		@conf = Config.new
+		@mode = ""
+		@date = nil
+		@header_procs = []
+		@footer_procs = []
+		@update_procs = []
+		@conf_procs = []
+		@body_enter_procs = []
+		@body_leave_procs = []
+	end
+
+	def add_conf_proc( key, label, genre=nil, &block )
+		@conf_procs << block
+	end
+
+	def add_header_proc( block = Proc::new )
+		@header_procs << block
+	end
+
+	def add_footer_proc( block = Proc::new )
+		@footer_procs << block
+	end
+
+	def add_update_proc( block = Proc::new )
+		@update_procs << block
+	end
+
+	def conf_proc
+		r = []
+		@conf_procs.each do |proc|
+			r << proc.call
+		end
+		r.join.chomp
+	end
+
+	def header_proc
+		r = []
+		@header_procs.each do |proc|
+			r << proc.call
+		end
+		r.join.chomp
+	end
+
+	def footer_proc
+		r = []
+		@footer_procs.each do |proc|
+			r << proc.call
+		end
+		r.join.chomp
+	end
+
+	def add_body_enter_proc( block = Proc::new )
+		@body_enter_procs << block
+	end
+
+	def body_enter_proc( date )
+		r = []
+		@body_enter_procs.each do |proc|
+			r << proc.call( date )
+		end
+		r.join.chomp
+	end
+
+	def add_body_leave_proc( block = Proc::new )
+		@body_leave_procs << block
+	end
+
+	def body_leave_proc( date )
+		r = []
+		@body_leave_procs.each do |proc|
+			r << proc.call( date )
+		end
+		r.join.chomp
+	end
+
+	class Config
+
+		attr_accessor :index, :update, :author_name, :author_mail, :index_page,
+			:html_title, :theme, :css, :date_format, :referer_table, :options, :cgi,
+			:plugin_path, :lang, :style, :secure
+
+		def initialize
+			@cgi = CGIFake.new
+			@options = {}
+			@options2 = {}
+			@index = './'
+			@html_title = ''
+
+			bot = ["bot", "spider", "antenna", "crawler", "moget", "slurp"]
+			bot += @options['bot'] || []
+			@bot = Regexp::new( "(#{bot.uniq.join( '|' )})", true )
+		end
+
+		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 base_url
+			begin
+				if @options['base_url'].length > 0 then
+					return @options['base_url']
+				end
+			rescue
+			end
+		end
+
+		def mobile_agent?
+			@cgi.mobile_agent?
+		end
+
+		def bot?
+			@bot =~ @cgi.user_agent
+		end
+	end
+
+	def smartphone?
+		@conf.cgi.smartphone?
+	end
+  alias iphone? smartphone?
+end
+
+class CGIFake
+	attr_accessor :user_agent
+
+	def initialize
+		@user_agent = ""
+	end
+
+	def mobile_agent?
+		self.user_agent =~ %r[
+			^DoCoMo|
+			^(?:KDDI|UP\.Browser)|
+			^(?:J-(?:PHONE|EMULATOR)|Vodafone|SoftBank|MOT-|[VS]emulator)|
+			WILLCOM|DDIPOCKET|
+			PDXGW|ASTEL|Palmscape|Xiino|sharp\ pda\ browser|Windows\ CE|L-mode
+		]x
+	end
+
+	def smartphone?
+		self.user_agent =~ /iP(?:hone|od)/
+	end
+end
+
+
+def fake_plugin( name_sym, cgi=nil, base=nil, &block )
+	plugin = PluginFake.new
+	yield plugin if block_given?
+
+	file_path = plugin_path( name_sym, base )
+	plugin_name = File.basename( file_path, ".rb" )
+
+	plugin.instance_eval do
+		eval( File.read( file_path ), binding,
+			"(#{File.basename(file_path)})", 1 )
+	end
+	plugin_sym = plugin_name.to_sym
+	if plugin.class.private_method_defined?( plugin_sym )
+		plugin.__send__( :public, plugin_sym )
+	end
+
+	plugin
+end
+
+def plugin_path( plugin_sym, base=nil )
+	paths = []
+	paths << ( base ? base : File.join(TDiary.library_root, "misc/plugin") )
+	paths << "#{plugin_sym.to_s}.rb"
+	File.expand_path( File.join( paths ))
+end
+
+def anchor( s )
+	if /^([\-\d]+)#?([pct]\d*)?$/ =~ s then
+		if $2 then
+			"?date=#$1##$2"
+		else
+			"?date=#$1"
+		end
+	else
+		""
+	end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..')).untaint
+
+ENV['RACK_ENV'] = "test"
+
+require 'tdiary/environment'
+
+if ENV['COVERAGE'] = 'simplecov'
+	require 'simplecov'
+	require 'coveralls'
+
+	SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+	SimpleCov.start do
+		add_filter '/spec/'
+		add_filter '/test/'
+		add_filter '/vendor/'
+	end
+end
+
+require 'tdiary'
+
+RSpec.configure do |config|
+	config.treat_symbols_as_metadata_keys_with_true_values = true
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/tdiary.conf.beginner

@@ -0,0 +1,244 @@
+#
+# 初めてtDiaryを使う人向けの設定ファイル
+#
+# For those who do not read Japanese: please read doc/README.en.html or
+# misc/i18n/README-en.rd and use misc/i18n/tdiary.conf.sample-en.
+#
+
+#-------------------------------------------
+# 下の@data_pathだけは必ず指定してください!!
+#-------------------------------------------
+@data_path = 'data'
+
+#   @data_pathでは日記のデータを保存するディレクトリを指定します。
+#   このディレクトリは、WWWサーバの権限で書き込めるパーミッションに
+#   しておく必要があります。
+
+#-----------------------------------------------
+# 以下の項目は必ずしも変更する必要はありません
+# また、ほとんどは設定画面から設定を変更できます
+#-----------------------------------------------
+
+#-------
+# CGIで設定できない項目群
+#-------
+
+@style = 'Wiki'
+
+#@index = './'
+@update = 'update.rb'
+
+@options['apply_plugin'] = true
+
+@options['sp.path'] = [
+	'misc/plugin'
+]
+
+@accesskey_enabled = false    # false なら編集画面でアクセスキーが無効になる
+
+# tDiaryをproxyの内側に設置する場合に設定
+# @options['proxy'] = 'proxy.example.com:8080'
+
+@options['bot'] = [
+	'^BlogLines/',
+	'^blogmap',
+	'MI[CK]AN/',
+	'^NG/',
+	'^samidare',
+	'^TAMATEBAKO/'
+]
+
+@options['sp.selected'] =
+"amazon.rb
+append-css.rb
+calendar2.rb
+category.rb
+comment_mail-smtp.rb
+disp_referrer.rb
+dropdown_calendar.rb
+footnote.rb
+highlight.rb
+image.rb
+jdate.rb
+kw.rb
+makerss.rb
+my-ex.rb
+recent_comment3.rb
+recent_list.rb
+"
+
+@options['dropdown_calendar.label'] = ''
+
+@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$)"
+@options['spamfilter.bad_uri_patts'] = ""
+@options['spamfilter.bad_uri_patts_for_mails'] = false
+@options['spamfilter.debug_file'] = ""
+@options['spamfilter.debug_mode'] = false
+@options['spamfilter.filter_mode'] = true
+@options['spamfilter.max_uris'] = "2"
+@options['spamfilter.resolv_check'] = false
+@options['spamfilter.resolv_check_mode'] = false
+@options['spamlookup.domain.list'] = "bsb.spamlookup.net\r\nsc.surbl.org\r\nrbl.bulkfeeds.jp"
+@options['spamlookup.safe_domain.list'] = "search.yahoo.co.jp\r\nwww.google.com\r\nwww.google.co.jp\r\nsearch.msn.co.jp"
+
+
+@html_title = %Q[【日記のタイトル】(→<a href="#{@update}?conf=default">サイトの情報</a>で変更しましょう)]
+
+@header = <<HEADER
+<%= navi %>
+<h1><%= @html_title %></h1>
+<div class="main">
+HEADER
+
+@footer = <<FOOTER
+</div>
+<div class="sidebar">
+<div style="text-align: center">
+	<%=calendar2%>
+	<%=calendar%>
+</div>
+
+<h3>最近の日記</h3>
+<%= recent_list %>
+
+<h3>最近のツッコミ</h3>
+<%= recent_comment3 %>
+</div>
+FOOTER
+
+@date_format = '%Y年%m月%d日'
+
+@section_anchor = '<span class="sanchor">_</span>'
+@comment_anchor = '<span class="canchor">_</span>'
+
+@latest_limit = 10
+
+@theme = 'green_leaves'
+@theme = 'default'
+
+@show_comment = true
+@comment_limit = 3
+
+@show_referer = true
+@referer_day_only = true
+
+@hour_offset = 0
+
+@show_nyear = true
+
+@no_referer = [
+	'^' + Regexp.quote( base_url ),  # 自分の日記
+	'^http://localhost[:/]',
+	'^http://192\.168\.',
+	'^http://172\.1[6789]',
+	'^http://172\.2[0-9]',
+	'^http://172\.3[01]',
+	'^http://10\.',
+	'^http:/+$',
+	'^http://[^/]+$',
+	'search\\?q=cache:',
+	'^http://cache\.yahoofs\.jp/',
+	'^http://[^\.]+\.alexa\.com/',
+	'^http://www\.hotbot\.com/',
+	'^http://gw\.mobile\.goo\.ne\.jp/',
+	'^http://haro\.jp/rss/',
+	'^https?://(www.)?bloglines.com[/:]',
+	'^http://del\.icio\.us/',
+	'^http://d\.hatena\.ne\.jp/.*/\?of=\d+$',
+	'^http://feedbringer\.net/',
+	'^http://reader\.www\.infoseek\.co\.jp/',
+	'^http://feedpath\.jp/feedreader/',
+	'^http://webryreader\.biglobe\.ne\.jp/',
+	'^http://www\.easythumbs\.com',
+	'^http://www\.shinobi\.jp/',
+	'^http://freerss\.net/',
+	'^http://g\.msn\.com/',
+	'^http://myweb-bookmarks\.com/',
+	'^http://reader\.livedoor\.com/',
+	'^http://wrs\.search\.yahoo\.co\.jp/',
+	'^http://www\.google\.com/reader/',
+	'^http://my\.yahoo\.co\.jp/',
+	'^http://data\.click\.rss\.drecom\.jp/',
+	'^http://i-know\.jp/',
+	'^http://r\.hatena\.ne\.jp/',
+	'^http://reader\.freerss\.net/',
+	'^http://reader\.goo\.ne\.jp/',
+	'^https://enter\.nifty\.com/my/',
+	'/feedshow(cat|cat|all|guide)?\.php',
+]
+
+@no_referer2 = [
+	'(sex|pussy|porn|xxx|rape|nudity|x-pictures|x-stories|pics--movies|teen|shemale|scat|pissing|pantyhose|mature|incest|hentai|bdsm|taboo|bestiality|violence|tits|cocks|peeing|anal|lesbian|shaved|www89.com|casino|poker|gambl|diet|discount|holdem|texas|viagra|betting|insurance|pharmac|phentermin|mortgage|loan|credit-card|hotel|credit|debt|get-sport|available-sport|sport-2u|-doctor|feelor\.com|adoptingcenter|domainthriftstore|payday|rrso|novacspacetravel|pills|radcraft\.com|partyshopcentral|beach-views|alcdrugprogdesign|slot|roulette|craps-table|wsop|ahdb\.com|aahbears\.com|brynmawr|umbc|\.fed\.us|book.?make|searchmee|kasino|tinyurl|wapurl|bimba|polls|fleetairarmarchive|kwiz|viewpoints|\.edu/|adipex|cheap|blackjack|expedia|zwitech|online[a-z]+\.com/|ezboard|ordercialis|financ|craps|baccar|keno|healthcare|portal_member|car.*\.com/$|insure|tropin|pgpgk|humangrowthhormone|hgh-igf|pharma|pill|organic|doctor\.|\.doctor|weight\.|\.weight|\.generic|generic\.|omaha|rxed|cardstud|erection|assuranc|ringtone)',
+]
+
+@only_volatile = [
+]
+
+@only_volatile2 = [
+	'^http://(www|images|translate)\.google\.[^/]+/',
+	'^http://([a-z]+\.)?(search|google|websearch|srd)\.yahoo\.[^/]+/',
+	'^http://(\w+\.)?search\.msn\.[^/]+/',
+	'^http://g\.msn\.com/',
+	'^http://([^\.]+\.)?goo\.ne\.jp/',
+	'^http://(www\.)?infoseek\.[^/]+/[OI]?Titles',
+	'^http://search\.fresheye\.com/',
+	'^http://[^\.]+\.excite\.[^/]+/search',
+	'^http://ask\.jp/',
+	'^http://www\.tocc\.co\.jp/search/',
+	'^http://[^\.]*\.lycos\.[a-z\.]+/',
+	'\.search\.biglobe\.ne\.jp/',
+	'^https?://(search|enter)\.nifty\.com/',
+	'^http://search\.jp\.aol\.com/',
+	'^http://www\.looksmart\.com/',
+	'^http://[^.]*\.naver\.co\.jp/',
+	'^http://allabout\.co\.jp/.*?/extsearch',
+	'^http://www\.isao\.net/search/',
+	'^http://(search-intl|search)\.netscape\.com/',
+	'^http://www\.wisenut\.com/',
+	'^http://www\.search\.com/',
+	'^http://(www|labs)\.ceek\.jp/',
+	'^http://seek\.3721\.com/',
+	'^http://search\.jword\.jp/',
+	'^http://www\.alltheweb\.com/',
+	'searchscout\.com/',
+	'^http://(sf|search)\.livedoor\.com/',
+	'^http://www\.myblog\.jp/',
+	'^http://mixi\.jp/',
+	'^http://aolsearch\.jp\.aol\.com/',
+	'^http://cgi\.search\.biglobe\.ne\.jp/cgi-bin/search2-b',
+	'^http://excite\.co\.jp/search',
+	'^http://so-net\.search\.goo\.ne\.jp/',
+	'^http://www.altavista.com',
+	'^http://1470\.net/mm/',
+	'^http://www\.rojo\.com/',
+	'^http://[br]\.hatena\.ne\.jp/',
+	'^http://r\.zeromemory\.info/',
+	'^http://newsing\.jp/',
+	'^http://clip\.nifty\.com/',
+	'^http://www\.flog\.jp/',
+	'^http://www\.technorati\.jp/',
+	'^http://netnavigate\.net/',
+	'^http://www\.netvibes\.com/',
+]
+
+@referer_table = [
+	['^(.{50}).*$', '\1...'],
+]
+
+@referer_table2 = [
+	['^http://www\.tdiary\.net/.*', 'tDiary.Net'],
+	['^http://sho\.tdiary\.net/(\d{4})(\d\d)(\d\d)\.html', 'ただのにっき(\1-\2-\3)'],
+	['^http://sho\.tdiary\.net/(\d{4})(\d\d)\.html', 'ただのにっき(\1-\2)'],
+	['^http://([^\.]*)\.tdiary\.net/(\d{4})(\d\d)(\d\d)\.html', 'tDiary.Net[\1](\2-\3-\4)'],
+	['^http://([^\.]*)\.tdiary\.net/(\d{4})(\d\d)\.html', 'tDiary.Net[\1](\2-\3)'],
+	['^http://([^\.]*)\.tdiary\.net/.*', 'tDiary.Net[\1]'],
+]
+
+@secure = false
+
+#
+# この下の行を削除してはいけません
+#
+load_cgi_conf