tdiary-contrib 4.0.2.1 → 4.0.3

data/spec/title_anchor_spec.rb

@@ -15,9 +15,9 @@ describe "title_anchor plugin" do
 			@plugin = setup_title_anchor_plugin('day')
 		end
 
-		it { @plugin.title_anchor.should  == expected_html_title_in_day(
+		it { expect(@plugin.title_anchor).to  eq(expected_html_title_in_day(
 				:index => '',
-				:html_title => 'HsbtDiary')}
+				:html_title => 'HsbtDiary'))}
 	end
 
 	describe "in latest mode" do
@@ -25,8 +25,8 @@ describe "title_anchor plugin" do
 			@plugin = setup_title_anchor_plugin('latest')
 		end
 
-		it { @plugin.title_anchor.should  == expected_html_title_in_latest(
-				:html_title => 'HsbtDiary')}
+		it { expect(@plugin.title_anchor).to  eq(expected_html_title_in_latest(
+				:html_title => 'HsbtDiary'))}
 	end
 
 	def expected_html_title_in_day(options)

data/spec/twitter_js_spec.rb

@@ -18,12 +18,12 @@ describe "twitter_js plugin" do
 
 		it "for header" do
 			snippet = @plugin.header_proc
-			snippet.should == expected_html_header_snippet("123456789")
+			expect(snippet).to eq(expected_html_header_snippet("123456789"))
 		end
 
 		it "for body leave" do
 			snippet = @plugin.body_leave_proc(Time.parse("20080124"))
-			snippet.should == expected_html_body_snippet
+			expect(snippet).to eq(expected_html_body_snippet)
 		end
 	end
 
@@ -34,12 +34,12 @@ describe "twitter_js plugin" do
 
 		it "for header" do
 			snippet = @plugin.header_proc
-			snippet.should == expected_html_header_snippet("123456789")
+			expect(snippet).to eq(expected_html_header_snippet("123456789"))
 		end
 
 		it "for body leave" do
 			snippet = @plugin.body_leave_proc(Time.parse("20080124"))
-			snippet.should == expected_html_body_snippet
+			expect(snippet).to eq(expected_html_body_snippet)
 		end
 	end
 
@@ -50,12 +50,12 @@ describe "twitter_js plugin" do
 
 		it "for header" do
 			snippet = @plugin.header_proc
-			snippet.should be_empty
+			expect(snippet).to be_empty
 		end
 
 		it "for body leave" do
 			snippet = @plugin.body_leave_proc(Time.parse("20080124"))
-			snippet.should be_empty
+			expect(snippet).to be_empty
 		end
 	end
 
@@ -66,12 +66,12 @@ describe "twitter_js plugin" do
 
 		it "for header" do
 			snippet = @plugin.header_proc
-			snippet.should be_empty
+			expect(snippet).to be_empty
 		end
 
 		it "for body leave" do
 			snippet = @plugin.body_leave_proc(Time.parse("20080124"))
-			snippet.should be_empty
+			expect(snippet).to be_empty
 		end
 	end
 

data/spec/youtube_spec.rb

@@ -14,7 +14,7 @@ describe "youtube plugin" do
       cgi = CGIFake.new
       cgi.user_agent = k
       plugin.conf.cgi = cgi
-      plugin.youtube(DUMMY_YOUTUBE_VIDEO_ID).should == v
+      expect(plugin.youtube(DUMMY_YOUTUBE_VIDEO_ID)).to eq(v)
     end
   end
 end

data/tdiary-contrib.gemspec

@@ -2,7 +2,6 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tdiary/contrib/version'
-require 'tdiary/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "tdiary-contrib"
@@ -19,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'tdiary', ">= #{TDiary::VERSION}"
+  spec.add_dependency 'tdiary'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/util/image-gallery/misc/plugin/recent_image.rb

@@ -1,4 +1,4 @@
-# recent_image.rb  $Revision: 2.0.3 $
+# recent_image.rb  $Revision: 2.0.4 $
 #
 # Copyright (c) 2005-2013 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
 # You can redistribute it and/or modify it under GPL2.
@@ -184,7 +184,7 @@ def make_image_hash_rcimg
   @years.keys.sort.reverse_each do |year|
     @years[year].sort.reverse_each do |month|
       cgi.params['date'] = ["#{year}#{month}"]
-      m = TDiaryMonth::new(cgi, '', @conf)
+      m = TDiaryMonthWithoutFilter::new(cgi, '', @conf)
       m.diaries.keys.sort.reverse_each do |date|
         next unless m.diaries[date].visible?
         m.diaries[date].each_section do |section|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 4.0.2.1
+  version: 4.0.3
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,7 @@ files:
 - lib/bayes.rb
 - lib/bayes/convert.rb
 - lib/exifparser/README
+- lib/extensions/contrib.rb
 - lib/tdiary-contrib.rb
 - lib/tdiary/contrib/version.rb
 - lib/wgs2tky.rb
@@ -187,6 +188,7 @@ files:
 - plugin/category_to_tagcloud.rb
 - plugin/cocomment.rb
 - plugin/code-prettify.rb
+- plugin/coderay.rb
 - plugin/coderwall.rb
 - plugin/datepicker.rb
 - plugin/day2section.rb
@@ -260,6 +262,7 @@ files:
 - plugin/my_hotentry.rb
 - plugin/navi_day.rb
 - plugin/navi_this_month.rb
+- plugin/nhk_program_info.rb
 - plugin/nicovideo.rb
 - plugin/notify_miniblog.rb
 - plugin/ogp.rb
@@ -281,7 +284,6 @@ files:
 - plugin/retweet.rb
 - plugin/rubykaigi.rb
 - plugin/search-bing.rb
-- plugin/search-default.rb
 - plugin/search-google-custom.rb
 - plugin/search-yahoo-websearch.rb
 - plugin/search-yahoo.rb
@@ -431,9 +433,6 @@ files:
 - util/tdiary-vim/ChangeLog
 - util/tdiary-vim/README
 - util/tdiary-vim/tdiary.vim
-- util/tdiarysearch/README.en
-- util/tdiarysearch/README.ja
-- util/tdiarysearch/search.rb
 homepage: http://www.tdiary.org/
 licenses:
 - GPL-2 and/or others
@@ -454,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package

data/plugin/search-default.rb

@@ -1,269 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# search-default.rb - site search plugin sample using DefaultIO.
-#
-# Copyright (C) 2003-2005 Minero Aoki
-# Copyright (C) 2012, TADA Tadashi <t@tdtds.jp>
-# You can redistribute it and/or modify it under GPL2.
-#
-#
-
-def search_title
-	'全文検索'
-end
-
-class WrongQuery < StandardError; end
-
-module DefaultIOSearch
-
-	module_function
-	def setup_patterns(query)
-		patterns = split_string(query).map {|pat|
-			check_pattern pat
-			Regexp.new( Regexp.quote(pat), Regexp::IGNORECASE )
-		}
-		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　]+/ou).reject {|w| w.empty? }
-	end
-
-	INF = 1 / 0.0
-
-	def match_components(patterns, data_path)
-		foreach_diary_from_latest(data_path) 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(data_path, &block)
-		foreach_data_file(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|
-			begin
-				d = diary_class(header['Format']).new(header['Date'], '', body)
-			rescue ArgumentError
-				next
-			end
-			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
-		if TDiary.const_defined?('Style')
-			require "tdiary/style/#{style.downcase}.rb"
-			c = eval("TDiary::Style::#{style.capitalize}Diary")
-		else
-			require "tdiary/style/#{style.downcase}_style.rb"
-			c = eval("TDiary::#{style.capitalize}Diary")
-		end
-		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_line do |line|
-					begin
-						n, v = *line.split(':', 2)
-					rescue ArgumentError
-						next
-					end
-					h[n.strip] = v.strip
-				end
-				body = f.gets("\n.\n").chomp(".\n").untaint
-				yield h, body
-			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)
-		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)
-		html
-	end
-
-	@plugin = nil
-
-	#
-	# Utils
-	#
-	HTML_ESCAPE_TABLE = {
-		'&' => '&amp;',
-		'<' => '&lt;',
-		'>' => '&gt;',
-		'"' => '&quot;'
-	}
-
-	def escape(str)
-		tbl = HTML_ESCAPE_TABLE
-		str.gsub(/[&"<>]/) {|ch| tbl[ch] }
-	end
-
-	def shorten(str, len = 200)
-		matched = str.gsub( /\n/, ' ' ).scan( /^.{0,#{len - 3}}/u )[0]
-		if $'.nil? || $'.empty?
-			matched
-		else
-			matched + '...'
-		end
-	end
-end
-
-def search_input_form( q )
-	r = <<-HTML
-		<form method="GET" action="#{@conf.index}"><div>
-			検索キーワード:
-			<input name="q" value="#{h q}">
-			<input type="submit" value="OK">
-		</div></form>
-	HTML
-end
-
-def search_result
-	unless @conf.io_class == (TDiary.const_defined?('DefaultIO') ? TDiary::DefaultIO : TDiary::IO::Default)
-		return %Q|<p class="message">could not use this plugin under #{@conf.io_class}.</p>| 
-	end
-
-	query = CGI::unescape( @cgi.params['q'][0] )
-	start = CGI::unescape( @cgi.params['start'][0] || '0' ).to_i
-
-	begin
-		patterns = DefaultIOSearch::setup_patterns(query)
-		r = search_input_form( query )
-
-		r << '<dl class="search-result autopagerize_page_element">'
-		count = 0
-		too_many = false
-		DefaultIOSearch::match_components(patterns, @conf.data_path) do |diary, fragment, component|
-			count += 1
-			if count > 50 # TO MANY HITS
-				too_many = true
-				break
-			end
-			href = @conf.index + anchor( "#{diary.ymd}#{fragment}" )
-			r << %Q|<dt><a href="#{href}">#{h diary.y_m_d}</a></dt>|
-			r << %Q|<dd>#{DefaultIOSearch::short_html(component)}</dd>|
-		end
-		r << '</dl>'
-
-		r << '<div class="search-navi">'
-		r << "<p>#{too_many ? 'too many' : count} hits.</p>"
-		r << '</div>'
-
-		r
-	rescue WrongQuery
-		search_input_form( query ) + %Q|<p class="message">#{$!.message}</p>|
-	end
-end