tdiary 4.0.1.20130929 → 4.0.1.20131102

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary
 version: !ruby/object:Gem::Version
-  version: 4.0.1.20130929
+  version: 4.0.1.20131102
 platform: ruby
 authors:
 - TADA Tadashi
@@ -10,34 +10,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 description: tDiary is so called Weblog.
@@ -48,9 +48,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
 - Gemfile.lock
@@ -325,7 +325,6 @@ files:
 - spec/fixtures/sample.rb
 - spec/fixtures/tdiary.conf.gem
 - spec/fixtures/tdiary.conf.rack
-- spec/fixtures/tdiary.conf.rdb
 - spec/fixtures/tdiary.conf.secure
 - spec/fixtures/tdiary.conf.webrick
 - spec/javascripts/00default_spec.js
@@ -347,6 +346,7 @@ files:
 - tdiary/application/extensions/omniauth.rb
 - tdiary/author_only_base.rb
 - tdiary/base.rb
+- tdiary/cache/file.rb
 - tdiary/cli.rb
 - tdiary/comment.rb
 - tdiary/comment_manager.rb
@@ -361,12 +361,8 @@ files:
 - tdiary/filter/default.rb
 - tdiary/filter/spam.rb
 - tdiary/io/base.rb
-- tdiary/io/cache/file.rb
-- tdiary/io/cache/memcached.rb
-- tdiary/io/cache/redis.rb
 - tdiary/io/default.rb
 - tdiary/io/pstore.rb
-- tdiary/io/rdb.rb
 - tdiary/lang/en.rb
 - tdiary/lang/ja.rb
 - tdiary/plugin.rb
@@ -427,20 +423,20 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- .
+- "."
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: a TSUKKOMI-able Web-log
@@ -481,7 +477,6 @@ test_files:
 - spec/fixtures/sample.rb
 - spec/fixtures/tdiary.conf.gem
 - spec/fixtures/tdiary.conf.rack
-- spec/fixtures/tdiary.conf.rdb
 - spec/fixtures/tdiary.conf.secure
 - spec/fixtures/tdiary.conf.webrick
 - spec/javascripts/00default_spec.js

data/spec/fixtures/tdiary.conf.rdb

@@ -1,227 +0,0 @@
-# -*- coding: utf-8 -*-
-
-@data_path = File.expand_path("../tmp/data", __FILE__)
-@cache_path = "#{@data_path}/cache"
-@database_url = 'sqlite://tmp/tdiary_test.db'
-@user_name = 'test'
-
-require 'tdiary/io/cache/memcached'
-require 'tdiary/io/rdb'
-@io_class = TDiary::RdbIO
-
-@style = 'Wiki'
-
-@index = './'
-@update = 'update.rb'
-
-@options['apply_plugin'] = true
-@options['sp.path'] = [
-	'misc/plugin'
-]
-@options['style.path'] = [
-  'misc/style/gfm',
-  'tdiary/style'
-]
-
-@accesskey_enabled = false
-@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['makerss.file'] = 'public/index.rdf'
-@options['makerss.no_comments.file'] = 'public/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'] = ""
-@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><%= @conf.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 = 'default'
-
-@show_comment = true
-@comment_limit = 3
-
-@show_referer = true
-@referer_day_only = true
-
-@hour_offset = 0
-
-@show_nyear = true
-
-@no_referer = [
-	# Capybara の 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

data/tdiary/io/cache/memcached.rb

@@ -1,88 +0,0 @@
-require 'dalli'
-
-module TDiary
-	module CacheIO
-		def restore_cache(prefix)
-			if key = cache_key(prefix)
-				restore_data(key)
-			end
-		end
-
-		def store_cache(cache, prefix)
-			if key = cache_key(prefix)
-				store_data(cache, key)
-			end
-		end
-
-		def clear_cache(target = :all)
-			if target == :all
-				delete_data(:all)
-			else
-				ym = target.to_s.scan(/\d{4}\d{2}/)[0]
-				['latest.rb', 'i.latest.rb', "#{ym}.rb", "i.#{ym}.rb"].each do |key|
-					delete_data(key)
-				end
-			end
-		end
-
-		private
-
-		def restore_data(key)
-			memcache.get(key)
-		end
-
-		def store_data(data, key)
-			memcache.set(key, data)
-		end
-
-		def delete_data(key)
-			if key == :all
-				memcache.flush
-			else
-				memcache.delete(key)
-			end
-		end
-
-		def restore_parser_cache(date, key = nil)
-			restore_data(date.strftime("%Y%m.parser"))
-		end
-
-		def store_parser_cache(date, obj, key = nil)
-			store_data(obj, date.strftime("%Y%m.parser"))
-		end
-
-		def clear_parser_cache(*args)
-			delete_data(:all)
-		end
-
-		def cache_key(prefix)
-			if @tdiary.is_a?(TDiaryMonth)
-				"#{prefix}#{@tdiary.rhtml.sub( /month/, @tdiary.date.strftime( '%Y%m' ) ).sub( /\.rhtml$/, '.rb' )}"
-			elsif @tdiary.is_a?(TDiaryLatest)
-				if @tdiary.cgi.params['date'][0]
-					nil
-				else
-					"#{prefix}#{@tdiary.rhtml.sub( /\.rhtml$/, '.rb' )}"
-				end
-			else
-				nil
-			end
-		end
-
-		def memcache
-			options = {}
-			if @tdiary.conf.user_name
-				options.merge!({:namespace => @tdiary.conf.user_name})
-			end
-			@_client ||= Dalli::Client.new(nil, options)
-		end
-	end
-end
-
-# Local Variables:
-# mode: ruby
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# End:
-# vim: ts=3

data/tdiary/io/cache/redis.rb

@@ -1,100 +0,0 @@
-require 'redis'
-require 'redis-namespace'
-require 'yaml'
-
-module TDiary
-	module CacheIO
-		def restore_cache(prefix)
-			if key = cache_key(prefix)
-				restore_data(key)
-			end
-		end
-
-		def store_cache(cache, prefix)
-			if key = cache_key(prefix)
-				store_data(cache, key)
-			end
-		end
-
-		def clear_cache(target = :all)
-			if target == :all
-				delete_data(:all)
-			else
-				ym = target.to_s.scan(/\d{4}\d{2}/)[0]
-				['latest.rb', 'i.latest.rb', "#{ym}.rb", "i.#{ym}.rb"].each do |key|
-					delete_data(key)
-				end
-			end
-		end
-
-		private
-
-		def restore_data(key)
-			obj = redis.get(key)
-			if obj.nil?
-				nil
-			else
-				YAML.load(obj)
-			end
-		end
-
-		def store_data(data, key)
-			redis.set(key, YAML.dump(data))
-		end
-
-		def delete_data(key)
-			if key == :all
-				redis.flushdb
-			else
-				redis.del(key)
-			end
-		end
-
-		def restore_parser_cache(date, key = nil)
-			obj = redis.get(date.strftime("%Y%m.parser"))
-			if obj.nil?
-				nil
-			else
-				YAML.load(obj)
-			end
-		end
-
-		def store_parser_cache(date, obj, key = nil)
-			redis.set(date.strftime("%Y%m.parser"), YAML.dump(obj))
-		end
-
-		def clear_parser_cache(date)
-			redis.flushdb
-		end
-
-		def cache_key(prefix)
-			if @tdiary.is_a?(TDiaryMonth)
-				"#{prefix}#{@tdiary.rhtml.sub( /month/, @tdiary.date.strftime( '%Y%m' ) ).sub( /\.rhtml$/, '.rb' )}"
-			elsif @tdiary.is_a?(TDiaryLatest)
-				if @tdiary.cgi.params['date'][0]
-					nil
-				else
-					"#{prefix}#{@tdiary.rhtml.sub( /\.rhtml$/, '.rb' )}"
-				end
-			else
-				nil
-			end
-		end
-
-		def redis
-			@_client ||= if @tdiary.conf.user_name
-								 Redis::Namespace.new(@tdiary.conf.user_name.to_sym, Redis.new)
-							 else
-								 Redis.new
-							 end
-		end
-	end
-end
-
-# Local Variables:
-# mode: ruby
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# End:
-# vim: ts=3