tdiary-contrib 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a618c3a15f193c43756a0bb8ecd1df26e9d317a6
-  data.tar.gz: d0a68910bcda472a2d9f056378f0d90157420b75
+  metadata.gz: 3d47b569ca7f9fe177f670b8e60ba493b80831ce
+  data.tar.gz: 1575e8d48b554035e7d7d806eefaa8c64fcf909f
 SHA512:
-  metadata.gz: c7b58f2bef33ed390c5d7de5159991a6b114eec164f1e18b0ad758cfc6c6d0ffe2b6dd7f12f240da6551d942a08c5b9d973cb2b077a92ace9fa3285e20e005d2
-  data.tar.gz: e3245824b3d1f11295fd172e0043dc7f5ea46d3fd5876ea2b1ed89406af74adbe20c92ce229175c28d3db06869338f89a0dead941d5c1728e037c847aaf308d1
+  metadata.gz: 41cd6a1edd86c27e2e6412fc6a737f1759da17be066d82df9b4e97b382fbda663544fd939b2c98aaa6d30ddfcb2bb883c420d81adb7284dcc404b26d69cd8d78
+  data.tar.gz: 759786b536e9c10d7cd495de44bb90d80f34a6923199765019ded3f689ff46eeeff983ae60f52e7dbdd6eb0fd9c3a6a95f2a44529e937ae8807b796299e273bb

data/js/appstore.js

@@ -88,7 +88,7 @@ $( function() {
 	};
 
 	// for AutoPagerize
-	$(window).bind('AutoPagerize_DOMNodeInserted', function(event) {
+	$(window).on('AutoPagerize_DOMNodeInserted', function(event) {
 		appstore(event.target);
 	});
 	

data/js/google_photos.js

@@ -0,0 +1,63 @@
+$(function() {
+  var developerKey = $tDiary.plugin.google_photos.api_key;
+  var clientId = $tDiary.plugin.google_photos.client_id;
+  var oauthToken;
+
+  if (!developerKey || !clientId) {
+    $('#google_photos').after($('<p>設定画面でAPIキーとクライアントIDを登録してください</p>'));
+    return false;
+  }
+
+  gapi.load('auth',
+    { callback: function() { console.debug('load auth function') } });
+  gapi.load('picker',
+    { callback: function() { console.debug('load picker function') } });
+
+  $('#google_photos').click(function() {
+    if (oauthToken) {
+      createPicker();
+    } else {
+      authentication();
+    }
+  });
+
+  function authentication() {
+    window.gapi.auth.authorize(
+    {
+      'client_id': clientId,
+      'scope': ['https://www.googleapis.com/auth/photos'],
+      'immediate': false
+    },
+    function(authResult) {
+      if (!authResult || authResult.error) {
+        console.error('[google_photos] authentication faild');
+        return false;
+      }
+      oauthToken = authResult.access_token;
+      createPicker();
+    });
+  }
+
+  function createPicker() {
+    var picker = new google.picker.PickerBuilder()
+      .addView(new google.picker.PhotosView()
+        .setType(google.picker.PhotosView.Type.UPLOADED))
+      .addView(google.picker.ViewId.PHOTOS)
+      .addView(google.picker.ViewId.PHOTO_UPLOAD)
+      .setOAuthToken(oauthToken)
+      .setDeveloperKey(developerKey)
+      .setLocale('ja')
+      .setCallback(pickerCallback)
+      .build();
+    picker.setVisible(true);
+  }
+
+  function pickerCallback(data) {
+    if (data[google.picker.Response.ACTION] == google.picker.Action.PICKED) {
+      var doc = data[google.picker.Response.DOCUMENTS][0];
+      var image = doc.thumbnails[doc.thumbnails.length - 1];
+      var tag = $.makePluginTag("google_photos '" + image.url + "', '" + image.width + "', '" + image.height + "'");
+      $('#body').insertAtCaret(tag);
+    }
+  }
+});

data/js/image_ex.js

@@ -64,13 +64,13 @@ $(function() {
 
 	if ($(window).width() <= 360) {
 		$(document).ready(function() {
-			$("img.image-ex").bind("load", function() {
+			$("img.image-ex").on("load", function() {
 				resizeImage(this);
 			});
 		});
 
 		// for when images have been cached
-		$(window).bind("load", function() {
+		$(window).on("load", function() {
 			$("img.image-ex").each(function() {
 				resizeImage(this);
 			});

data/js/jquery.socialbutton.js

@@ -293,7 +293,7 @@ $.fn.socialbutton = function(service, options) {
 		}
 	};
 
-	var max_index = this.size() - 1;
+	var max_index = this.length - 1;
 
 	return this.each(function(index) {
 

data/js/show_and_hide.js

@@ -16,7 +16,7 @@ $( function() {
 	};
 	
 	// for AutoPagerize
-	$(window).bind('AutoPagerize_DOMNodeInserted', function(event) {
+	$(window).on('AutoPagerize_DOMNodeInserted', function(event) {
 		show_and_hide(event.target);
 	});
 	

data/js/socialbutton.js

@@ -92,7 +92,7 @@ $(function() {
         return bottom > $(this).offset().top;
       })
       .filter(function() {
-        return $(this).find('.socialbutton').size() == 0
+        return $(this).find('.socialbutton').length == 0
       })
       .each(function() {
         var anchor = $(this).find('h3 a');
@@ -100,7 +100,7 @@ $(function() {
           var link = $(this).children('h2').find('a:first').get(0);
           var url = link ? link.href : document.URL;
           var title = $(this).children('h2').find('.title').text();
-        } else if (anchor.size() == 0) {
+        } else if (anchor.length == 0) {
           // The section may not have an anchor on etdiary style.
           // https://github.com/tdiary/tdiary-contrib/issues/59
           var url = ($(this).parents('.day').find('h2 a:first').get(0)||'').href;
@@ -129,7 +129,7 @@ $(function() {
     });
   }
 
-  $(window).bind('scroll', function(event) {
+  $(window).on('scroll', function(event) {
     socialbutton(document);
   });
 

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.0.4"
+    VERSION = "5.0.5"
   end
 end

data/plugin/en/profile.rb

@@ -0,0 +1,13 @@
+#
+# profile.rb: english resource of profile plugin for tDiary
+#
+# Copyright (C) 2017 by Tada, Tadashi <t@tdtds.jp>
+# Distributed under the GPL.
+#
+module ::Profile
+	module Service
+		class Gravatar < Base
+			HOST = 'en.gravatar.com'
+		end
+	end
+end

data/plugin/google_photos.rb

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+# show Google Photos
+#
+# Copyright (c) MATSUOKA Kohei <http://www.machu.jp/>
+# Distributed under the GPL
+#
+
+def google_photos(src, width, height, alt="photo", place="photo")
+	%Q|<img title="#{alt}" width="#{width}" height="#{height}" alt="#{alt}" src="#{src}" class="#{place} google">|
+end
+
+def google_photos_left(src, width, height, alt="photo")
+	google_photos(src, width, height, alt, 'left')
+end
+
+def google_photos_right(src, width, height, alt="photo")
+	google_photos(src, width, height, alt, 'right')
+end
+
+if /\A(form|edit|preview|showcomment)\z/ === @mode then
+  enable_js('google_photos.js')
+  add_js_setting('$tDiary.plugin.google_photos')
+  add_js_setting('$tDiary.plugin.google_photos.api_key', @conf['google_photos.api_key'].to_json)
+  add_js_setting('$tDiary.plugin.google_photos.client_id', @conf['google_photos.client_id'].to_json)
+
+  add_footer_proc do
+    '<script type="text/javascript" src="https://apis.google.com/js/api.js?onload=onApiLoad"></script>'
+  end
+end
+
+add_edit_proc do |date|
+  <<-FORM
+	<div class="google_photos">
+		<input id="google_photos" type="button" value="Googleフォト"></input>
+	</div>
+  FORM
+end
+
+add_conf_proc('google_photos', 'Googleフォト') do
+  if @mode == 'saveconf'
+    @conf['google_photos.api_key'] = @cgi.params['google_photos.api_key'][0]
+    @conf['google_photos.client_id'] = @cgi.params['google_photos.client_id'][0]
+  end
+
+  r = <<-_HTML
+	<h3>概要</h3>
+	<p>Googleフォトの写真を日記に表示します。</p>
+	<h3>機能</h3>
+	<ul>
+		<li>Googleフォトの写真を選択して日記に貼り付ける</li>
+		<li>PC上の写真をGoogleフォトへアップロードする</li>
+	</ul>
+	<h3>制約事項</h3>
+	<ul>
+		<li>サムネイルを使用しているため、サイズが512pxまでしか表示できません</li>
+	</ul>
+	<h3>使い方</h3>
+	<p>
+		このプラグインを使うためには、Google Developers ConsoleからAPIキーと認証用クライアントIDを取得する必要があります。
+		手順は<a href="https://www.evernote.com/shard/s18/sh/7211b9c3-fb75-4af8-aa55-718ff6c81aac/77c3a51871f0f245">Googleフォトプラグインを利用するためのAPIキーとクライアントIDの取得手順</a>を参考にしてください。
+	</p>
+	<h3>APIキー</h3>
+	<p><input type="text" name="google_photos.api_key" size="100" value="#{@conf['google_photos.api_key']}"></p>
+	<h3>認証用クライアントID</h3>
+	<p><input type="text" name="google_photos.client_id" size="100" value="#{@conf['google_photos.client_id']}"></p>
+_HTML
+end

data/plugin/mathjax.rb

@@ -10,14 +10,21 @@
 # Copyright (C) 2014 by Yuh Ohmura <http://yutopia.pussycat.jp/diary/>
 #
 =begin ChangeLog
+2017-06-05 Yuh Ohmura
+    * Modity MathJax address.
 2014-12-17 Yuh Ohmura
 	* created.
 =end
 add_header_proc do
 '<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({tex2jax: {inlineMath: [[\'$\',\'$\'], ["\\\\(","\\\\)"]]}});
+  MathJax.Hub.Config({
+    tex2jax: {
+       inlineMath: [[\'$\',\'$\'], ["\\\\(","\\\\)"]],
+       processEscapes: true
+    }
+  }
+);
 </script>
-<script type="text/javascript"
-  src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+<script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS_CHTML">
 </script>'
 end

data/plugin/nicovideo.rb

@@ -23,7 +23,7 @@
 require 'net/http'
 require 'timeout'
 
-enable_js( 'nicovideo.js' )
+enable_js('nicovideo.js') unless base_url =~ /\Ahttps:/
 
 def nicovideo_call_api( video_id )
 	uri = "http://ext.nicovideo.jp/api/getthumbinfo/#{video_id}"
@@ -76,6 +76,8 @@ end
 def nicovideo_player( video_id, size = [544,384] )
 	if feed?
 		nicovideo( video_id )
+	elsif base_url =~ /\Ahttps:/
+		nicovideo(video_id)
 	else
 		q = ''
 		if size then
@@ -97,7 +99,7 @@ def nicovideo( video_id, label = nil, link = nil )
 		if feed?
 			r.gsub!( /<a(?:[ \t\n\r][^>]*)?>/, '' )
 			r.gsub!( %r{</a[ \t\n\r]*>}, '' )
-		else
+		elsif base_url !~ /\Ahttps:/
 			r << %Q|<div id="player-#{video_id}" style="display:none;background-color:#000;margin-left:2em;padding-bottom:4px;">|
 			r << %Q|<a name="player-#{video_id}">|
 			r << nicovideo_player( video_id, [544,384] )

data/plugin/ogp.rb

@@ -20,34 +20,37 @@ def ogp_image(html)
 	end
 end
 
-add_header_proc do
+if defined? :ogp_tag && !defined? :ogp_tag_org
+	alias :ogp_tag_org :ogp_tag
+end
+
+def ogp_tag
+	ogp = ogp_tag_org || ''
 	headers = {
-		'og:title' => title_tag.match(/>([^<]+)</).to_a[1],
-		'og:site_name' => @conf.html_title,
-		'og:author' => @conf.author_name,
 		'fb:app_id' => @conf['ogp.facebook.app_id'],
 		'fb:admins' => @conf['ogp.facebook.admins']
 	}
 
 	if @mode == 'day'
+		# remove original og:image generated at 00default.rb
+		ogp.gsub!(/<meta property="og:image"[^>]+>\n/, '')
+
 		diary = @diaries[@date.strftime('%Y%m%d')]
 		if diary
 			sections = diary.instance_variable_get(:@sections)
 			section_index = @cgi.params['p'][0] || sections.size
-			section = sections[section_index.to_i - 1].body_to_html
-			section_html = apply_plugin(section)
+            begin
+				section = sections[section_index.to_i - 1].body_to_html
+				section_html = apply_plugin(section)
 
-			headers['og:description'] = ogp_description(section_html)
-			headers['og:image'] = ogp_image(section_html)
-			headers['og:type'] = 'article'
+				headers['og:description'] = ogp_description(section_html)
+				headers['og:image'] = ogp_image(section_html)
+            rescue
+            end
 		end
-	else
-		headers['og:description'] = @conf.description
-		headers['og:image'] = @conf.banner
-		headers['og:type'] = 'website'
 	end
 
-	headers.select {|key, val|
+	ogp + "\n" + headers.select {|key, val|
 		val && !val.empty?
 	}.map {|key, val|
 		%Q|<meta property="#{key}" content="#{CGI::escapeHTML(val)}">|

data/plugin/prettify.rb

@@ -3,15 +3,21 @@
 if /\A(?:latest|day|month|nyear)\z/ =~ @mode then
 	add_header_proc do
 		<<-HTML
-		<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" src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
 		<script type="text/javascript"><!--
+			var initPrettyPrint = function() {
+				var pres = document.querySelectorAll("div.body > div.section > pre");
+				Array.prototype.slice.call(pres).forEach(function(pre) {
+					pre.setAttribute("class", "prettyprint");
+				});
+				PR.prettyPrint();
+			};
 			if(window.addEventListener){
-				window.addEventListener("load", prettyPrint, false);
+				window.addEventListener("load", initPrettyPrint, false);
 			}else if(window.attachEvent){
-				window.attachEvent("onload", prettyPrint);
+				window.attachEvent("onload", initPrettyPrint);
 			}else{
-				window.onload=prettyPrint;
+				window.onload=initPrettyPrint;
 			}
 		// --></script>
 		HTML

data/plugin/profile.rb

@@ -113,9 +113,10 @@ module ::Profile
 
 		# gravatar.com
 		class Gravatar < Base
+			HOST = 'ja.gravatar.com' unless const_defined?(:HOST)
 			endpoint {|id|
 				hash = Digest::MD5.hexdigest(id.downcase)
-				"https://www.gravatar.com/#{hash}.json"
+				"https://#{HOST}/#{hash}.json"
 			}
 
 			def image

data/plugin/puboo.rb

@@ -34,7 +34,7 @@ def puboo( id, doc = nil )
 	end
 
 	link = "http://p.booklog.jp/book/#{id}"
-	doc ||= open( link ).read
+	doc ||= open( link ).read.force_encoding('UTF-8')
 	title = doc.match(%r|<meta property="og:title"\s*content="(.*)"|).to_a[1]
 	image = doc.match(%r|<meta property="og:image"\s*content="(.*)"|).to_a[1]
 	price = doc.match(%r|<th class="th_2">価格</th>.*?<span>(.*?)</span>.*?<br />|m).to_a[1]
@@ -55,7 +55,7 @@ EOS
 
 	puboo_cache_set( id, result ) unless @conf.secure
 	result
-rescue
+rescue 
 	link
 end
 

data/plugin/tatsu_zine.rb

@@ -32,12 +32,12 @@ def tatsu_zine( id, doc = nil )
 		return result
 	end
 
-	link = "http://tatsu-zine.com/books/#{id}"
-	doc ||= open( link ).read
+	link = "https://tatsu-zine.com/books/#{id}"
+	doc ||= open(link, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read
 	title = doc.match(%r|<meta property="og:title" content="(.*)">|).to_a[1]
 	image = doc.match(%r|<meta property="og:image" content="(.*)">|).to_a[1]
-	price = doc.match(%r|<meta name="twitter:data2" content="(.*)JPY">|).to_a[1]
-	author = doc.match(%r|<meta name="twitter:data1" content="(.*)">|).to_a[1]
+	price = doc.match(%r|span itemprop="price">(.*)</span>|).to_a[1]
+	author = doc.match(%r|<p itemprop="author" class="author">(.*)</p>|).to_a[1]
 
 	result = <<-EOS
 	<a class="amazon-detail" href="#{h link}"><span class="amazon-detail">
@@ -54,7 +54,8 @@ EOS
 
 	tatsu_zine_cache_set( id, result ) unless @conf.secure
 	result
-rescue
+rescue => e
+	@logger.error(e)
 	link
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -187,6 +187,7 @@ files:
 - js/datepicker.js
 - js/editor.js
 - js/flickr.js
+- js/google_photos.js
 - js/hide_sidebar_smartphone.js
 - js/image_ex.js
 - js/jquery.socialbutton.js
@@ -241,6 +242,7 @@ files:
 - plugin/en/microsummary.rb
 - plugin/en/nicovideo.rb
 - plugin/en/openid.rb
+- plugin/en/profile.rb
 - plugin/en/section_footer.rb
 - plugin/en/section_footer2.rb
 - plugin/en/socialbutton.rb
@@ -255,6 +257,7 @@ files:
 - plugin/google_adsense.rb
 - plugin/google_analytics.rb
 - plugin/google_map.rb
+- plugin/google_photos.rb
 - plugin/google_sitemaps.rb
 - plugin/google_universal_analytics.rb
 - plugin/google_webmaster.rb