tdiary-contrib 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 951b6aa4dbb64c3c27286b17c127134c29294626
-  data.tar.gz: 4ec21935523768181cbbb5f1fd843ba06f648089
+  metadata.gz: 45164104afb789350f27df675a67c5883a5c9c24
+  data.tar.gz: 693b82c14081911639444d97110b253253fecc65
 SHA512:
-  metadata.gz: 59961f3c4ac5a76f3f38bfb440661347355afeef28e91ead68e28599f3637bdec99c382ed1d1db34e210d55aba8cafb64dbc68f281883e521281104228c8649f
-  data.tar.gz: b170c62aa74a2dffbb13955dfa9a918827794199942c6c89fd72c3489576750651a378096220c5bac92ffc6b8c1b1fbb808d926a046e95034b043e2cde02967c
+  metadata.gz: da67a8625a789a06f07cdda68dbbb952cbae06be3ee3741caaeb6a43e4a69589359058d092b6caf8e5b42df73dbefef50fc8fb6e2f9d80fcccb27436721c754f
+  data.tar.gz: 817c91cba026b251ecb6c10bda31c99297ebf5ea011092686630f749a78be3cc4d387b23c27ae8869167ffe06d689ff9f86822a105ea5f3fabce753652b81647

data/js/image_ex.js

@@ -62,7 +62,7 @@ $(function() {
 		}
 	}
 
-	$(window).width() <= 360) {
+	if ($(window).width() <= 360) {
 		$(document).ready(function() {
 			$("img.image-ex").bind("load", function() {
 				resizeImage(this);

data/js/jquery.socialbutton.js

@@ -669,6 +669,7 @@ function socialbutton_hatena(target, options, defaults, index, max_index)
 	var attr = merge_attributes({
 		'href': 'https://b.hatena.ne.jp/entry/' + url,
 		'class': 'hatena-bookmark-button',
+		'data-hatena-bookmark-url': url,
 		'data-hatena-bookmark-title': title,
 		'data-hatena-bookmark-layout': layout,
 		'title': 'このエントリーをはてなブックマークに追加'

data/js/slideshow.js

@@ -0,0 +1,123 @@
+/*
+ * slideshow.js : show slides
+ *
+ * Copyright (C) 2016 by TADA Tadashi <t@tdtds.jp>
+ * Distributed under the GPL2 or any later version.
+ */
+
+$(function(){
+	function isFullscreenEnabled(doc) {
+		return(
+			doc.fullscreenEnabled ||
+			doc.webkitFullscreenEnabled ||
+			doc.mozFullScreenEnabled ||
+			doc.msFullscreenEnabled ||
+			false
+		);
+	};
+
+	function requestFullscreen(element) {
+		var funcs = [
+			'requestFullscreen',
+			'webkitRequestFullscreen',
+			'mozRequestFullScreen',
+			'msRequestFullscreen',
+		];
+		$.each(funcs, function(idx, func) {
+			if (element[func]) {
+				element[func]();
+				return false;
+			}
+		});
+	};
+
+	function isFullscreen() {
+		if (document.fullscreenElement ||
+				document.webkitFullscreenElement ||
+				document.mozFullScreenElement ||
+				document.msFullscreenElement ) {
+			return true;
+		}
+		return false;
+	};
+
+	function startSlideShow(content) {
+		if (!isFullscreenEnabled(document)) {
+			return false;
+		}
+
+		var slides = [];
+		$.each(content.children(), function(i, elem) {
+			var e = $(elem).clone();
+			if (e.prop('tagName') == 'H3') { // main title
+				$('a', e).remove(); // section anchor
+				$('span', e).remove(); // hatena start etc...
+				$('button.slideshow', e).remove();
+				slides.push([$('<div class="slide-title">').append(e)]);
+			} else if (e.prop('tagName') == 'H4') { // page title
+				slides.push([e, $('<div class="slide-body">')]);
+			} else {
+				var last = slides[slides.length-1];
+				last[last.length-1].append(e);
+			}
+		});
+
+		var screen = window.screen;
+		var slide = $('<div>').
+			         addClass('slide').
+	               css('width', screen.width).
+		            css('height', screen.height);
+		var current_page = 0;
+		var firstClick = true;
+
+		$('body').append(slide);
+		slide.append(slides[current_page]);
+		requestFullscreen(slide[current_page]);
+
+		$(document).on({
+			'keydown': function(e) {
+				if (e.keyCode == 13 || e.keyCode == 34 || e.keyCode == 39) { // next page
+					if (slides.length - 1 > current_page) {
+						e.preventDefault();
+						slide.empty().append(slides[++current_page]);
+					}
+				} else if (e.keyCode == 37 || e.keyCode == 33) { // prev page
+					if (current_page > 0) {
+						e.preventDefault();
+						slide.empty().append(slides[--current_page]);
+					}
+				} else if (e.keyCode == 36) { // [Home] to top page
+					e.preventDefault();
+					slide.empty().append(slides[current_page = 0]);
+				} else if (e.keyCode == 35) { // [End] to bottom page
+					e.preventDefault();
+					slide.empty().append(slides[current_page = slides.length-1]);
+				}
+			},
+			'click': function() {
+				if (!firstClick && slides.length - 1 > current_page) {
+					slide.empty().append(slides[++current_page]);
+				}
+				firstClick = false;
+			},
+			'fullscreenchange webkitfullscreenchange mozfullscreenchange msfullscreenchange': function() {
+				if (!isFullscreen()) { // fullscreen was closed
+					$(document).off('keydown').off('click');
+					slide.remove();
+				}
+			}
+		});
+
+		return true;
+	};
+
+	$('.slideshow').on('click', function(e){
+		var section = $(this).parent().parent();
+		e.preventDefault();
+		if (!startSlideShow(section)) {
+			alert("couldn't start slideshow.")
+			return;
+		}
+	});
+});
+

data/js/socialbutton.js

@@ -44,7 +44,7 @@ $(function() {
       return {
         url: url,
         title: title,
-        button: 'standard'
+        button: 'simple-balloon'
       };
     },
 

data/lib/tdiary/contrib/version.rb

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

data/plugin/category_to_tagcloud.rb

@@ -14,7 +14,7 @@
 require 'pstore'
 
 def category_enable?
-	!@plugin_files.grep(/\/category\.rb$/).empty?
+	!@plugin_files.grep(/\/category\-legacy\.rb$/).empty?
 end
 
 def add tag, url, count, elapsed_time
@@ -69,20 +69,24 @@ def tag_list limit = nil
 	return '' if bot?
 	return '' unless category_enable?
 
-	init_category_to_tagcloud
-	cache = @conf['category_to_tagcloud.cache']
-	@limit = limit
-
-	PStore.new(cache).transaction(read_only=true) do |db|
-		break unless db.root?('tagcloud') or db.root?('last_update')
-		break if Time.now.strftime('%Y%m%d').to_i > db['last_update']
-		@counts = db['tagcloud'][0]
-		@urls = db['tagcloud'][1]
-		@elapsed_times = db['tagcloud'][2]
-	end
+	begin
+		init_category_to_tagcloud
+		cache = @conf['category_to_tagcloud.cache']
+		@limit = limit
+
+		PStore.new(cache).transaction(read_only=true) do |db|
+			break unless db.root?('tagcloud') or db.root?('last_update')
+			break if Time.now.strftime('%Y%m%d').to_i > db['last_update']
+			@counts = db['tagcloud'][0]
+			@urls = db['tagcloud'][1]
+			@elapsed_times = db['tagcloud'][2]
+		end
 
-	gen_tag_list if @urls.empty?
-	print_html
+		gen_tag_list if @urls.empty?
+		print_html
+	rescue TypeError
+		'<p class="message">category plugin does not support category_to_tagcloud plugin. use category_legacy plugin instead of categoty plugin.</p>'
+	end
 end
 
 def styleclass diff

data/plugin/datepicker.rb

@@ -12,7 +12,7 @@
 return if feed?
 
 if /\A(?:form|preview|append|edit|update)\z/ =~ @mode
-   enable_js('//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
+   enable_js('//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js')
    if @conf.lang == 'ja'
       enable_js('//ajax.googleapis.com/ajax/libs/jqueryui/1/i18n/jquery.ui.datepicker-ja.min.js')
    end

data/plugin/flickr.rb

@@ -27,10 +27,10 @@ require 'rexml/document'
 @conf['flickr.default_size'] ||= 'medium'
 
 if /\A(form|edit|preview|showcomment)\z/ === @mode then
-	enable_js('flickr.js')
-	add_js_setting('$tDiary.plugin.flickr')
-	add_js_setting('$tDiary.plugin.flickr.apiKey', %Q|'#{@conf['flickr.apikey']}'|)
-	add_js_setting('$tDiary.plugin.flickr.userId', %Q|'#{@conf['flickr.user_id']}'|)
+  enable_js('flickr.js')
+  add_js_setting('$tDiary.plugin.flickr')
+  add_js_setting('$tDiary.plugin.flickr.apiKey', %Q|'#{@conf['flickr.apikey']}'|)
+  add_js_setting('$tDiary.plugin.flickr.userId', %Q|'#{@conf['flickr.user_id']}'|)
 end
 
 def flickr(photo_id, size = nil, place = 'flickr')
@@ -59,17 +59,34 @@ def flickr_photo_info(photo_id, size)
 
   begin
     flickr_open('flickr.photos.getInfo', photo_id) {|f|
-      res = REXML::Document.new(f)
-      photo[:page]  = res.elements['//rsp/photo/urls/url'].text
-      photo[:title] = res.elements['//rsp/photo/title'].text
+      if defined?(Oga)
+        res = Oga.parse_xml(f)
+        photo[:page] = res.xpath('/rsp/photo/urls/url').text
+        photo[:title] = res.xpath('/rsp/photo/title').text
+      else
+        res = REXML::Document.new(f)
+        photo[:page]  = res.elements['//rsp/photo/urls/url'].text
+        photo[:title] = res.elements['//rsp/photo/title'].text
+      end
     }
     flickr_open('flickr.photos.getSizes', photo_id) {|f|
-      res = REXML::Document.new(f)
-      res.elements.each('//rsp/sizes/size') do |s|
-        if s.attributes['label'].downcase == size.downcase
-          photo[:src] = s.attributes['source']
-          photo[:width] = s.attributes['width']
-          photo[:height] = s.attributes['height']
+      if defined?(Oga)
+        res = Oga.parse_xml(f)
+        res.xpath('//rsp/sizes/size').each do |s|
+          if s.get('label').downcase == size.downcase
+            photo[:src] = s.get('source')
+            photo[:width] = s.get('width')
+            photo[:height] = s.get('height')
+          end
+        end
+      else
+        res = REXML::Document.new(f)
+        res.elements.each('//rsp/sizes/size') do |s|
+          if s.attributes['label'].downcase == size.downcase
+            photo[:src] = s.attributes['source']
+            photo[:width] = s.attributes['width']
+            photo[:height] = s.attributes['height']
+          end
         end
       end
     }
@@ -124,21 +141,27 @@ add_edit_proc do |date|
         <option value="40">40</option>
         <option value="50">50</option>
       </select>
-		件
+    件
       <input id="flickr_search" type="button" value="Get flickr photos"></input>
     </div>
     <div id="flickr_photo_size">
-	   Photo size:
+     Photo size:
       <input type="radio" id="flickr_photo_size_square" name="flickr_photo_size" value="square">
       <label for="flickr_photo_size_square">square</label>
+      <input type="radio" id="flickr_photo_size_large_square" name="flickr_photo_size" value="large square">
+      <label for="flickr_photo_size_large_square">large square</label>
       <input type="radio" id="flickr_photo_size_thumbnail" name="flickr_photo_size" value="thumbnail">
       <label for="flickr_photo_size_thumbnail">thumbnail</label>
       <input type="radio" id="flickr_photo_size_small" name="flickr_photo_size" value="small">
       <label for="flickr_photo_size_small">small</label>
+      <input type="radio" id="flickr_photo_size_small320" name="flickr_photo_size" value="small 320">
+      <label for="flickr_photo_size_small320">small 320</label>
       <input type="radio" id="flickr_photo_size_medium" name="flickr_photo_size" value="medium" checked="true">
       <label for="flickr_photo_size_medium">medium</label>
       <input type="radio" id="flickr_photo_size_medium640" name="flickr_photo_size" value="medium 640">
       <label for="flickr_photo_size_medium640">medium 640</label>
+      <input type="radio" id="flickr_photo_size_medium800" name="flickr_photo_size" value="medium 800">
+      <label for="flickr_photo_size_medium800">medium 800</label>
       <input type="radio" id="flickr_photo_size_large" name="flickr_photo_size" value="large">
       <label for="flickr_photo_size_large">large</label>
     </div>

data/plugin/google_map.rb

@@ -58,7 +58,7 @@ end
 
 add_header_proc do
    if /\A(?:latest|day|month|nyear|preview)\z/ =~ @mode
-      %Q|<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=true"></script>\n|
+      %Q|<script type="text/javascript" src="//maps.google.com/maps/api/js?sensor=true"></script>\n|
    end
 end
 

data/plugin/image_gps.rb

@@ -68,15 +68,13 @@ def image( id, alt = 'image', thumbnail = nil, size = nil, place = 'photo' )
   google_maps_api_key = @conf['image_gps.google_maps_api_key']
   google_maps_api_key = '' if google_maps_api_key.nil?
   if (@conf['image_gps.map_link_url'].nil? || @conf['image_gps.map_link_url'].empty?)
-    map_link_url = '"http://maps.google.co.jp/maps?q=#{lat},#{lon}"'
+    map_link_url = '"//maps.google.co.jp/maps?q=#{lat},#{lon}"'
   else
     map_link_url = '"'+@conf['image_gps.map_link_url']+'"'
   end
 
   exif = ExifParser.new("#{@image_dir}/#{image}".untaint) rescue nil
 
-  google = "http://maps.google.co.jp"
-
   if exif
     #GPS Info
     begin
@@ -103,7 +101,7 @@ def image( id, alt = 'image', thumbnail = nil, size = nil, place = 'photo' )
     }
     unless lat.nil?
       unless google_maps_api_key == ''
-        map_img = %Q["http://maps.googleapis.com/maps/api/staticmap?format=gif&]
+        map_img = %Q["//maps.googleapis.com/maps/api/staticmap?format=gif&]
         map_img += %Q[center=#{lat},#{lon}&zoom=14&size=200x200&markers=#{lat},#{lon}&]
         map_img += %Q[key=#{google_maps_api_key}&sensor=false"]
       end

data/plugin/ja/flickr.rb

@@ -18,7 +18,7 @@ add_conf_proc('flickr', 'Flickr プラグイン') do
     <dt>画像ID</dt>
       <dd>それぞれの写真に一意に付けられる番号です。<br>画像IDは Flickr で画像を表示したときの URL に含まれています。</dd>
     <dt>画像サイズ</dt>
-      <dd>表示する画像の大きさを square, thumbnail, small, medium, large から指定します。<br>この値は省略できます。省略すると、画像は設定画面（この画面）で指定したサイズで表示されます。</dd>
+      <dd>表示する画像の大きさを square, large square, thumbnail, small, small 320, medium, medium 640, medium 800, large から指定します。<br>この値は省略できます。省略すると、画像は設定画面（この画面）で指定したサイズで表示されます。</dd>
   </dl>
 
   <h3>標準の画像サイズ</h3>
@@ -26,7 +26,7 @@ add_conf_proc('flickr', 'Flickr プラグイン') do
   <p>
   <select name="flickr.default_size">
   _HTML
-  %w(square thumbnail small medium large).each do |size|
+  %w(square large\ square thumbnail small small\ 320 medium medium\ 640 medium\ 800 large).each do |size|
     selected = (size == @conf['flickr.default_size']) ? 'selected' : ''
     r << %Q|<option value="#{size}" #{selected}>#{size}</option>|
   end

data/plugin/slideshow.rb

@@ -0,0 +1,20 @@
+#
+# slideshow.rb : tDiary plugin for show slides
+#
+# Copyright (C) 2016 TADA Tadashi
+# Distributed under the GPL2 or any later version.
+#
+# @options['slideshow.css'] = "URL of CSS"
+#
+
+enable_js('slideshow.js')
+
+def slideshow
+	%Q|<button class="slideshow">Start Slideshow &gt;&gt;</button>|
+end
+
+if @conf['slideshow.css']
+	add_header_proc do
+		%Q[<link rel="stylesheet" href="#{h @conf['slideshow.css']}" media="screen">]
+	end
+end

data/plugin/socialbutton.rb

@@ -25,13 +25,6 @@ def socialbutton_js_settings
 	add_js_setting('$tDiary.plugin.socialbutton.options', options)
 end
 
-socialbutton_footer = Proc.new { %Q|<div class="socialbuttons"></div>| }
-if respond_to?(:blogkit?) && blogkit?
-	add_body_leave_proc(socialbutton_footer)
-else
-	add_section_leave_proc(socialbutton_footer)
-end
-
 add_conf_proc('socialbutton', @socialbutton_label_conf) do
 	@conf['socialbutton.enables'] ||= []
 	if @mode == 'saveconf'
@@ -56,5 +49,14 @@ add_conf_proc('socialbutton', @socialbutton_label_conf) do
 	HTML
 end
 
-# load javascript
-socialbutton_js_settings()
+if @mode =~ /^(latest|day|month|nyear)$/
+	socialbutton_footer = Proc.new { %Q|<div class="socialbuttons"></div>| }
+	if respond_to?(:blogkit?) && blogkit?
+		add_body_leave_proc(socialbutton_footer)
+	else
+		add_section_leave_proc(socialbutton_footer)
+	end
+
+	# load javascript
+	socialbutton_js_settings()
+end

data/plugin/steam.rb

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# steam.rb $Revision: 1.0 $
+#
+# 概要:
+# steam(store.steampowered.com)のゲームのウィジェットを
+# 貼るプラグインです。
+#
+# 使い方:
+# steamの任意のゲームのID(store.steampowered.com/app/{id})
+# を指定することにより、ウィジェットが貼り付けられます。
+#
+# Copyright (c) 2016 kp <kp@mmho.net>
+# Distributed under the GPL
+#
+
+=begin ChangeLog
+=end
+
+def steam( id )
+   %Q[<iframe src="//store.steampowered.com/widget/#{id}/" frameborder="0" width="646" height="190" style="max-width:100%;"></iframe>]
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -193,9 +193,9 @@ files:
 - js/nicovideo.js
 - js/picasa.js
 - js/plugin_checker.js
-- js/preview.js
 - js/referer.js
 - js/show_and_hide.js
+- js/slideshow.js
 - js/socialbutton.js
 - js/twitter_anywhere.js
 - js/yahoo_kousei.js
@@ -317,7 +317,6 @@ files:
 - plugin/plugin_checker.rb
 - plugin/popit.rb
 - plugin/prettify.rb
-- plugin/preview.rb
 - plugin/prezi.rb
 - plugin/profile.rb
 - plugin/puboo.rb
@@ -340,8 +339,10 @@ files:
 - plugin/select_theme.rb
 - plugin/show_and_hide.rb
 - plugin/slideshare.rb
+- plugin/slideshow.rb
 - plugin/socialbutton.rb
 - plugin/squeeze.rb
+- plugin/steam.rb
 - plugin/tatsu_zine.rb
 - plugin/tdiarytimes2.rb
 - plugin/tdiarytimes_flashstyle.rb
@@ -502,7 +503,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package

data/js/preview.js

@@ -1,50 +0,0 @@
-/*
- * preview.js: view preview automatically
- *
- * Copyright (c) MATSUOKA Kohei <http://www.machu.jp/>
- * Distributed under the GPL2 or any later version.
- */
-$(function() {
-
-var previewButton = $('input[name="appendpreview"]');
-
-$tDiary.plugin.preview = function() {
-  previewButton.prop("disabled", true);
-  $.post(
-    'update.rb',
-    $('form.update').serialize() + "&appendpreview=1",
-    function(data) {
-      var beforeOffset = $('div.update').offset();
-      $('div.autopagerize_page_element').replaceWith(
-        $(data).find('div.autopagerize_page_element')
-      )
-      var afterOffset = $('div.update').offset();
-      // 自動更新時にスクロール位置を自動調整してみたがカクカクする
-      // window.scrollTo($(window).scrollLeft(),
-      //   $(window).scrollTop() + afterOffset.top - beforeOffset.top);
-      setTimeout($tDiary.plugin.preview, 10000);
-    },
-    'html'
-  )
-  .always(function() {
-    previewButton.prop("disabled", false);
-  });
-}
-
-if ($('div.autopagerize_page_element').length == 0) {
-  $('div.update').before(
-    $('<div class="autopagerize_page_element"></div>')
-  );
-}
-
-// プレビューボタンを押した時もajaxで更新するよう設定
-previewButton.click(
-  function(event) {
-    event.preventDefault();
-    $tDiary.plugin.preview();
-  }
-);
-
-setTimeout($tDiary.plugin.preview, 10000);
-
-});

data/plugin/preview.rb

@@ -1,10 +0,0 @@
-# -*- coding: utf-8; -*-
-#
-# preview.rb: view preview automatically
-#
-# Copyright (c) MATSUOKA Kohei <http://www.machu.jp/>
-# Distributed under the GPL2 or any later version.
-#
-if /\A(form|edit|preview)\z/ === @mode then
-	enable_js('preview.js')
-end