tdiary-contrib 4.2.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b963a36e85ed48eeaf351c67e1daaaa10b798d4
-  data.tar.gz: 2f4633b77caadcaa50960a8e1350680818ba2087
+  metadata.gz: 951b6aa4dbb64c3c27286b17c127134c29294626
+  data.tar.gz: 4ec21935523768181cbbb5f1fd843ba06f648089
 SHA512:
-  metadata.gz: 1755119971bbadaab70bcb37536111a1c89617aae4ef2b6dde6731f5821a8288051c9e1fce2b50671df31381387512c577c969e3f2fa08fc4af5171566435084
-  data.tar.gz: eddddefe6eba29289006b8e19dc5b48fd548d7e4493b03be73048151f01b67dc31071ebd91132b81e097d38df527f75e90e8725f84bd4ccb97b347e9540f82c2
+  metadata.gz: 59961f3c4ac5a76f3f38bfb440661347355afeef28e91ead68e28599f3637bdec99c382ed1d1db34e210d55aba8cafb64dbc68f281883e521281104228c8649f
+  data.tar.gz: b170c62aa74a2dffbb13955dfa9a918827794199942c6c89fd72c3489576750651a378096220c5bac92ffc6b8c1b1fbb808d926a046e95034b043e2cde02967c

data/js/jquery.socialbutton.js

@@ -1,40 +1,40 @@
 /**
  * jquery.socialbutton - jQuery plugin for social networking websites
  * http://itra.jp/jquery_socialbutton_plugin/
- * 
+ *
  * Copyright 2010, Itrans, Inc. http://itra.jp/
- * 
+ *
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
- * 
- * Version: 1.8.1
+ *
+ * Version: 1.9.1
  */
 
 /**
  * SYNOPSIS
- * 
- * 
+ *
+ *
  * mixi_check
  * http://developer.mixi.co.jp/connect/mixi_plugin/mixi_check/spec_mixi_check
- * 
+ *
  * $('#mixi_check').socialbutton('mixi_check', {
  *     key: 'mixi-check-key'
  * });
- * 
+ *
  * $('#mixi_check').socialbutton('mixi_check', {
  *     key: 'mixi-check-key',
  *     button: 'button-1',
  *     url: 'http://itra.jp/'
  * });
- * 
- * 
+ *
+ *
  * mixi_like
  * http://developer.mixi.co.jp/connect/mixi_plugin/favorite_button/spec
- * 
+ *
  * $('#mixi_like').socialbutton('mixi_like', {
  *     key: 'mixi-check-key',
  * });
- * 
+ *
  * $('#mixi_like').socialbutton('mixi_like', {
  *     key: 'mixi-check-key',
  *     url: 'http://itra.jp/',
@@ -43,13 +43,13 @@
  *     show_faces: true,
  *     style: 'additional-style-here'
  * });
- * 
- * 
+ *
+ *
  * facebook_like
  * http://developers.facebook.com/docs/reference/plugins/like
- * 
+ *
  * $('#facebook_like').socialbutton('facebook_like');
- * 
+ *
  * $('#facebook_like').socialbutton('facebook_like', {
  *     button: 'standard', // synonym 'layout'
  *     url: 'http://itra.jp',
@@ -61,25 +61,25 @@
  *     font: 'arial',
  *     colorscheme: 'light'
  * });
- * 
- * 
+ *
+ *
  * facebook_share
  * http://developers.facebook.com/docs/share
- * 
+ *
  * $('#facebook_share').socialbutton('facebook_share');
- * 
+ *
  * $('#facebook_share').socialbutton('facebook_share', {
  *     button: 'button_count', // synonym 'type'
  *     url: 'http://itra.jp',
  *     text: 'Share'
  * });
- * 
- * 
+ *
+ *
  * Twitter
  * http://twitter.com/goodies/tweetbutton
- * 
+ *
  * $('#twitter').socialbutton('twitter');
- * 
+ *
  * $('#twitter').socialbutton('twitter', {
  *     button: 'vertical', // synonym 'count'
  *     url: 'http://itra.jp/',
@@ -88,26 +88,26 @@
  *     via: 'ishiiyoshinori',
  *     related: 'twitter'
  * });
- * 
- * 
+ *
+ *
  * GREE Social Feedback
  * http://developer.gree.co.jp/connect/plugins/sf
- * 
+ *
  * $('#gree_sf').socialbutton('gree_sf');
- * 
+ *
  * $('#gree_sf').socialbutton('gree_sf', {
  *     button: 0, // synonym 'type'
  *     url: 'http://itra.jp/',
  *     width: 0, // auto
  *     height: 20
  * });
- * 
- * 
+ *
+ *
  * Evernote Site Memory
  * http://www.evernote.com/about/developer/sitememory/
- * 
+ *
  * $('#evernote').socialbutton('evernote');
- * 
+ *
  * $('#evernote').socialbutton('evernote', {
  *     button: 'article-clipper',
  *     url: 'http://itra.jp/',
@@ -119,38 +119,38 @@
  *     suggest_tags: 'comma-separated-tags,up-to-three-tags',
  *     styling: 'full'
  * });
- * 
- * 
+ *
+ *
  * Hatena Bookmark
  * http://b.hatena.ne.jp/
- * 
+ *
  * $('#hatena').socialbutton('hatena');
- * 
+ *
  * $('#hatena').socialbutton('hatena', {
  *     button: 'standard',
  *     url: 'http://itra.jp/',
  *     title: 'page-title'
  * });
- * 
- * 
+ *
+ *
  * Hatena Bookmark (Old Style)
  * http://b.hatena.ne.jp/
- * 
+ *
  * $('#hatena').socialbutton('hatena_oldstyle');
- * 
+ *
  * $('#hatena').socialbutton('hatena_oldstyle', {
  *     button: '/path/to/your-icon.png',
  *     url: 'http://itra.jp/',
  *     padding: 10,
  *     height: 15
  * });
- * 
- * 
+ *
+ *
  * Google +1 Button
  * http://www.google.com/webmasters/+1/button/
- * 
+ *
  * $('#google').socialbutton('google_plusone');
- * 
+ *
  * $('#google').socialbutton('google_plusone', {
  *     button: 'standard', // synonym 'size'
  *     url: 'http://itra.jp', // synonym 'href'
@@ -159,16 +159,16 @@
  *     callback: 'some_callback_function',
  *     count: true
  * });
- * 
+ *
  *
  * Pintarest Button
  * http://pinterest.com/about/goodies/
  *
- * $('#pinterest').socialbutton('pinterest', {
+ * $('#pinterest').socialbutton('pintarest', {
  *     button: 'horizontal', // or 'vertical', 'none'
  *     url: 'http://itra.jp',
  *     media: 'http://itra.jp/image.jpg',
- *     description: 'This is an image.',
+ *     description: 'This is an image.'
  * });
  */
 (function($) {
@@ -272,7 +272,7 @@ $.fn.socialbutton = function(service, options) {
 			title: document.title
 		},
 		hatena_oldstyle: {
-			button: 'http://d.hatena.ne.jp/images/b_append.gif',
+			button: 'https://d.hatena.ne.jp/images/b_append.gif',
 			url: document.URL,
 			height: 13,
 			padding: 7
@@ -287,10 +287,10 @@ $.fn.socialbutton = function(service, options) {
 		},
 		pinterest: {
 			button: 'horizontal', // horizontal, vertical, none
-			url: '',
+			url: document.URL,
 			media: '',
 			description: ''
-		},
+		}
 	};
 
 	var max_index = this.size() - 1;
@@ -496,7 +496,7 @@ function socialbutton_facebook_like(target, options, defaults, index, max_index)
 		'height': height
 	});
 
-	var tag = '<iframe src="http://www.facebook.com/plugins/like.php?' + params + '" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:' + width + 'px; height:' + height + 'px;" allowTransparency="true"></iframe>';
+	var tag = '<iframe src="https://www.facebook.com/plugins/like.php?' + params + '" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:' + width + 'px; height:' + height + 'px;" allowTransparency="true"></iframe>';
 
 	$(target).html(tag);
 }
@@ -545,7 +545,7 @@ function socialbutton_twitter(target, options, defaults, index, max_index)
 	$(target).html(tag);
 
 	if (index == max_index) {
-		$('body').append('<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>');
+		$('body').append('<script type="text/javascript" src="https://platform.twitter.com/widgets.js"></script>');
 	}
 }
 
@@ -667,15 +667,15 @@ function socialbutton_hatena(target, options, defaults, index, max_index)
 	title = htmlspecialchars(title);
 
 	var attr = merge_attributes({
-		'href': 'http://b.hatena.ne.jp/entry/' + url,
+		'href': 'https://b.hatena.ne.jp/entry/' + url,
 		'class': 'hatena-bookmark-button',
 		'data-hatena-bookmark-title': title,
 		'data-hatena-bookmark-layout': layout,
 		'title': 'このエントリーをはてなブックマークに追加'
 	});
-	
-	var tag = '<a' + attr + '><img src="http://b.st-hatena.com/images/entry-button/button-only.gif" alt="このエントリーをはてなブックマークに追加" width="20" height="20" style="border: none;" /></a>'
-			+ '<script type="text/javascript" src="http://b.st-hatena.com/js/bookmark_button_wo_al.js" charset="utf-8" async="async"></script>';
+
+	var tag = '<a' + attr + '><img src="https://b.st-hatena.com/images/entry-button/button-only.gif" alt="このエントリーをはてなブックマークに追加" width="20" height="20" style="border: none;" /></a>'
+			+ '<script type="text/javascript" src="https://b.st-hatena.com/js/bookmark_button.js" charset="utf-8" async="async"></script>';
 
 	$(target).html(tag);
 }
@@ -691,8 +691,8 @@ function socialbutton_hatena_oldstyle(target, options, defaults, index, max_inde
 	url = htmlspecialchars(url);
 
 	var tag = '<span style="font-size: ' + height + 'px; line-height: 100%; ">'
-			+ '<span style="padding-right: ' + padding + 'px"><a href="http://b.hatena.ne.jp/entry/add/' + url + '" target="_blank"><img src="' + button + '" style="border: none; vertical-align: text-bottom" /></a></span>'
-			+ '<a href="http://b.hatena.ne.jp/entry/' + url + '" target="_blank"><img src="http://b.hatena.ne.jp/entry/image/' + url + '" style="border: none; vertical-align: text-bottom" /></a>'
+			+ '<span style="padding-right: ' + padding + 'px"><a href="https://b.hatena.ne.jp/entry/add/' + url + '" target="_blank"><img src="' + button + '" style="border: none; vertical-align: text-bottom" /></a></span>'
+			+ '<a href="https://b.hatena.ne.jp/entry/' + url + '" target="_blank"><img src="https://b.hatena.ne.jp/entry/image/' + url + '" style="border: none; vertical-align: text-bottom" /></a>'
 			+ '</span>';
 
 	$(target).html(tag);
@@ -700,7 +700,7 @@ function socialbutton_hatena_oldstyle(target, options, defaults, index, max_inde
 
 function socialbutton_google_plusone(target, options, defaults, index, max_index)
 {
-	if ($.browser.msie && parseInt($.browser.version, 10) < 8) {
+	if (!$.support.tbody) {
 		return;
 	}
 

data/js/picasa.js

@@ -222,101 +222,47 @@ $(function () {
 
 	var service = new PicasaService($tDiary.plugin.picasa.userId, $tDiary.plugin.picasa.imgMax);
 	var loading = new CanvasLoadingImage();
-	
-	var showRecentlyPhotos = function() {
-		$('h3.plugin_picasa span').unbind();
-		service.setRecentlyUploadedPhotoStartIndex(1);
-		loading.start();
+
+	var showAlbums = function(){
+		service.setAlbumStartIndex(1);
+		$('h3.plugin_picasa span.title').remove();
+		$('#albums').remove();
+		$('.photo').remove();
+		$('<ul>').css({
+			'overflow': 'auto',
+			'height': '300px'
+		}).attr('id', 'albums').addClass('album')
+		.scroll(function(){
+		if (($(this).height() + $(this).scrollTop()) > ($(this).get(0).scrollHeight - 250)) {
+			if (!service.active && service.hasMoreAlbums()) {
+				service.active = true;
+				service.getAlbums(function(next_albums) {
+					service.active = false;
+					$.each(next_albums, function(m, next_album) {
+						showAlbum(next_album);
+					});
+				});
+			}
+		}
+		})
+		.appendTo('#plugin_picasa');
+
 		$(loading.canvas).show();
-		service.getPhotosRecentlyUploaded(function (photos) {
+		loading.start();
+		service.getAlbums(function (albums) {
 			$(loading.canvas).hide();
 			loading.stop();
-			$('h3.plugin_picasa span')
-				.css('cursor', 'pointer')
-				.attr('title', 'アルバム一覧を表示する')
-				.click(function() {
-					$(this).unbind('click');
-					service.setAlbumStartIndex(1);
-					$('h3.plugin_picasa span.title').remove();
-					$('#albums').remove();
-					$('.photo').remove();
-					$('<ul>').css({
-						'overflow': 'auto',
-						'height': '300px'
-					}).attr('id', 'albums').addClass('album')
-					.scroll(function(){
-					if (($(this).height() + $(this).scrollTop()) > ($(this).get(0).scrollHeight - 250)) {
-						if (!service.active && service.hasMoreAlbums()) {
-							service.active = true;
-							service.getAlbums(function(next_albums) {
-								service.active = false;
-								$.each(next_albums, function(m, next_album) {
-									showAlbum(next_album);
-								});
-							});
-						}
-					}
-					})
-					.appendTo('#plugin_picasa');
-				
-					$(loading.canvas).show();
-					loading.start();
-					service.getAlbums(function (albums) {
-						$(loading.canvas).hide();
-						loading.stop();
-						$.each(albums, function(l, album) {
-							showAlbum(album)
-						});
-						$('<input>')
-							.attr({
-								'type': 'button',
-								'value': '最近アップロードした写真の一覧を表示する'
-							})
-							.insertAfter('#plugin_picasa')
-							.click(function(){
-								$(this).remove();
-								$('h3.plugin_picasa span.title').remove();
-								$('#albums').remove();
-								$('.photo').remove();
-								showRecentlyPhotos();
-							});
-					});
-				});
-			$('<span>', {
-				text: ' > Recently uploaded photos'
-			}).addClass('title').appendTo('h3.plugin_picasa');
-			$('<div>')
-				.css({
-					'overflow': 'auto',
-					'height': '300px'
-				})
-				.attr('id', 'photos')
-				.addClass('photo')
-				.appendTo('#plugin_picasa')
-				.scroll(function(){
-					if (($(this).height() + $(this).scrollTop()) > ($(this).get(0).scrollHeight - 400)) {
-						if (!service.active && service.hasMorePhotos()) {
-							service.active = true;
-							service.getPhotosRecentlyUploaded(function(next_photos) {
-								service.active = false;
-								$.each(next_photos, function(j, next_photo) {
-									showPhoto(next_photo);
-								});
-							});
-						}
-					}
-				});
-			$.each(photos, function(i, photo){
-				showPhoto(photo);
+			$.each(albums, function(l, album) {
+				showAlbum(album)
 			});
 		});
-	};
+	}
 
 	$('#plugin_picasa_recent').click(function(){
 		$('#plugin_picasa')
 			.css('height', '300px')
 			.empty();
 		$(loading.canvas).appendTo($('#plugin_picasa'));
-		showRecentlyPhotos();
+		showAlbums();
 	});
 });

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "4.2.1"
+    VERSION = "5.0.0"
   end
 end

data/plugin/coderwall.rb

@@ -9,7 +9,7 @@ def coderwall(name, size = [60, 60])
 		File::delete(cache) if Time::now > File::mtime( cache ) + 60*60*24
 	rescue Errno::ENOENT
 		begin
-			timeout(10) do
+			Timeout.timeout(10) do
 				json = open( "https://coderwall.com/#{name}.json" ) {|f| f.read }
 			end
 			open(cache, 'wb') {|f| f.write(json) }

data/plugin/flickr.rb

@@ -89,7 +89,7 @@ def flickr_open(method, photo_id)
     req['method'] = method
     req['photo_id'] = photo_id
     begin
-      timeout(5) do
+      Timeout.timeout(5) do
         open(file, 'w') {|fout|
           fout.puts req.open
         }

data/plugin/google_webmaster.rb

@@ -16,7 +16,7 @@ add_conf_proc('Google Webmaster', 'Google ウェブマスターツール', 'etc'
   <<-HTML
   <h3>Google ウェブマスターツールの検証コード</h3>
   <p>
-  <input name='google_webmaster.verification'/>
+  <input name='google_webmaster.verification' value="#{h @conf['google_webmaster.verification']}" />
   </p>
   HTML
 end

data/plugin/iddy.rb

@@ -75,7 +75,7 @@ def iddy_call_api( id, key )
 
 	proxy = @conf['proxy']
 	proxy = 'http://' + proxy if proxy
-	timeout( 3 ) do
+	Timeout.timeout( 3 ) do
 		open( request, :proxy => proxy ) {|f| f.read }
 	end
 end

data/plugin/instagram.rb

@@ -41,7 +41,7 @@ def instagram_serverside( short_url, size = :medium)
 
    begin
       Net::HTTP.version_1_2
-      res = Net::HTTP::Proxy(px_host, px_port).get('instagram.com', "/api/v1/oembed/#{query}")
+      res = Net::HTTP::Proxy(px_host, px_port).get('api.instagram.com', "/oembed/#{query}")
       json_data = JSON::parse( res, &:read )
       width  = option[:width]  ? option[:width]  : json_data["width"]
       height = option[:height] ? option[:height] : json_data["height"]

data/plugin/livedoor_weather.rb

@@ -28,7 +28,7 @@ def lwws_request( city_id )
 
 	proxy = @conf['proxy']
 	proxy = 'http://' + proxy if proxy
-	timeout( 10 ) do
+	Timeout.timeout( 10 ) do
 		open( url, :proxy => proxy ) {|f| f.read }
 	end
 end

data/plugin/my_hotentry.rb

@@ -42,7 +42,7 @@ class MyHotEntry
     rss_url << URI.escape(base_url, /[^-.!~*'()\w]/n)
     rss_url << "&sort=#{options[:sort]}&threshold=#{options[:threshold]}"
     begin
-      timeout(5) do
+      Timeout.timeout(5) do
         # convert Tempfile to String because REXML can't accept Tempfile
         open(rss_url) do |f|
           rss = REXML::Document.new(f.readlines.join("\n"))

data/plugin/nhk_program_info.rb

@@ -64,7 +64,7 @@ def call_nhk_json(id, service, area)
 
       status = nil
       data = nil
-      timeout(10) do
+      Timeout.timeout(10) do
          open(*open_param){ |ff| data = ff.read; status = ff.status[0] }
       end
       raise "API Error" if status.to_s != '200'

data/plugin/nicovideo.rb

@@ -29,7 +29,7 @@ def nicovideo_call_api( video_id )
 	uri = "http://ext.nicovideo.jp/api/getthumbinfo/#{video_id}"
 	proxy = @conf['proxy']
 	proxy = 'http://' + proxy if proxy
-	xml = timeout( feed? ? 10 : 2 ) {
+	xml = Timeout.timeout( feed? ? 10 : 2 ) {
 		px_host, px_port = (@conf['proxy'] || '').split( /:/ )
 		px_port = 80 if px_host and !px_port
 		Net::HTTP::Proxy( px_host, px_port ).get_response( URI::parse( uri ) ).body

data/plugin/ohmsha_estore.rb

@@ -31,7 +31,11 @@ def ohmsha_estore( id, doc = nil )
 		return result
 	end
 
-	html = open("https://estore.ohmsha.co.jp#{domain}/titles/#{id}", &:read)
+	html = ''
+	begin
+		open("https://estore.ohmsha.co.jp/titles/#{id}"){|r|html = r.read}
+	rescue SecurityError # avoid error on unlink
+	end
 	info = JSON.parse(html.scan(%r|<script type='application/ld\+json'>(.*?)</script>|m).flatten[0])
 
 	result = <<-EOS

data/plugin/prettify.rb

@@ -3,8 +3,8 @@
 if /\A(?:latest|day|month|nyear)\z/ =~ @mode then
 	add_header_proc do
 		<<-HTML
-		<link href="http://google-code-prettify.googlecode.com/svn/trunk/src/prettify.css" type="text/css" rel="stylesheet">
-		<script type="text/javascript" src="http://google-code-prettify.googlecode.com/svn/trunk/src/prettify.js"></script>
+		<link href="https://google-code-prettify.googlecode.com/svn/trunk/src/prettify.css" type="text/css" rel="stylesheet">
+		<script type="text/javascript" src="https://google-code-prettify.googlecode.com/svn/trunk/src/prettify.js"></script>
 		<script type="text/javascript"><!--
 			if(window.addEventListener){
 				window.addEventListener("load", prettyPrint, false);

data/plugin/profile.rb

@@ -58,7 +58,7 @@ module ::Profile
 
 			# get a XML document from endpoint and create REXML::Document instance
 			def fetch(endpoint)
-				timeout(5) do
+				Timeout.timeout(5) do
 					open(endpoint) do |f|
 						doc = REXML::Document.new(f)
 					end
@@ -89,7 +89,7 @@ module ::Profile
 
 			def fetch(endpoint)
 				require 'json'
-				timeout(5) do
+				Timeout.timeout(5) do
 					doc = open(endpoint) {|f| JSON.parse(f.read) }
 				end
 			end
@@ -125,7 +125,7 @@ module ::Profile
 
 			def fetch(endpoint)
 				require 'json'
-				timeout(5) do
+				Timeout.timeout(5) do
 					begin
 						doc = open(endpoint) {|f| JSON.parse(f.read) }
 					rescue RuntimeError => err

data/plugin/pygments_css.rb

@@ -4,7 +4,6 @@
 # Copyright (C) 2012 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
 # You can redistribute it and/or modify it under GPL2.
 #
-require 'pygments'
 
 add_header_proc do
 	<<-STYLE

data/plugin/recent_tweet.rb

@@ -65,7 +65,7 @@ def recent_tweet_call_api( id )
 
 	proxy = @conf['proxy']
 	proxy = 'http://' + proxy if proxy
-	timeout( 10 ) do
+	Timeout.timeout( 10 ) do
 		open( request, :proxy => proxy ) {|f| f.read }
 	end
 end

data/plugin/section_footer.rb

@@ -152,7 +152,7 @@ def add_delicious_json(date, index)
 
 		if cached_time.nil? or update
 			begin
-				timeout(10) do
+				Timeout.timeout(10) do
 					open( "http://feeds.delicious.com/v2/json/urlinfo/#{url_md5}") do |file|
 						File::open( file_name, 'wb' ) do |f|
 							f.write( file.read )

data/plugin/section_footer2.rb

@@ -56,11 +56,11 @@ end
 
 add_header_proc do
   <<-"EOS"
-  <script type="text/javascript" src="http://b.st-hatena.com/js/bookmark_button_wo_al.js" charset="utf-8" async="async"></script>
+  <script type="text/javascript" src="//b.st-hatena.com/js/bookmark_button_wo_al.js" charset="utf-8" async="async"></script>
   <style type="text/css">iframe.hatena-bookmark-button-frame {margin-bottom: -7px; }</style>
-  <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
+  <script src="//platform.twitter.com/widgets.js" type="text/javascript"></script>
   <style type="text/css">iframe.twitter-share-button.twitter-count-horizontal {margin-bottom: -6px; }</style>
-  <script src="http://connect.facebook.net/#{@section_footer2_locale}/all.js"></script>
+  <script src="//connect.facebook.net/#{@section_footer2_locale}/all.js"></script>
   <script>
   FB.init({
     appId  : '',
@@ -70,7 +70,7 @@ add_header_proc do
   });
   </script>
   <style type="text/css">iframe.fb_ltr {margin-bottom: -2px; margin-right: 4px;}</style>
-  <script type="text/javascript" src="http://apis.google.com/js/plusone.js">
+  <script type="text/javascript" src="//apis.google.com/js/plusone.js">
   {lang: '#{@section_footer2_locale}'}
   </script>
   <style type="text/css">.tags > div > iframe {margin-bottom: -6px !important; }</style>
@@ -123,7 +123,7 @@ end
 def call_delicious_json( url_md5 )
 	json = nil
 	begin
-		timeout(10) do
+		Timeout.timeout(10) do
 			open( "http://feeds.delicious.com/v2/json/urlinfo/#{url_md5}" ) do |f|
 				json = JSON.parse( f.read )
 			end
@@ -171,7 +171,7 @@ def add_delicious( date, index )
 end
 
 def add_hatena( date, index )
-       %Q!<a href="http://b.hatena.ne.jp/entry/#{permalink( date, index )}" class="hatena-bookmark-button" data-hatena-bookmark-layout="standard"><img src="http://b.st-hatena.com/images/entry-button/button-only.gif" width="20" height="20" style="border: none;" /></a> | !
+       %Q!<a href="http://b.hatena.ne.jp/entry/#{permalink( date, index )}" class="hatena-bookmark-button" data-hatena-bookmark-layout="standard"><img src="//b.st-hatena.com/images/entry-button/button-only.gif" width="20" height="20" style="border: none;" /></a> | !
 end
 
 def add_facebook(date, index)

data/plugin/squeeze.rb

@@ -0,0 +1,272 @@
+#!/usr/bin/env ruby
+
+# squeeze.rb
+#
+# Create daily HTML file from tDiary database.
+#
+# See URLs below for more details.
+#   http://ponx.s5.xrea.com/hiki/squeeze.rb.html (English)
+#   http://ponx.s5.xrea.com/hiki/ja/squeeze.rb.html (Japanese)
+#
+# Copyright (C) 2002 MUTOH Masao <mutoh@highway.ne.jp>
+# You can redistribute it and/or modify it under GPL2 or any later version.
+#
+# The original version of this file was distributed with squeeze
+# TADA Tadashi <sho@spc.gr.jp> with GPL2 or any later version.
+#
+unless $tdiary_squeeze_loaded
+$tdiary_squeeze_loaded ||= true
+
+mode = defined?(TDiary) ? "PLUGIN" : ENV["REQUEST_METHOD"]? "CGI" : "CMD"
+
+if mode == "CMD" || mode == "CGI"
+	output_path = "./html/"
+	tdiary_path = "."
+	tdiary_conf = "."
+	suffix = ''
+	all_data = false
+	overwrite = false
+	compat = false
+	$stdout.sync = true
+
+	if mode == "CMD"
+		def usage
+			puts "squeeze $Revision: 1.25 $"
+			puts " making html files from tDiary's database."
+			puts " usage: ruby squeeze.rb [-p <tDiary path>] [-c <tdiary.conf path>] [-a] [-s] [-x suffix] <dest path>"
+			exit
+		end
+
+		require 'getoptlong'
+		parser = GetoptLong::new
+		parser.set_options(['--path', '-p', GetoptLong::REQUIRED_ARGUMENT],
+											 ['--conf', '-c', GetoptLong::REQUIRED_ARGUMENT],
+											 ['--suffix', '-x', GetoptLong::REQUIRED_ARGUMENT],
+											 ['--all', '-a', GetoptLong::NO_ARGUMENT],
+											 ['--overwrite', '-o', GetoptLong::NO_ARGUMENT],
+											 ['--squeeze', '-s', GetoptLong::NO_ARGUMENT])
+		begin
+			parser.each do |opt, arg|
+				case opt
+				when '--path'
+					tdiary_path = arg.dup.untaint
+				when '--conf'
+					tdiary_conf = arg
+				when '--suffix'
+					suffix = arg
+				when '--all'
+					all_data = true
+				when '--overwrite'
+					overwrite = true
+				when '--squeeze'
+					compat = true
+				end
+			end
+		rescue
+			usage
+			exit( 1 )
+		end
+		output_path = ARGV.shift
+		usage unless output_path
+		output_path = File::expand_path(output_path)
+		output_path += '/' if /\/$/ !~ output_path
+
+		tdiary_conf = tdiary_path unless tdiary_conf
+		Dir::chdir( tdiary_conf )
+		ARGV << '' # dummy argument against cgi.rb offline mode.
+		$:.unshift tdiary_path
+	else
+		@options = Hash.new
+		File::readlines("tdiary.conf").each {|item|
+			if item =~ /@options/
+				begin
+					eval(item)
+				rescue SyntaxError
+				end
+			end
+		}
+		output_path = @options['squeeze.output_path'] || @options['yasqueeze.output_path']
+		suffix = @options['squeeze.suffix'] || ''
+		all_data = @options['squeeze.all_data'] || @options['yasqueeze.all_data']
+		overwrite = @options['squeeze.overwrite']
+		compat = @options['squeeze.compat_path'] || @options['yasqueeze.compat_path']
+
+		if FileTest::symlink?( __FILE__ ) then
+			org_path = File::dirname( File::readlink( __FILE__ ) )
+		else
+			org_path = File::dirname( __FILE__ )
+		end
+		$:.unshift( org_path.untaint )
+	end
+
+	begin
+		require "tdiary"
+	rescue LoadError
+		$stderr.print "squeeze.rb: cannot load tdiary.rb. <#{tdiary_path}/tdiary>\n"
+		exit( 1 )
+	end
+end
+
+#
+# Dairy Squeeze
+#
+module ::TDiary
+	class YATDiarySqueeze < TDiaryBase
+		def initialize(diary, dest, all_data, overwrite, compat, conf, suffix)
+			@ignore_parser_cache = true
+
+			cgi = CGI::new
+			def cgi.referer; nil; end
+			def cgi.user_agent; 'bot'; end
+			super( cgi, 'day.rhtml', conf )
+			@diary = diary
+			@date = diary.date
+			@diaries = {@date.strftime('%Y%m%d') => @diary} if @diaries.size == 0
+			@dest = dest
+			@all_data = all_data
+			@overwrite = overwrite
+			@compat = compat
+			@suffix = suffix
+		end
+
+		def execute
+			if @compat
+				dir = @dest
+				name = @diary.date.strftime('%Y%m%d')
+			else
+				dir = @dest + "/" + @diary.date.strftime('%Y')
+				name = @diary.date.strftime('%m%d')
+				Dir.mkdir(dir, 0755) unless File.directory?(dir)
+			end
+			filename = dir + "/" + name + @suffix
+			if FileTest.exist?( filename ) and @overwrite
+				File::delete( filename )
+			end
+			if @diary.visible? or @all_data
+				if not FileTest::exist?(filename) or
+						File::mtime(filename) != @diary.last_modified
+					File::open(filename, 'w'){|f| f.write(eval_rhtml)}
+					File::utime(@diary.last_modified, @diary.last_modified, filename)
+				end
+			else
+				if FileTest.exist?(filename) and ! @all_data
+					name = "remove #{name}"
+					File::delete(filename)
+				else
+					name = ""
+				end
+			end
+			name
+		end
+
+		protected
+		def mode
+			'day'
+		end
+
+		def cookie_name; ''; end
+		def cookie_mail; ''; end
+	end
+end
+
+#
+# Main
+#
+module ::TDiary
+	class YATDiarySqueezeMain < TDiaryBase
+		def initialize(dest, all_data, overwrite, compat, conf, suffix)
+			@ignore_parser_cache = true
+
+			cgi = CGI::new
+			def cgi.referer; nil; end
+			super( cgi, 'day.rhtml', conf )
+			calendar
+			@years.keys.sort.each do |year|
+				print "(#{year.to_s}/) "
+				@years[year.to_s].sort.each do |month|
+					diaries2 = nil
+					@io.transaction(Time::local(year.to_i, month.to_i)) do |diaries|
+						diaries2 = diaries
+						DIRTY_NONE
+					end
+					diaries2.sort.each do |day, diary|
+						print YATDiarySqueeze.new(diary, dest, all_data, overwrite, compat, conf, suffix).execute + " "
+					end
+				end
+			end
+		end
+	end
+end
+
+squeeze_navi_on_footer = '<div class="adminmenu"><%= navi_user %></div>'
+
+if mode == "CGI" || mode == "CMD"
+	if mode == "CGI"
+		print %Q[Content-type:text/html\n\n
+			<html>
+			<head>
+				<title>Squeeze for tDiary</title>
+				<link href="./theme/default/default.css" type="text/css" rel="stylesheet"/>
+			</head>
+			<body><div style="text-align:center">
+			<h1>Squeeze for tDiary</h1>
+			<p>$Revision: 1.25 $</p>
+			<p>Copyright (C) 2002 MUTOH Masao&lt;mutoh@highway.ne.jp&gt;</p></div>
+			<br><br>Start!</p><hr>
+		]
+	end
+
+	begin
+		require 'cgi'
+		cgi = CGI.new
+		def cgi.user_agent; 'bot'; end
+		conf = TDiary::Config::new(cgi)
+		conf.header = ''
+		conf.footer = squeeze_navi_on_footer
+		conf.show_comment = true
+		conf.hide_comment_form = true
+		output_path = "#{conf.data_path}/cache/html" unless output_path
+		Dir.mkdir(output_path, 0755) unless File.directory?(output_path)
+		::TDiary::YATDiarySqueezeMain.new(output_path, all_data, overwrite, compat, conf, suffix)
+	rescue
+		print $!, "\n"
+		$@.each do |v|
+			print v, "\n"
+		end
+		exit( 1 )
+	end
+
+	if mode == "CGI"
+		print "<hr><p>End!</p></body></html>\n"
+	else
+		print "\n\n"
+	end
+else
+	add_update_proc do
+		conf = @conf.clone
+		conf.header = ''
+		conf.footer = squeeze_navi_on_footer
+		conf.show_comment = true
+		conf.hide_comment_form = true
+
+		diary = @diaries[@date.strftime('%Y%m%d')]
+		dir = @options['squeeze.output_path'] || @options['yasqueeze.output_path']
+		dir = @cache_path + "/html" unless dir
+		Dir.mkdir(dir, 0755) unless File.directory?(dir)
+		::TDiary::YATDiarySqueeze.new(diary, dir,
+					    @options['squeeze.all_data'] || @options['yasqueeze.all_data'],
+					    @options['squeeze.overwrite'],
+					    @options['squeeze.compat_path'] || @options['yasqueeze.compat_path'],
+					    conf,
+					    @options['squeeze.suffix'] || ''
+					    ).execute
+	end
+end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/plugin/tweet_quote.rb

@@ -56,7 +56,7 @@ def twitter_statuses_show_api( tweet_id )
 		"Authorization" => %Q[OAuth #{oauth_parameters.map{|k ,v| "#{URI.escape( k.to_s, unsafe )}=\"#{URI.escape( v, unsafe )}\""}.join( "," )}],
 		:proxy => proxy
 	}
-	timeout( 20 ) do
+	Timeout.timeout( 20 ) do
 		open( "#{url}?#{parameters.map{|k,v| "#{k}=#{v}"}.join( "&" )}", headers ) {|f| f.read }
 	end
 end

data/plugin/twitter.rb

@@ -12,7 +12,7 @@ require 'rexml/document'
 if /^(latest|day)$/ =~ @mode then
 	add_header_proc do
 		xml = nil
-		timeout( 5 ) do
+		Timeout.timeout( 5 ) do
 			begin
 				xml = open( "http://twitter.com/statuses/user_timeline/#{@conf['twitter.user']}.xml" ){|f| f.read}
 			rescue Exception

data/plugin/yo_update.rb

@@ -48,7 +48,7 @@ def yo_update_access_api(req)
 		proxy_port = nil
 	end
 	begin
-		timeout(YO_UPDATE_TIMEOUT) do
+		Timeout.timeout(YO_UPDATE_TIMEOUT) do
 			return Net::HTTP.start(req.uri.host, req.uri.port, proxy_addr, proxt_port){|http|
 				http.request(req)
 			}

data/plugin/youtube.rb

@@ -7,20 +7,24 @@
 #
 def youtube( video_id, size = [425,350] )
 	if feed?
-		%Q|<div class="youtube"><a href="http://www.youtube.com/watch?v=#{video_id}">YouTube (#{video_id})</a></div>|
+		%Q|<div class="youtube"><a href="//www.youtube.com/watch?v=#{video_id}">YouTube (#{video_id})</a></div>|
 	else
 		<<-TAG
-		<iframe class="youtube-player" type="text/html" width="#{size[0]}" height="#{size[1]}" src="http://www.youtube.com/embed/#{video_id}" frameborder="0">
+		<div class="youtube-player-wrapper">
+		<iframe class="youtube-player" type="text/html" width="#{size[0]}" height="#{size[1]}" src="//www.youtube.com/embed/#{video_id}" frameborder="0">
 		</iframe>
+		</div>
 		TAG
 	end
 end
 
 def youtube_custom( video_id, size = [416,337] )
   <<-TAG
+  <div class="youtube-player-wrapper">
   <object width="#{size[0]}" height="#{size[1]}">
-  <param name="movie" value="http://www.youtube.com/cp/#{video_id}"></param>
-  <embed src="http://www.youtube.com/cp/#{video_id}" type="application/x-shockwave-flash" width="#{size[0]}" height="#{size[1]}"></embed>
+  <param name="movie" value="//www.youtube.com/cp/#{video_id}"></param>
+  <embed src="//www.youtube.com/cp/#{video_id}" type="application/x-shockwave-flash" width="#{size[0]}" height="#{size[1]}"></embed>
   </object>
+  </div>
   TAG
 end

data/spec/youtube_spec.rb

@@ -5,7 +5,7 @@ describe "youtube plugin" do
 	DUMMY_YOUTUBE_VIDEO_ID = 1234567890
 
   {
-    'Mozilla' => %|\t\t<iframe class="youtube-player" type="text/html" width="425" height="350" src="http://www.youtube.com/embed/#{DUMMY_YOUTUBE_VIDEO_ID}" frameborder="0">\n\t\t</iframe>\n|
+    'Mozilla' => %|\t\t<div class="youtube-player-wrapper">\n\t\t<iframe class="youtube-player" type="text/html" width="425" height="350" src="//www.youtube.com/embed/#{DUMMY_YOUTUBE_VIDEO_ID}" frameborder="0">\n\t\t</iframe>\n\t\t</div>\n|
   }.each do |k,v|
     it 'should render object tag in :user_agent' do
       plugin = fake_plugin(:youtube)

data/style/hatena_style.rb

@@ -125,7 +125,7 @@ module Hatena
     File.open(kw, IO::WRONLY|IO::CREAT) do |fp|
       break unless fp.flock(IO::LOCK_EX|IO::LOCK_NB)
       uri = ::URI.parse('http://d.hatena.ne.jp/images/keyword/keywordlist')
-      timeout(60) do
+      Timeout.timeout(60) do
         Net::HTTP.version_1_1
         Net::HTTP.new(uri.host, uri.port).start do |http|
           res, body = http.get(uri.request_uri,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 5.0.0
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -220,7 +220,6 @@ files:
 - plugin/bootstrap-navi.rb
 - plugin/brow_si.rb
 - plugin/canonical.rb
-- plugin/category-lite.rb
 - plugin/category_similar.rb
 - plugin/category_to_tag.rb
 - plugin/category_to_tagcloud.rb
@@ -342,6 +341,7 @@ files:
 - plugin/show_and_hide.rb
 - plugin/slideshare.rb
 - plugin/socialbutton.rb
+- plugin/squeeze.rb
 - plugin/tatsu_zine.rb
 - plugin/tdiarytimes2.rb
 - plugin/tdiarytimes_flashstyle.rb

data/plugin/category-lite.rb

@@ -1,235 +0,0 @@
-#
-# category-lite.rb : tDiary plugin for show category pages (light edition)
-#
-# Copyright (C) 2015 TADA Tadashi
-# Distributed under the GPL2 or any later version.
-#
-
-
-# read cache here so that you can use category with secure mode.
-@conf['category.header1'] = ''
-@conf['category.header2'] = '<%= category_dropdown_list %>'
-@category_icon = {}
-@categories = transaction('category'){|db|db.keys}.sort_by{|c|c.downcase}
-
-module Category
-	class Info
-		def initialize(cgi, _, conf)
-			@cgi, @conf = cgi, conf
-		end
-
-		def category
-			@name || (@name = @conf.to_native(@cgi.params['category'][0], @conf.encoding_old))
-		end
-	end
-end
-
-def category_title
-	info = Category::Info.new(@cgi, nil, @conf)
-	"[#{info.category}]"
-end
-
-def category_anchor(category)
-	%Q|[<a href="#{h @index}?category=#{u category}" title="#{h category}">#{h category}</a>]|
-end
-
-def category_dropdown_list(label = nil, _ = nil)
-	label ||= 'show category list'
-
-	info = Category::Info.new(@cgi, _, @conf)
-	category = info.category
-	category = [] if category.empty?
-
-	options = ''
-	@categories.each do |c|
-		options << %Q|<option value="#{h c}"#{" selected" if category.include?(c)}>#{h c}</option>\n|
-	end
-
-	<<-HTML
-		<form method="get" action="#{h @index}"><div>
-			<select name="category">
-		#{options}
-			</select>
-			<input type="submit" value="#{label}">
-		</div></form>
-	HTML
-end
-
-def category_transaction(categories)
-	transaction('category') do |db|
-		(categories || db.keys).each do |category|
-			Hash[*JSON.load(db.get(category) || '{}').sort_by{|d,_|d}.flatten(1)].each do |ymd, diaries|
-				yield db, category, ymd, diaries
-			end
-		end
-	end
-end
-
-def category_list_sections
-	info = Category::Info.new(@cgi, nil, @conf)
-
-	r = ''
-	r << <<-HTML
-		<div class="category day">
-			<h2>
-				<span class="title">
-					<a href="#{h @conf.index}?category=#{u info.category}">#{h info.category}</a>
-				</span>
-			</h2>
-			<div class="body">
-				<ul class="category">
-	HTML
-	category_transaction([info.category]) do |db, category, ymd, diaries|
-		date = Time.local(*ymd.scan(/(.{4})(..)(..)/)[0]).strftime(@conf.date_format)
-		diaries.sort_by{|i|i[0]}.each do |idx, title, excerpt|
-			r << <<-HTML
-				<li>
-					<a href="#{h @index}#{anchor "#{ymd}#p#{'%02d' % idx}"}" title="#{h excerpt}">
-						#{date}#p#{'%02d' % idx}
-					</a>
-					#{apply_plugin(title)}
-				</li>
-			HTML
-		end
-	end
-	r << <<-HTML
-				</ul>
-			</div>
-		</div>
-	HTML
-	return r
-end
-
-def category_serialize(diary)
-	data = {}
-	ymd = diary.date.strftime('%Y%m%d')
-
-	idx = 1
-	diary.each_section do |s|
-		s.categories.each do |c|
-			data[c] ||= {}
-			data[c][ymd] ||= []
-			body = <<-EVAL.gsub(/^\t+/, '')
-				text = apply_plugin(<<'BODY', true)
-				#{s.body_to_html}
-				BODY
-			EVAL
-			shorten = begin
-				@conf.shorten(eval(body.untaint))
-			rescue NameError
-				""
-			end
-			data[c][ymd] << [idx, s.stripped_subtitle_to_html, shorten]
-		end
-		idx +=1
-	end
-	data
-end
-
-def category_rebuild(years)
-	transaction('category') do |db|
-		cache = Hash.new{{}}
-		@years.each do |y, ms|
-			ms.each do |m|
-				m = DiaryContainer::find_by_month(@conf, "#{y}#{m}")
-				m.diaries.each do |ymd, diary|
-					next if !diary.visible? or !diary.categorizable?
-					serialize = category_serialize(diary)
-					serialize.keys.each do |category|
-						cache[category] = cache[category].merge!(serialize[category])
-					end
-				end
-			end
-		end
-		db.keys.each {|key| db.delete(key)}
-		cache.each do |category, diaries|
-			db.set(category, diaries.to_json)
-		end
-	end
-end
-
-add_update_proc do
-	if /^(append|replace)$/ =~ @mode
-		ymd = @date.strftime('%Y%m%d')
-		diary = @diaries[ymd]
-		serialize = category_serialize(diary)
-
-		transaction('category') do |db|
-			(db.keys + serialize.keys).uniq.each do |category|
-				data = JSON.load(db.get(category) || '{}')
-				if diary.visible? and serialize[category]
-					data.update(serialize[category])
-					db.set(category, data.to_json)
-				else
-					data.delete(ymd)
-					if data.empty?
-						db.delete(category)
-					else
-						db.set(category, data.to_json)
-					end
-				end
-			end
-		end
-	end
-end
-
-#
-# edit support: insert category to editing diary using JavaScript
-#
-def category_edit_support_flatlist(categories)
-	ret = ''
-	ret << '<div class="field title">'
-	ret << "#{@category_conf_label}:\n"
-	categories.each do |c|
-		ret << %Q!| <span class="category-item">#{h c}</span>\n!
-	end
-	ret << "|\n</div>\n<br>\n"
-	ret
-end
-
-def category_edit_support_dropdown(categories)
-	ret = ''
-	ret << '<div class="field title">'
-	ret << %Q|#{@category_conf_label}: <select id="category-candidate" name="category-candidate">\n|
-	categories.each do |c|
-		ret << %Q!<option>#{h c}</option>\n!
-	end
-	ret << "|\n</select>\n</div>\n<br>\n"
-	ret
-end
-
-if @mode =~ /^(form|edit)$/ and @conf['category.edit_support'] != 0
-	enable_js( 'category.js' )
-	add_edit_proc do |date|
-		ret = ''
-		transaction('category') do |db|
-			categories = db.keys
-			unless categories.size == 0 then
-				if @conf['category.edit_support'] == 2 then
-					ret << category_edit_support_dropdown(categories)
-				else
-					ret << category_edit_support_flatlist(categories)
-				end
-			end
-		end
-		ret
-	end
-end
-
-if @mode == 'conf' || @mode == 'saveconf'
-	add_conf_proc('category', @category_conf_label, 'basic') do
-		if @mode == 'saveconf'
-			category_rebuild(@years) if @cgi.valid?('category_initialize')
-			@conf['category.edit_support'] = (@cgi.params['category.edit_support'][0] || '1').to_i
-		end
-		category_conf_html
-	end
-end
-
-# Local Variables:
-# mode: ruby
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# End:
-# vim: ts=3