tdiary-contrib 5.0.6 → 5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a05b3f25047b6bc6e9017c6c7994464cefac13fd
-  data.tar.gz: c95af7773f37e017db01f658171af17335a47586
+SHA256:
+  metadata.gz: 83f450ca5f0bd73c888d7495ed05323b5104d3f67c3ca8f077dbf64e61409aa5
+  data.tar.gz: 4d6f9afd972dd55417dd82ea98f57a0acbd3bda8db2637ceecdd1edd84907c09
 SHA512:
-  metadata.gz: 3ea47a5edc86322387c752dc256a9510e1871218a67ab1880aac45a2773e71462378c970547c4fdb489dc3e0c2d7bfd8d72097172ca21623e7fea07592608413
-  data.tar.gz: 765627b88d1e2e0f64b5249ad8aa26477f357396c250fdbd6491e5f786416a2fbceb7b963e0395d0e39bcf9027111d5e9abe9966deb11b74ac524cf779ba3ce6
+  metadata.gz: d6330a3ef7dd885b07b75ddd3d16ca8b4c9857a52b596c5c8dba6f5121ced57b5c30833c10df38f47497696a54d397f0c3ee7424ae8441cc29f95a1196faa576
+  data.tar.gz: 621078f662b39ffa102b0a08df3717450fed12542465c4f9e75e70ad7bb09f5d125e9951529d00c377c33ebfb7b5c787e344a84286cededb31b71c68a27a4f09

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.0.6"
+    VERSION = "5.0.7"
   end
 end

data/plugin/comment_pushbullet.rb

@@ -26,7 +26,7 @@
 # You can distribute this file under the GPL2 or any later version.
 #
 def comment_pushbullet
-	require 'pushbullet'
+	require 'pushbullet_ruby'
 
 	header = (@conf['comment_mail.header'] || '').dup
 	header << ":#{@conf.date_format}" unless /%[a-zA-Z%]/ =~ header
@@ -35,8 +35,9 @@ def comment_pushbullet
 	body = @comment.body.sub( /[\r\n]+\Z/, '' )
 	link = @conf.base_url + anchor(@date.strftime('%Y%m%d')) + '#c' + "%02d"%serial
 
-	Pushbullet.api_token = @conf['comment_pushbullet.access_token']
-	Pushbullet::Contact.me.push_link(title,link,body)
+	client = PushbulletRuby::Client.new(@conf['comment_pushbullet.access_token'])
+	params = {title: title, url: link, body: body}
+	client.push_link(id: client.me, params: params)
 end
 
 add_update_proc do

data/plugin/en/nicovideo.rb

@@ -5,10 +5,6 @@
 # Distributed under GPL.
 #
 
-def nicovideo_player_path
-	'http://www.nicovideo.jp'
-end
-
 def nicovideo_feed( i )
 	<<-HTML
 		<table border="0" cellpadding="4" cellspacing="0" summary="#{h i[:title]}"><tr valign="top">

data/plugin/google_photos.rb

@@ -9,7 +9,7 @@ def google_photos(src, width, height, alt="photo", place="photo", scale=nil)
 	scale = scale || @conf['google_photos.scale'] || 100
 	width = width.to_i * (scale.to_f / 100)
 	height = height.to_i * (scale.to_f / 100)
-	%Q|<img title="#{alt}" width="#{width}" height="#{height}" alt="#{alt}" src="#{src}" class="#{place} google">|
+	%Q|<img title="#{alt}" width="#{width.to_i}" height="#{height.to_i}" alt="#{alt}" src="#{src}" class="#{place} google">|
 end
 
 def google_photos_left(src, width, height, alt="photo", scale=nil)

data/plugin/ja/nicovideo.rb

@@ -5,10 +5,6 @@
 # Distributed under GPL.
 #
 
-def nicovideo_player_path
-	'http://www.nicovideo.jp'
-end
-
 def nicovideo_feed( i )
 	<<-HTML
 		<table border="0" cellpadding="4" cellspacing="0" summary="#{h i[:title]}"><tr valign="top">

data/plugin/nicovideo.rb

@@ -73,17 +73,12 @@ def nicovideo_iframe( video_id )
 	%Q|<iframe src="http://www.nicovideo.jp/thumb/#{video_id}" scrolling="no" style="border:1px solid #CCC;" frameborder="0"><a href="http://www.nicovideo.jp/watch/#{video_id}">#{label || 'link for nicovideo'}</a></iframe>\n|
 end
 
-def nicovideo_player( video_id, size = [544,384] )
+def nicovideo_player(video_id, size = [640,360])
 	if feed?
-		nicovideo( video_id )
-	elsif base_url =~ /\Ahttps:/
 		nicovideo(video_id)
 	else
-		q = ''
-		if size then
-			q = "?w=#{h size[0]}&amp;h=#{h size[1]}"
-		end
-		%Q|<script type="text/javascript" src="#{nicovideo_player_path}/thumb_watch/#{video_id}#{q}"></script>|
+		q = size ? "?w=#{h size[0]}&amp;h=#{h size[1]}" : ''
+		%Q|<script type="application/javascript" src="https://embed.nicovideo.jp/watch/#{video_id}/script#{q}"></script>|
 	end
 end
 
@@ -93,16 +88,15 @@ def nicovideo( video_id, label = nil, link = nil )
 		r << %Q|<div id="thumbnail-#{video_id}">|
 		api = nicovideo_call_api( video_id )
 		thumb = @conf.to_native( nicovideo_inline( video_id, api, label, link ), 'UTF-8' )
-		thumb.gsub!( /"INLINE_PLAYER"/, %Q|"#" onclick="return nicovideoPlayer( '#{video_id}' );"| )
 		r << thumb
 		r << '</div>'
 		if feed?
 			r.gsub!( /<a(?:[ \t\n\r][^>]*)?>/, '' )
 			r.gsub!( %r{</a[ \t\n\r]*>}, '' )
-		elsif base_url !~ /\Ahttps:/
+		else
 			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] )
+			r << nicovideo_player(video_id, [640,360])
 			r << %Q|</a>|
 			r << %Q|<div class="nicovideo-player-close" style="margin:4px;padding:8px;">|
 			r << %Q|<a href="#" onclick="return nicovideoThumbnail( '#{video_id}' )" style="background-color:black; color:white; margin:2px; padding:8px; border-color:white; border-radius:6px; border-width:2px; border-style:solid; text-decoration:none;">▲CLOSE PLAYER</a>|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.0.7
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-pushbullet
+  name: pushbullet_ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -506,7 +506,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package