RubyGems - tdiary-contrib - Versions diffs - 4.0.2.1 → 4.0.3 - Mend

tdiary-contrib 4.0.2.1 → 4.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

checksums.yaml +4 -4
data/Gemfile +1 -1
data/Gemfile.lock +16 -12
data/lib/extensions/contrib.rb +16 -0
data/lib/tdiary-contrib.rb +2 -12
data/lib/tdiary/contrib/version.rb +2 -2
data/plugin/coderay.rb +74 -0
data/plugin/image_ex.rb +15 -17
data/plugin/makerss_category.rb +2 -2
data/plugin/makerss_comment.rb +2 -2
data/plugin/nhk_program_info.rb +104 -0
data/plugin/profile.rb +4 -19
data/plugin/search-bing.rb +10 -6
data/spec/apple_webclip_spec.rb +3 -3
data/spec/gist_spec.rb +1 -1
data/spec/github_link_spec.rb +4 -4
data/spec/google_analytics_spec.rb +3 -3
data/spec/jdate_spec.rb +1 -1
data/spec/jmonth_spec.rb +1 -1
data/spec/jyear_spec.rb +1 -1
data/spec/my_hotentry_spec.rb +8 -8
data/spec/openid_spec.rb +34 -34
data/spec/opensearch_ad_spec.rb +5 -5
data/spec/profile_spec.rb +15 -15
data/spec/title_anchor_spec.rb +4 -4
data/spec/twitter_js_spec.rb +8 -8
data/spec/youtube_spec.rb +1 -1
data/tdiary-contrib.gemspec +1 -2
data/util/image-gallery/misc/plugin/recent_image.rb +2 -2
metadata +8 -9
data/plugin/search-default.rb +0 -269
data/util/tdiarysearch/README.en +0 -53
data/util/tdiarysearch/README.ja +0 -99
data/util/tdiarysearch/search.rb +0 -504

data/util/tdiarysearch/README.en DELETED Viewed

@@ -1,53 +0,0 @@
-### This tool is obsolete,
-### use alternative plugin: plugin/search-default.rb.
-### This tool will be deleted in the near future.
-tdiarysearch README
-===================
-This is tdiarysearch, simple tDiary search interface.
-Installation and setup
-----------------------
-  1. Copy search.rb aside of tDiary's index.rb.
-    $ ls
-    index.rb*
-    search.rb*
-    tdiary.conf
-    update.rb*
-  2. Make search.rb executable.
-    $ chmod a+x search.rb
-  3. (Optional) Adjust shebang (#!) line of search.rb.
-  4. (Optional) If you'd like, edit embedded paramter in
-     search.rb and turn on query logging.
-  5. Add following HTML form in your tDiary header:
-    <form method="post" action="search.rb" class="searchform">
-    <input type="text" name="q" size="20" value="">
-    <input type="submit" value="Search">
-    </form>
-  6. Done.
-License
--------
-  GNU GPL, General Public License version 2.
-Contact
--------
-  Minero Aoki <aamine@loveruby.net>
-  http://i.loveruby.net/en/

data/util/tdiarysearch/README.ja DELETED Viewed

@@ -1,99 +0,0 @@
-■■このツールは最新のtDiaryに追従していません。
-■■検索機能はプラグインとして実装されるようになったため、
-■■同等の機能はplugin/search-default.rbで実現しています。
-■■このツールは近々削除する予定です。
-tdiarysearch README
-===================
-  tDiary簡単検索CGIです。
-  あらかじめインデックスを作る必要がないので、
-  一般的な検索エンジンに比べてインストールが
-  圧倒的に簡単です。また、書いた直後の日記も
-  検索対象になるという長所があります。
-必要環境
---------
-  * テキスト形式のデータベースを使っていること (tDiary 1.5 以降)
-  * tDiary が動いているサーバに独自の CGI を追加する権限があること
-セットアップ
-------------
-  1. search.rb を tDiary の index.rb の隣にコピーします。
-     必要なら index.rb と同じようにシンボリックリンクを
-     張ったり名前を変えたりしてください。
-  2. CGI として実行可能にします。
-     $ chmod a+x search.rb
-  3. 必要なら #! のパスを合わせます。
-  4. (オプション) search.rb 先頭のパラメータを変更して
-     クエリーログを有効にしてください。
-     ※ クエリーログの詳細については後述
-  5. 自分の tDiary の好きな場所 (例えばヘッダ) に以下の
-     フォームを加えてください。
-  <form method="post" action="search.rb" class="searchform">
-  <input type="text" name="q" size="20" value="">
-  <input type="submit" value="Search">
-  </form>
-  以上です。
-検索のしかた
-------------
-  tdiarysearch はトピックごとに AND 検索を行います。
-  指定した語は空白で分割され、全単語がトピック内のテキストに
-  全て含まれる場合にそのトピックを検索結果にリストします。
-  AND 以外の演算はサポートしません。
-  また rev 1.8 の段階ではまだツッコミが検索できません。
-  近いうちに追加します。
-クエリーログ
-------------
-  クエリーログ (query log) というのは、検索語のログの
-  ことです。このログが存在すると他の人が何を検索したのか
-  見られるようになります。クエリーログを有効にするには、
-  search.rb 内の定数 LOGGING を true にしてください。
-  CGI からログを見られるようにするには、search.rb に
-  パラメータ history=on を付けて呼びます。例えば
-  次のリンクを日記に入れておくと、リンクをたどるだけで
-  日記から最近の検索ログが見られます。
-    <a href="search.rb?history=on">[検索ログ]</a>
-  なお、クエリーログは tDiary のデータディレクトリに search.log
-  という名前で作成されます。特にローテーション処理はしていないので、
-  適当な間隔でローテートしてください。
-連絡先
-------
-  青木峰郎 (あおき・みねろう)
-  Minero Aoki <aamine@loveruby.net>
-  http://i.loveruby.net/w/tdiarysearch.html
-  バグ報告は以下のどこかにお願いします。
-    * Wiki 上のバグ報告ページ
-      http://i.loveruby.net/w/tdiarysearchBugs.html
-    * tdiary-devel ML
-    * 直接メール

data/util/tdiarysearch/search.rb DELETED Viewed

@@ -1,504 +0,0 @@
-#!/usr/bin/env ruby
-#
-# tdiarysearch
-#
-# Copyright (C) 2003-2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU GPL, General Public License version 2.
-#
-# $originalId: search.rb,v 1.14 2005/07/27 07:16:07 aamine Exp $
-#
-# Project home page: http://i.loveruby.net/w/tdiarysearch.html
-#
-#
-# Static Configurations
-#
-LOGGING = false
-LOGFILE_NAME = 'search.log'
-DEBUG = $DEBUG
-#
-# HTML Templates
-#
-def unindent(str)
-  str.gsub(/^#{str[/\A(?:\t+| +)/]}/, '')
-end
-HEADER = unindent <<'EOS'
-  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-  <html lang="ja">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=<%= TDIARY_ENCODING %>">
-    <meta http-equiv="Content-Language" content="ja">
-    <meta name="robots" content="noindex">
-    <link rel="stylesheet" href="theme/base.css" type="text/css" media="all">
-    <link rel="stylesheet" href="theme/<%= theme %>/<%= theme %>.css" title="<%= theme %>" type="text/css" media="all">
-    <title>tDiary Search</title>
-  </head>
-  <body>
-  <div class="whole-content">
-EOS
-FOOTER = unindent <<'EOS'
-  </div>
-  </body>
-  </html>
-EOS
-SEARCH_FORM = unindent <<"EOS"
-  <form method="post" action="#{File.basename(__FILE__)}">
-  <input type="text" name="q" size="20" value="<%= patterns.map {|re| escape(re.source) }.join(' ') %>">
-  <input type="submit" value="Search">
-  <%
-      if theme
-  %><input type="hidden" name="theme" value="on"><%
-      end
-  %>
-  </form>
-EOS
-SEARCH_PAGE = unindent <<"EOS"
-  <h1>tDiary Search</h1>
-  #{SEARCH_FORM}
-EOS
-TOO_MANY_HITS = 50
-SEARCH_RESULT = unindent <<"EOS"
-  <h1>tDiary Search: Search Result</h1>
-  #{SEARCH_FORM}
-  <%
-      nhits = 0
-      toomanyhits = false
-      match_components(patterns) {|diary, fragment, component|
-        nhits += 1
-        if nhits > TOO_MANY_HITS
-          toomanyhits = true
-          break
-        end
-  %>
-  <div class="day">
-  <h2><a href="<%= url(diary, fragment) %>"><%= diary.y_m_d %></a></h2>
-  <div class="body">
-  <div class="section">
-  <p><%= short_html(component) %></p>
-  </div>
-  </div>
-  </div><%
-      }
-  %>
-  <p><%= toomanyhits ? 'too many hits.' : nhits.to_s+' hits.' %></p>
-  #{SEARCH_FORM}
-EOS
-SEARCH_ERROR = unindent <<"EOS"
-  #{SEARCH_FORM}
-  <%= escape(reason) %>.
-EOS
-HISTORY = unindent <<"EOS"
-  <h1>tDiary Search: Search History</h1>
-  #{SEARCH_FORM}
-  <ul>
-  <%
-      recent_queries.sort_by {|t,q| -t.to_i }.each do |time, query|
-  %><li><%= time.strftime('%Y-%m-%d %H:%M:%S') %> | <a href="#{File.basename(__FILE__)}?q=<%= escape_url(query) %>"><%= escape(query) %></a></li>
-  <%
-      end
-  %></ul>
-  #{SEARCH_FORM}
-EOS
-#
-# Main
-#
-if File.symlink?(__FILE__)
-  tdiarylib = File.dirname(File.readlink(__FILE__))
-else
-  tdiarylib = File.dirname(__FILE__)
-end
-$:.unshift tdiarylib
-require 'tdiary'
-require 'tdiary/io/default'
-require 'erb'
-TDIARY_ENCODING = (TDIARY_VERSION >= '2.3.0') ? 'utf-8' : 'euc-jp'
-class WrongQuery < StandardError; end
-Z_SPACE = "\241\241"   # zen-kaku space
-BEGIN { $stdout.binmode }
-def main
-  $KCODE = TDIARY_ENCODING
-  cgi = CGI.new
-  @config = TDiary::Config.new(cgi)
-  @config.options['apply_plugin'] = true
-  html = '<html><head><title></title></head><body><p>error</p></body></html>'
-  begin
-    html = generate_page(cgi)
-  ensure
-    send_html cgi, html
-  end
-  exit 0
-end
-def generate_page(cgi)
-  query = nil
-  begin
-    theme = @config.theme
-    if LOGGING and File.file?(query_log()) and cgi.valid?('history')
-      return history_page(theme)
-    end
-    begin
-      return search_form_page(theme) unless cgi.valid?('q')
-      initialize_tdiary_plugins cgi
-      query = @config.to_native([cgi.params['q']].flatten.compact.join(' '))
-      patterns = setup_patterns(query)
-      html = search_result_page(theme, patterns)
-      save_query(query, query_log()) if LOGGING
-      return html
-    rescue WrongQuery => err
-      return search_error_page(theme, (patterns || []), err.message)
-    end
-  rescue Exception => err
-    html = ''
-    html << HEADER
-    html << "<pre>\n"
-    html << 'q=' << escape(query) << "\n" if query
-    html << escape(err.class.name) << "\n" if DEBUG
-    html << escape(err.message) << "\n"
-    html << err.backtrace.map {|i| escape(i) }.join("\n") if DEBUG
-    html << "</pre>\n"
-    html << FOOTER
-    return html
-  end
-end
-def send_html(cgi, html)
-  print cgi.header('status' => '200 OK',
-                   'type' => 'text/html',
-                   'charset' => TDIARY_ENCODING,
-                   'Content-Length' => html.length.to_s,
-                   'Cache-Control' => 'no-cache',
-                   'Pragma' => 'no-cache')
-  print html unless cgi.request_method == 'HEAD'
-end
-def setup_patterns(query)
-  patterns = split_string(query).map {|pat|
-    check_pattern pat
-    Regexp.new( Regexp.quote(pat), Regexp::IGNORECASE, TDIARY_ENCODING )
-  }
-  raise WrongQuery, 'no pattern' if patterns.empty?
-  raise WrongQuery, 'too many sub patterns' if patterns.length > 8
-  patterns
-end
-def check_pattern(pat)
-  raise WrongQuery, 'no pattern' unless pat
-  raise WrongQuery, 'empty pattern' if pat.empty?
-  raise WrongQuery, "pattern too short: #{pat}" if pat.length < 2
-  raise WrongQuery, 'pattern too long' if pat.length > 128
-end
-def split_string(str)
-  str.split(/[\s#{Z_SPACE}]+/ou).reject {|w| w.empty? }
-end
-def save_query(query, file)
-  File.open(file, 'a') {|f|
-    begin
-      f.flock(File::LOCK_EX)
-      f.puts "#{Time.now.to_i}: #{query.dump}"
-    ensure
-      f.flock(File::LOCK_UN)
-    end
-  }
-end
-#
-# eRuby Dispatchers and Helper Routines
-#
-def search_form_page(theme)
-  patterns = []
-  ERB.new(HEADER + SEARCH_FORM + FOOTER).result(binding())
-end
-def search_result_page(theme, patterns)
-  ERB.new(HEADER + SEARCH_RESULT + FOOTER).result(binding())
-end
-def search_error_page(theme, patterns, reason)
-  ERB.new(HEADER + SEARCH_ERROR + FOOTER).result(binding())
-end
-def history_page(theme)
-  patterns = []
-  ERB.new(HEADER + HISTORY + FOOTER).result(binding())
-end
-def query_log
-  "#{@config.data_path}#{LOGFILE_NAME}"
-end
-N_SHOW_QUERY_MAX = 20
-def recent_queries
-  return unless File.file?(query_log())
-  File.readlines(query_log()).reverse[0, N_SHOW_QUERY_MAX].map {|line|
-    time, q = *line.split(/:/, 2)
-    [Time.at(time.to_i), eval(q)]
-  }
-end
-INF = 1 / 0.0
-def match_components(patterns)
-  foreach_diary_from_latest do |diary|
-    next unless diary.visible?
-    num = 1
-    diary.each_section do |sec|
-      if patterns.all? {|re| re =~ sec.to_src }
-        yield diary, fragment('p', num), sec
-      end
-      num += 1
-    end
-    diary.each_visible_comment(INF) do |cmt, num|
-      if patterns.all? {|re| re =~ cmt.body }
-        yield diary, fragment('c', num), cmt
-      end
-    end
-  end
-end
-def fragment(type, num)
-  sprintf('%s%02d', type, num)
-end
-#
-# tDiary Implementation Dependent
-#
-def foreach_diary_from_latest(&block)
-  foreach_data_file(@config.data_path.sub(%r</+\z>, '')) do |path|
-    read_diaries(path).sort_by {|diary| diary.date }.reverse_each(&block)
-  end
-end
-def foreach_data_file(data_path, &block)
-  Dir.glob("#{data_path}/[0-9]*/*.td2").sort.reverse_each do |path|
-    yield path.untaint
-  end
-end
-def read_diaries(path)
-  d = nil
-  diaries = {}
-  load_tdiary_textdb(path) do |header, body|
-    d = diary_class(header['Format']).new(header['Date'], '', body)
-    d.show(header['Visible'] != 'false')
-    diaries[d.ymd] = d
-  end
-  (Years[d.y] ||= []).push(d.m) if d
-  load_comments diaries, path
-  diaries.values
-end
-DIARY_CLASS_CACHE = {}
-def diary_class(style)
-  c = DIARY_CLASS_CACHE[style]
-  return c if c
-  require "tdiary/style/#{style.downcase}_style.rb"
-  c = eval("TDiary::#{style.capitalize}Diary")
-  c.__send__(:include, DiaryClassDelta)
-  DIARY_CLASS_CACHE[style] = c
-  c
-end
-module DiaryClassDelta
-  def ymd
-    date().strftime('%Y%m%d')
-  end
-  def y_m_d
-    date().strftime('%Y-%m-%d')
-  end
-  def y
-    '%04d' % date().year
-  end
-  def m
-    '%02d' % date().month
-  end
-end
-def load_comments(diaries, path)
-  cmtfile = path.sub(/2\z/, 'c')
-  return unless File.file?(cmtfile)
-  load_tdiary_textdb(cmtfile) do |header, body|
-    c = TDiary::Comment.new(header['Name'], header['Mail'], body,
-                            Time.at(header['Last-Modified'].to_i))
-    c.show = (header['Visible'] != 'false')
-    d = diaries[header['Date']]
-    d.add_comment c if d
-  end
-end
-def load_tdiary_textdb(path)
-  File.open(path) {|f|
-    ver = f.gets.strip
-    raise "unkwnown format: #{ver}" unless ver == 'TDIARY2.00.00' or ver == 'TDIARY2.01.00'
-    f.each('') do |header|
-      h = {}
-      header.untaint.strip.each do |line|
-        n, v = *line.split(':', 2)
-        h[n.strip] = v.strip
-      end
-      yield h, f.gets("\n.\n").chomp(".\n").untaint
-    end
-  }
-end
-def short_html(component)
-  # Section classes do not have common superclass, we can't use class here.
-  case component.class.name
-  when /Section/
-    section = component
-    if section.subtitle
-      sprintf('%s<br>%s',
-              tdiary2text(section.subtitle_to_html),
-              tdiary2text(section.body_to_html))
-    else
-      tdiary2text(section.body_to_html)
-    end
-  when /Comment/
-    cmt = component
-    shorten(escape((cmt.name + ': ' + cmt.body)))
-  else
-    raise "must not happen: #{component.class}"
-  end
-end
-def tdiary2text(html)
-  re = Regexp.new('<[^>]*>', Regexp::EXTENDED, TDIARY_ENCODING)
-  shorten(apply_tdiary_plugins(html).gsub(re, ''))
-end
-Years = {}
-TDiary::Plugin.__send__(:public, :apply_plugin)
-def apply_tdiary_plugins(html)
-  @plugin.apply_plugin(html, false)
-end
-@plugin = nil
-def initialize_tdiary_plugins(cgi)
-  @plugin = TDiary::Plugin.new('conf' => @config,
-                               'secure' => false,
-                               'diaries' => {},
-                               'cgi' => cgi,
-                               'index' => @config.index,
-                               'years' => Years,
-                               'cache_path' => @config.cache_path ||
-                                               @config.data_path)
-end
-#
-# Utils
-#
-HTML_ESCAPE_TABLE = {
-  '&' => '&amp;',
-  '<' => '&lt;',
-  '>' => '&gt;',
-  '"' => '&quot;'
-}
-def escape(str)
-  tbl = HTML_ESCAPE_TABLE
-  str.gsub(/[&"<>]/) {|ch| tbl[ch] }
-end
-def escape_url(u)
-  escape(urlencode(u))
-end
-def urlencode(str)
-  str.gsub(/[^\w-]/n) {|ch| sprintf('%%%02x', ch[0]) }
-end
-def shorten(str)
-  re = Regexp.new('\A.{0,120}', Regexp::MULTILINE, TDIARY_ENCODING)
-  str.slice(re)
-end
-def url(diary, fragment)
-  if ( html_anchor_enabled? )
-    "#{@config.index}#{diary.ymd}.html\##{fragment}"
-  else
-    "#{@config.index}?date=#{diary.ymd}\##{fragment}"
-  end
-end
-def html_anchor_enabled?
-  if ( @html_anchor.nil? )
-    @html_anchor = @config.options2['sp.selected'].include?( 'html_anchor.rb' )
-  end
-  return @html_anchor
-end
-#
-# Old Ruby Compatibility
-#
-if RUBY_VERSION < '1.8.0'
-  class String
-    remove_method :slice
-    def slice(re, n = 0)
-      m = re.match(self) or return nil
-      m[n]
-    end
-  end
-end
-unless Array.method_defined?(:all?)
-  module Enumerable
-    def all?
-      each do |i|
-        return false unless yield(i)
-      end
-      true
-    end
-  end
-end
-unless Array.method_defined?(:sort_by)
-  module Enumerable
-    def sort_by
-      map {|i| [yield(i), i] }.sort.map {|val, i| i }
-    end
-  end
-end
-unless MatchData.method_defined?(:captures)
-  class MatchData
-    def captures
-      to_a()[1..-1]
-    end
-  end
-end
-main