tdiary-contrib 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d262d84bca36f6a339c14c533b6ca4aa501d05265ccf12302e6e150904115a32
-  data.tar.gz: 37dfe05808d551ab064233f0c74b39ed18a5b9daa8c4ebaadea6c7270a20b41d
+  metadata.gz: 6d05b8aee451bdb2d46f614f71ecf05c5a1fbea55cc10128f33afbaa78ee891a
+  data.tar.gz: c38b151fd3e0bda3b739b5559edad2314ec9babae98aed542e4ad6a3c47ec2fb
 SHA512:
-  metadata.gz: 2878acca923e00de23074f88283047c0f9e8aa1d75d2406fcf1a02fb4c8f23d68b6f3c913908cef6affe697f2b67f2744e1b615dd3c0693bb6aad38b37c475fe
-  data.tar.gz: 51c5cddf7db092060fb5e23676443ef6035611e1d81a2c4747541855440a4d86b1bc667aeef160444136652bd60b90ef96388c72e61805abe3e3616232c4bcb6
+  metadata.gz: 86cc1a3bd5df50b9f013c337674728462953142d1c0edac978f59a41e42d2b721a725f3b62bd27baab1b7bf8b00d54c14210d99e50518023746538cf29de51ce
+  data.tar.gz: a81df14d1727012e4c306d1d8c1c4f4ce5878a70f3f6f9bac14f8d9ec988a2c24d19a4c50de395be8a8b0d8edeb17861988b23a7b09828a768a3397000654e5a

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.1.0"
+    VERSION = "5.1.1"
   end
 end

data/plugin/add_bookmark.rb

@@ -20,7 +20,7 @@ add_subtitle_proc do |date, index, subtitle|
 	section_url = @conf.base_url + anchor(date.strftime('%Y%m%d')) + '#p' + ('%02d' % index)
 
 	if @conf['add.bookmark.delicious'] == 't' then
-		escaped_url = URI.escape(section_url, /[^-.!~*'()\w]/n)
+		escaped_url = CGI.escape(section_url, /[^-.!~*'()\w]/n)
 		caption += %Q|<a href="http://delicious.com/save?url=#{escaped_url}" onclick="window.open('http://delicious.com/save?v=5;noui;jump=close;url=#{escaped_url};title='+encodeURIComponent(document.title), 'delicious', 'toolbar=no,width=550,height=550'); return false">|
 		caption += %Q|<img src="http://static.delicious.com/img/delicious.small.gif" width="10" height="10" style="border: 0 none;vertical-align: middle;" alt="#{@caption_delicious}">|
 		caption += %Q|</a> |

data/plugin/instagram.rb

@@ -10,7 +10,6 @@ require 'uri'
 require 'net/http'
 require 'open-uri'
 
-
 def instagram(*args)
    uri = URI::parse(args[0])
    return instagram_iframe(*args) if uri.scheme.nil?
@@ -19,7 +18,9 @@ end
 
 def instagram_iframe(code, width=612, height=700)
   return <<-BODY
-<iframe src="//instagram.com/p/#{code}/embed/" width="#{width}" height="#{height}" frameborder="0" scrolling="no" allowtransparency="true"></iframe>
+   <div class="embed embed-instagram">
+   <iframe src="//instagram.com/p/#{code}/embed/" width="#{width}" height="#{height}" frameborder="0" scrolling="no" allowtransparency="true"></iframe>
+   </div>
   BODY
 end
 

data/plugin/my_hotentry.rb

@@ -39,7 +39,7 @@ class MyHotEntry
     # RSSを取得
     rss = nil
     rss_url = 'http://b.hatena.ne.jp/entrylist?mode=rss&url='
-    rss_url << URI.escape(base_url, /[^-.!~*'()\w]/n)
+    rss_url << CGI.escape(base_url)
     rss_url << "&sort=#{options[:sort]}&threshold=#{options[:threshold]}"
     begin
       Timeout.timeout(5) do

data/plugin/notify_miniblog.rb

@@ -53,7 +53,7 @@ def notify_miniblog
 
 	# strip category
 	sectitle.gsub!(/\[[^\]]+\] */, '')
-	url = URI.encode(@conf.base_url + anchor("#{date}p%02d" % index), /[^-.!~*'()\w]/n)
+	url = CGI.escape(@conf.base_url + anchor("#{date}p%02d" % index), /[^-.!~*'()\w]/n)
 	prefix = @conf['miniblog.notify.prefix']
 	format = @conf['miniblog.notify.format']
 	source = 'tdiary/notify_miniblog.rb'

data/plugin/tweet_quote.rb

@@ -41,11 +41,11 @@ def twitter_statuses_show_api( tweet_id )
 		:oauth_token => @conf["twitter_quote.oauth_token"],
 		:oauth_version => "1.0"
 	}
-	data = "GET&#{URI.escape( url, unsafe )}&"
-	data << URI.escape( oauth_parameters.merge( parameters ).sort.map{|k, v| "#{k}=#{v}" }.join( "&" ), unsafe )
+	data = "GET&#{CGI.escape( url, unsafe )}&"
+	data << CGI.escape( oauth_parameters.merge( parameters ).sort.map{|k, v| "#{k}=#{v}" }.join( "&" ), unsafe )
 	oauth_parameters[:oauth_signature] = [OpenSSL::HMAC.digest(
 		OpenSSL::Digest::SHA1.new,
-		URI.escape( "#{@conf["twitter_quote.oauth_consumer_secret"]}&#{@conf["twitter_quote.oauth_token_secret"]}" ),
+		CGI.escape( "#{@conf["twitter_quote.oauth_consumer_secret"]}&#{@conf["twitter_quote.oauth_token_secret"]}" ),
 		data
 	)].pack( "m" ).chomp
 
@@ -53,7 +53,7 @@ def twitter_statuses_show_api( tweet_id )
 	proxy = 'http://' + proxy if proxy
 
 	headers = {
-		"Authorization" => %Q[OAuth #{oauth_parameters.map{|k ,v| "#{URI.escape( k.to_s, unsafe )}=\"#{URI.escape( v, unsafe )}\""}.join( "," )}],
+		"Authorization" => %Q[OAuth #{oauth_parameters.map{|k ,v| "#{CGI.escape( k.to_s, unsafe )}=\"#{CGI.escape( v, unsafe )}\""}.join( "," )}],
 		:proxy => proxy
 	}
 	Timeout.timeout( 20 ) do

data/plugin/yahoo_kousei.rb

@@ -26,7 +26,7 @@ Net::HTTP.version_1_2
 def kousei_api( sentence )
 	appid = @conf['yahoo_kousei.appid']
 
-	query = "appid=#{appid}&sentence=#{URI.encode( sentence.gsub( /\n/, '' ) )}"
+	query = "appid=#{appid}&sentence=#{CGI.escape( sentence.gsub( /\n/, '' ) )}"
 	query << "&filter_group=" + @conf['yahoo_kousei.filter_group'] if @conf['yahoo_kousei.filter_group']
 	query << "&no_filter=" + @conf['yahoo_kousei.no_filter'] if @conf['yahoo_kousei.no_filter']
 

data/plugin/yo_update.rb

@@ -100,7 +100,7 @@ def yo_update_subscribers_count
 		raise YoUpdateError, "Yo API Key is not set"
 	end
 	req = Net::HTTP::Get.new(
-		URI("http://api.justyo.co/subscribers_count/?api_token=#{URI.escape(api_key)}")
+		URI("http://api.justyo.co/subscribers_count/?api_token=#{CGI.escape(api_key)}")
 	)
 	res = yo_update_access_api(req)
 	data = res.body

data/style/hatena_style.rb

@@ -844,7 +844,7 @@ class Hatena::Google
   end
 
   def convert(mode)
-    uri = 'http://www.google.com/search?q=%s&ie=euc-jp&oe=euc-jp' % URI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)
+    uri = 'http://www.google.com/search?q=%s&ie=euc-jp&oe=euc-jp' % CGI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)
     return uri unless @tag_p
     template=nil
     if mode == :CHTML
@@ -889,7 +889,7 @@ class Hatena::Keyword
   end
 
   def convert(mode)
-    uri = '%skeyword/%s' % [@group, URI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)]
+    uri = '%skeyword/%s' % [@group, CGI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)]
     return uri unless @tag_p
     template=nil
     if mode == :CHTML
@@ -958,7 +958,7 @@ class Hatena::AmazonSearch
   end
 
   def convert(mode)
-    uri = 'http://www.amazon.co.jp/exec/obidos/external-search?mode=blended&tag=%s&encoding-string-jp=%%c6%%fc%%cb%%dc%%b8%%ec&keyword=%s' % [Hatena.conf['amazon.aid'] || '', URI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)]
+    uri = 'http://www.amazon.co.jp/exec/obidos/external-search?mode=blended&tag=%s&encoding-string-jp=%%c6%%fc%%cb%%dc%%b8%%ec&keyword=%s' % [Hatena.conf['amazon.aid'] || '', CGI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)]
     return uri unless @tag_p
     template=nil
     if mode == :CHTML

data/util/tdiary-grep/grep.rb

@@ -439,7 +439,7 @@ def escape(str)
 end
 
 def escape_url(u)
-  escape(URI.encode(u))
+	escape(CGI.escape(u))
 end
 
 main

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2020-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -513,7 +513,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package