tdiary-contrib 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d05b8aee451bdb2d46f614f71ecf05c5a1fbea55cc10128f33afbaa78ee891a
-  data.tar.gz: c38b151fd3e0bda3b739b5559edad2314ec9babae98aed542e4ad6a3c47ec2fb
+  metadata.gz: 077a15f87d9312e2fd05c48aecdb4ea89bfeb7ef8e73b197eea443a0b628f75e
+  data.tar.gz: c488339e3f3dd2d99ea88d06e0f2fe35cebc7aa24dd3b66e5557e43535c3a392
 SHA512:
-  metadata.gz: 86cc1a3bd5df50b9f013c337674728462953142d1c0edac978f59a41e42d2b721a725f3b62bd27baab1b7bf8b00d54c14210d99e50518023746538cf29de51ce
-  data.tar.gz: a81df14d1727012e4c306d1d8c1c4f4ce5878a70f3f6f9bac14f8d9ec988a2c24d19a4c50de395be8a8b0d8edeb17861988b23a7b09828a768a3397000654e5a
+  metadata.gz: 6e438aaf3632d87cc666fd3d7f54b56e7962959501652f825cdf027b043e1c64540d5c0b382a92e88bdc8fb16d0f5146262664afc94a78650028b9173071bd6f
+  data.tar.gz: 3a31c1283e905e1880fe15f991ffc50c65eedf22a4471dad95b2b68a9af47f5fc2e75162617f5a2195fb0de9c9e328dfb6af276f3e83beda5484a4af2b318875

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.1.1"
+    VERSION = "5.1.2"
   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 = CGI.escape(section_url, /[^-.!~*'()\w]/n)
+		escaped_url = CGI.escape(section_url)
 		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/notify_miniblog.rb

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

data/plugin/tweet_quote.rb

@@ -29,7 +29,6 @@ end
 
 def twitter_statuses_show_api( tweet_id )
 	url = "https://api.twitter.com/1.1/statuses/show.json"
-	unsafe = /[^a-zA-Z0-9\-\.\_\~]/
 	parameters = {
 		:id => tweet_id
 	}
@@ -41,8 +40,8 @@ def twitter_statuses_show_api( tweet_id )
 		:oauth_token => @conf["twitter_quote.oauth_token"],
 		:oauth_version => "1.0"
 	}
-	data = "GET&#{CGI.escape( url, unsafe )}&"
-	data << CGI.escape( oauth_parameters.merge( parameters ).sort.map{|k, v| "#{k}=#{v}" }.join( "&" ), unsafe )
+	data = "GET&#{CGI.escape( url )}&"
+	data << CGI.escape( oauth_parameters.merge( parameters ).sort.map{|k, v| "#{k}=#{v}" }.join( "&" ) )
 	oauth_parameters[:oauth_signature] = [OpenSSL::HMAC.digest(
 		OpenSSL::Digest::SHA1.new,
 		CGI.escape( "#{@conf["twitter_quote.oauth_consumer_secret"]}&#{@conf["twitter_quote.oauth_token_secret"]}" ),
@@ -53,7 +52,7 @@ def twitter_statuses_show_api( tweet_id )
 	proxy = 'http://' + proxy if proxy
 
 	headers = {
-		"Authorization" => %Q[OAuth #{oauth_parameters.map{|k ,v| "#{CGI.escape( k.to_s, unsafe )}=\"#{CGI.escape( v, unsafe )}\""}.join( "," )}],
+		"Authorization" => %Q[OAuth #{oauth_parameters.map{|k ,v| "#{CGI.escape( k.to_s )}=\"#{CGI.escape( v )}\""}.join( "," )}],
 		:proxy => proxy
 	}
 	Timeout.timeout( 20 ) do

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' % CGI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)
+    uri = 'http://www.google.com/search?q=%s&ie=euc-jp&oe=euc-jp' % CGI.escape(@str)
     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, CGI.escape(@str, /[^-_.!~*'()a-zA-Z0-9]/)]
+    uri = '%skeyword/%s' % [@group, CGI.escape(@str)]
     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'] || '', CGI.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)]
     return uri unless @tag_p
     template=nil
     if mode == :CHTML

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary