tdiary-contrib 5.0.11 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0343f9efacec380a06456385bb96de2919b3e530f31e04e1843183fe68c362be
-  data.tar.gz: 1e45713addec8000837c6fe4dba4ea75d29ebd85126125704862f48e9b55afc5
+  metadata.gz: 077a15f87d9312e2fd05c48aecdb4ea89bfeb7ef8e73b197eea443a0b628f75e
+  data.tar.gz: c488339e3f3dd2d99ea88d06e0f2fe35cebc7aa24dd3b66e5557e43535c3a392
 SHA512:
-  metadata.gz: bd2567180fbc3b3ead53b48e3563a94f669d8ebf8b827fb228518177d82666251b5702f341f70ad7e8233b303cb7de257a0d783ab004b63254b88aa3413bd5c0
-  data.tar.gz: b5f8e36eb937d67a2db82c9bdb1d60fa7e8a2e2e9d50027ef8f30fa34235812313f96764961820dedaa5c370dd8b0c7f1744735f1e69f0a9e099b1b439ec191b
+  metadata.gz: 6e438aaf3632d87cc666fd3d7f54b56e7962959501652f825cdf027b043e1c64540d5c0b382a92e88bdc8fb16d0f5146262664afc94a78650028b9173071bd6f
+  data.tar.gz: 3a31c1283e905e1880fe15f991ffc50c65eedf22a4471dad95b2b68a9af47f5fc2e75162617f5a2195fb0de9c9e328dfb6af276f3e83beda5484a4af2b318875

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.0.11"
+    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 = URI.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/google_map.rb

@@ -1,174 +1,186 @@
 # -*- coding: utf-8 -*-
 #
 # google_map.rb - embeded Google Map for tDiary, use Google Maps JavaScript API V3.
-#                 http://code.google.com/intl/ja/apis/maps/documentation/v3/services.html
+#                 https://developers.google.com/maps/documentation/javascript/tutorial
 #
 # Copyright (C) 2010, tamoot <tamoot+tdiary@gmail.com>
 # You can redistribute it and/or modify it under GPL2.
 #
 
 def google_map(lat, lon, params = {})
-   params.merge!(:lat => lat, :lon => lon)
-   google_map_common(params)
+	params.merge!(:lat => lat, :lon => lon)
+	google_map_common(params)
 end
 
 def google_geomap(address, params = {})
-   params.merge!(:address => address)
-   google_map_common(params)
+	params.merge!(:address => address)
+	google_map_common(params)
 end
 
 def google_map_common(params)
-   params[:id]      ||= ''
-   params[:lat]     ||= 0.0
-   params[:lon]     ||= 0.0
-   params[:address] ||= nil
-   params[:zoom]    ||=  10
-   params[:html]    ||= nil
-   params[:title]   ||= nil
-   params[:width]   ||= 320
-   params[:height]  ||= 240
-   params[:type]    ||= :ROADMAP
-   params[:overview]||= false
-
-   if feed?
-      require 'cgi'
-
-      url = nil
-      if params[:lat].nonzero? && params[:lon].nonzero?
-         query = "#{params[:lat]},#{params[:lon]}"
-         url = %Q|http://maps.google.com/maps?q=#{CGI::escape(query)}|
-
-      elsif params[:address] != nil
-         query = params[:address]
-         url = %Q|http://maps.google.com/maps?q=#{CGI::escape(query)}|
-
-      end
-
-      return %Q|<a href="#{url}">#{url}</a>| if url
-
-   end 
-
-   dom_id = "#{@gmap_date.strftime("%Y%m%d")}_#{@gmap_count}"
-   params.merge!(:id => dom_id)
-   @gmap_data << params
-   @gmap_count += 1
-
-   %Q|<div class="gmap" id="#{dom_id}" style="width : #{params[:width]}px; height : #{params[:height]}px;"></div>|
+	params[:id]      ||= ''
+	params[:lat]     ||= 0.0
+	params[:lon]     ||= 0.0
+	params[:address] ||= nil
+	params[:zoom]    ||=  10
+	params[:html]    ||= nil
+	params[:title]   ||= nil
+	params[:width]   ||= 320
+	params[:height]  ||= 240
+	params[:type]    ||= :ROADMAP
+	params[:overview]||= false
+
+	if feed?
+		require 'cgi'
+
+		url = nil
+		if params[:lat].nonzero? && params[:lon].nonzero?
+			query = "#{params[:lat]},#{params[:lon]}"
+			url = %Q|https://maps.google.com/maps?q=#{CGI::escape(query)}|
+
+		elsif params[:address] != nil
+			query = params[:address]
+			url = %Q|https://maps.google.com/maps?q=#{CGI::escape(query)}|
+
+		end
+
+		return %Q|<a href="#{url}">#{url}</a>| if url
+
+	end 
+
+	dom_id = "#{@gmap_date.strftime("%Y%m%d")}_#{@gmap_count}"
+	params.merge!(:id => dom_id)
+	@gmap_data << params
+	@gmap_count += 1
+
+	%Q|<div class="gmap" id="#{dom_id}" style="width : #{params[:width]}px; height : #{params[:height]}px;"></div>|
 end
 
 add_header_proc do
-   if /\A(?:latest|day|month|nyear|preview)\z/ =~ @mode
-      %Q|<script type="text/javascript" src="//maps.google.com/maps/api/js?sensor=true"></script>\n|
-   end
+	if /\A(?:latest|day|month|nyear|preview)\z/ =~ @mode
+		%Q|<script type="text/javascript" src="//maps.google.com/maps/api/js?key=#{@conf['google_map.key']}"></script>\n|
+	end
 end
 
 add_body_enter_proc do |date|
-   @gmap_data  = []
-   @gmap_date  = date
-   @gmap_count = 0
-   ''
+	@gmap_data  = []
+	@gmap_date  = date
+	@gmap_count = 0
+	''
 end
 
 add_body_leave_proc do |date|
-   gmap_scripts = ''
-   if !feed? && @gmap_data.any?
-      gmap_scripts = %Q|<script type="text/javascript">\n<!--\n|
-      @gmap_data.each do |data|
-         if data[:address]
-            gmap_scripts << google_geomap_script(data)
-         else
-            gmap_scripts << google_map_script(data)
-         end
-      end
-      gmap_scripts << %Q|//-->\n</script>\n|
-   end
-   gmap_scripts
+	gmap_scripts = ''
+	if !feed? && @gmap_data.any?
+		gmap_scripts = %Q|<script type="text/javascript">\n<!--\n|
+		@gmap_data.each do |data|
+			if data[:address]
+				gmap_scripts << google_geomap_script(data)
+			else
+				gmap_scripts << google_map_script(data)
+			end
+		end
+		gmap_scripts << %Q|//-->\n</script>\n|
+	end
+	gmap_scripts
+end
+
+add_conf_proc('google_map', 'Google Maps', 'etc') do
+	if @mode == 'saveconf' then
+		@conf['google_map.key'], = @cgi.params['google_map.key']
+	end
+
+	<<-HTML
+	<h3 class="subtitle">Google Maps API Key</h3>
+	<p>API Key (see <a href="https://developers.google.com/maps/documentation/javascript/get-api-key">developers.google.com/maps</a>)</p>
+	<p><input name="google_map.key" value="#{h @conf['google_map.key']}" size="50"></p>
+	HTML
 end
 
 def google_map_script(hash)
-   str = ''
-   str << %Q|google.maps.event.addDomListener(window, 'load', function() {\n|
-   str << %Q|   var mapdiv = document.getElementById("#{hash[:id]}");\n|
-   str << %Q|   if(mapdiv){\n|
-   str << %Q|      var myOptions = {\n|
-   str << %Q|         zoom: #{hash[:zoom]},\n|
-   str << %Q|         overviewMapControl: #{hash[:overview]},\n|
-   str << %Q|         overviewMapControlOptions: {\n|
-   str << %Q|            opened: #{hash[:overview]}\n|
-   str << %Q|         },\n|
-   str << %Q|         center: new google.maps.LatLng(#{hash[:lat]}, #{hash[:lon]}),\n|
-   str << %Q|         mapTypeId: google.maps.MapTypeId.#{hash[:type]},\n|
-   str << %Q|         scaleControl: true\n|
-   str << %Q|      };\n|
-   str << %Q|      var gMap = new google.maps.Map(mapdiv, myOptions);\n|
-   # set Marker
-   if hash[:title]
-   str << %Q|      var marker = new google.maps.Marker({\n|
-   str << %Q|         position: new google.maps.LatLng(#{hash[:lat]}, #{hash[:lon]}),\n|
-   str << %Q|         map: gMap,\n|
-   str << %Q|         title: '#{hash[:title]}'\n|
-   str << %Q|      });\n|
-   # set InfoWindow
-   if hash[:html]
-   str << %Q|      var infowindow = new google.maps.InfoWindow({\n|
-   str << %Q|         content: '<span style="color: #000000;">#{hash[:html]}</span>',\n|
-   str << %Q|         size: new google.maps.Size(350, 200)\n|
-   str << %Q|      });\n|
-   str << %Q|      infowindow.open(gMap, marker);\n|
-   end # :html
-   end # :title
-   str << %Q|   };\n|
-   str << %Q|});\n|
-
-   str
+	str = ''
+	str << %Q|google.maps.event.addDomListener(window, 'load', function() {\n|
+	str << %Q|   var mapdiv = document.getElementById("#{hash[:id]}");\n|
+	str << %Q|   if(mapdiv){\n|
+	str << %Q|      var myOptions = {\n|
+	str << %Q|         zoom: #{hash[:zoom]},\n|
+	str << %Q|         overviewMapControl: #{hash[:overview]},\n|
+	str << %Q|         overviewMapControlOptions: {\n|
+	str << %Q|            opened: #{hash[:overview]}\n|
+	str << %Q|         },\n|
+	str << %Q|         center: new google.maps.LatLng(#{hash[:lat]}, #{hash[:lon]}),\n|
+	str << %Q|         mapTypeId: google.maps.MapTypeId.#{hash[:type]},\n|
+	str << %Q|         scaleControl: true\n|
+	str << %Q|      };\n|
+	str << %Q|      var gMap = new google.maps.Map(mapdiv, myOptions);\n|
+	# set Marker
+	if hash[:title]
+	str << %Q|      var marker = new google.maps.Marker({\n|
+	str << %Q|         position: new google.maps.LatLng(#{hash[:lat]}, #{hash[:lon]}),\n|
+	str << %Q|         map: gMap,\n|
+	str << %Q|         title: '#{hash[:title]}'\n|
+	str << %Q|      });\n|
+	# set InfoWindow
+	if hash[:html]
+	str << %Q|      var infowindow = new google.maps.InfoWindow({\n|
+	str << %Q|         content: '<span style="color: #000000;">#{hash[:html]}</span>',\n|
+	str << %Q|         size: new google.maps.Size(350, 200)\n|
+	str << %Q|      });\n|
+	str << %Q|      infowindow.open(gMap, marker);\n|
+	end # :html
+	end # :title
+	str << %Q|   };\n|
+	str << %Q|});\n|
+
+	str
 end
 
 def google_geomap_script(hash)
-   str = ''
-   str << %Q|google.maps.event.addDomListener(window, 'load', function() {\n|
-   str << %Q|   var mapdiv = document.getElementById("#{hash[:id]}");\n|
-   str << %Q|   if(mapdiv){\n|
-   str << %Q|      var geocoder = new google.maps.Geocoder();\n|
-   str << %Q|      if(geocoder) {\n|
-   str << %Q|         geocoder.geocode( { 'address': '#{hash[:address]}'}, function(results, status) {\n|
-   str << %Q|            if (status == google.maps.GeocoderStatus.OK) {\n|
-   str << %Q|               var geoLat = results[0].geometry.location;\n|
-   str << %Q|               var myOptions = {\n|
-   str << %Q|                  zoom: #{hash[:zoom]},\n|
-   str << %Q|                  overviewMapControl: #{hash[:overview]},\n|
-   str << %Q|                  overviewMapControlOptions: {\n|
-   str << %Q|                     opened: #{hash[:overview]}\n|
-   str << %Q|                  },\n|
-   str << %Q|                  center: geoLat,\n|
-   str << %Q|                  mapTypeId: google.maps.MapTypeId.#{hash[:type]},\n|
-   str << %Q|                  scaleControl: true\n|
-   str << %Q|               };\n|
-   str << %Q|               var gMap = new google.maps.Map(mapdiv, myOptions);\n|
-   # set Marker
-   if hash[:title]
-   str << %Q|               var marker = new google.maps.Marker({\n|
-   str << %Q|                  position: geoLat,\n|
-   str << %Q|                  map: gMap,\n|
-   str << %Q|                  title: '#{hash[:title]}'\n|
-   str << %Q|               });\n|
-   # set InfoWindow
-   if hash[:html]
-   str << %Q|               var infowindow = new google.maps.InfoWindow({\n|
-   str << %Q|                  content: '<span style="color: #000000;">#{hash[:html]}</span>',\n|
-   str << %Q|                  size: new google.maps.Size(350, 200)\n|
-   str << %Q|               });\n|
-   str << %Q|               infowindow.open(gMap, marker);\n|
-   end # :html
-   end # :title
-   str << %Q|            }else{\n|
-   str << %Q|               alert("Geocode was not successful for the following reason: " + status)\n|
-   str << %Q|            }\n|
-   str << %Q|         });\n|
-   str << %Q|      }\n|
-   str << %Q|   }\n|
-   str << %Q|});\n|
-
-   str
+	str = ''
+	str << %Q|google.maps.event.addDomListener(window, 'load', function() {\n|
+	str << %Q|   var mapdiv = document.getElementById("#{hash[:id]}");\n|
+	str << %Q|   if(mapdiv){\n|
+	str << %Q|      var geocoder = new google.maps.Geocoder();\n|
+	str << %Q|      if(geocoder) {\n|
+	str << %Q|         geocoder.geocode( { 'address': '#{hash[:address]}'}, function(results, status) {\n|
+	str << %Q|            if (status == google.maps.GeocoderStatus.OK) {\n|
+	str << %Q|               var geoLat = results[0].geometry.location;\n|
+	str << %Q|               var myOptions = {\n|
+	str << %Q|                  zoom: #{hash[:zoom]},\n|
+	str << %Q|                  overviewMapControl: #{hash[:overview]},\n|
+	str << %Q|                  overviewMapControlOptions: {\n|
+	str << %Q|                     opened: #{hash[:overview]}\n|
+	str << %Q|                  },\n|
+	str << %Q|                  center: geoLat,\n|
+	str << %Q|                  mapTypeId: google.maps.MapTypeId.#{hash[:type]},\n|
+	str << %Q|                  scaleControl: true\n|
+	str << %Q|               };\n|
+	str << %Q|               var gMap = new google.maps.Map(mapdiv, myOptions);\n|
+	# set Marker
+	if hash[:title]
+	str << %Q|               var marker = new google.maps.Marker({\n|
+	str << %Q|                  position: geoLat,\n|
+	str << %Q|                  map: gMap,\n|
+	str << %Q|                  title: '#{hash[:title]}'\n|
+	str << %Q|               });\n|
+	# set InfoWindow
+	if hash[:html]
+	str << %Q|               var infowindow = new google.maps.InfoWindow({\n|
+	str << %Q|                  content: '<span style="color: #000000;">#{hash[:html]}</span>',\n|
+	str << %Q|                  size: new google.maps.Size(350, 200)\n|
+	str << %Q|               });\n|
+	str << %Q|               infowindow.open(gMap, marker);\n|
+	end # :html
+	end # :title
+	str << %Q|            }else{\n|
+	str << %Q|               alert("Geocode was not successful for the following reason: " + status)\n|
+	str << %Q|            }\n|
+	str << %Q|         });\n|
+	str << %Q|      }\n|
+	str << %Q|   }\n|
+	str << %Q|});\n|
+
+	str
 end
 
 # Local Variables:

data/plugin/hb_footer.rb

@@ -8,7 +8,7 @@
 # Author: ishinao <ishinao@ishinao.net>
 #
 
-add_body_leave_proc(Proc.new do |date|
+add_body_leave_proc do |date|
   if @mode == 'day' or @mode == 'latest'
     diary = @diaries[date.strftime('%Y%m%d')]
     pnum = 1
@@ -33,7 +33,7 @@ add_body_leave_proc(Proc.new do |date|
   else
     ''
   end
-end)
+end
 
 # rss-recent.rb: RSS recent plugin
 #

data/plugin/image_ex.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # image_plugin_ex.rb
 # version 0.3
 # -pv-
@@ -86,11 +87,11 @@
 
 enable_js("image_ex.js")
 
-add_body_enter_proc(Proc.new do |date|
+add_body_enter_proc do |date|
 	@image_date = date.strftime("%Y%m%d")
 	@image_year = date.strftime("%Y")
 	""
-end)
+end
 
 
 def image( id, alt = "image", id2 = nil, width = nil, place="none" )
@@ -199,7 +200,7 @@ add_form_proc do |date|
 					imageex_convertedsize = %Q[#{imageex_convertedheight}x#{imageex_convertedwidth}]
 					imageex_convertedsize
 				end
-				system(imageex_convertpath , "-geometry", imageex_convertedsize , orig, new)
+				system(imageex_convertpath , "-auto-orient", "-geometry", imageex_convertedsize , orig, new)
 				if FileTest::size?( new ) == 0
 					File::delete( new )
 				end

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/mm_footer.rb

@@ -9,7 +9,7 @@
 
 require 'nkf'
 
-add_body_leave_proc(Proc.new do |date|
+add_body_leave_proc do |date|
 
   oldest_date = Time.local(2005, 1, 11)
   if date > oldest_date
@@ -38,7 +38,7 @@ add_body_leave_proc(Proc.new do |date|
 		''
 	 end
   end
-end)
+end
 
 require "rss/rss"
 

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))
 	prefix = @conf['miniblog.notify.prefix']
 	format = @conf['miniblog.notify.format']
 	source = 'tdiary/notify_miniblog.rb'

data/plugin/socialbutton.rb

@@ -52,9 +52,9 @@ end
 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)
+		add_body_leave_proc(&socialbutton_footer)
 	else
-		add_section_leave_proc(socialbutton_footer)
+		add_section_leave_proc(&socialbutton_footer)
 	end
 
 	# load javascript

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,11 +40,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 )}&"
+	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,
-		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 +52,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 )}=\"#{CGI.escape( v )}\""}.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/spec/spec_helper.rb

@@ -49,19 +49,19 @@ class PluginFake
 		@conf_procs << block
 	end
 
-	def add_edit_proc( block = Proc::new )
+	def add_edit_proc(&block)
 		@edit_procs << block
 	end
 
-	def add_header_proc( block = Proc::new )
+	def add_header_proc(&block)
 		@header_procs << block
 	end
 
-	def add_footer_proc( block = Proc::new )
+	def add_footer_proc(&block)
 		@footer_procs << block
 	end
 
-	def add_update_proc( block = Proc::new )
+	def add_update_proc(&block)
 		@update_procs << block
 	end
 
@@ -89,7 +89,7 @@ class PluginFake
 		r.join.chomp
 	end
 
-	def add_body_enter_proc( block = Proc::new )
+	def add_body_enter_proc(&block)
 		@body_enter_procs << block
 	end
 
@@ -101,7 +101,7 @@ class PluginFake
 		r.join.chomp
 	end
 
-	def add_body_leave_proc( block = Proc::new )
+	def add_body_leave_proc(&block)
 		@body_leave_procs << block
 	end
 

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)
     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)]
     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)]
     return uri unless @tag_p
     template=nil
     if mode == :CHTML

data/util/image-gallery/misc/plugin/recent_image.rb

@@ -259,10 +259,10 @@ end
 #  Callback Functions
 
 # this is for view_exif().
-add_body_enter_proc(Proc.new do |date|
+add_body_enter_proc do |date|
   @image_date_exif = date.strftime("%Y%m%d")
   ""
-end)
+end
 
 #  Update Proc of the plugin
 add_update_proc do

data/util/image-gallery/misc/plugin/view_exif.rb

@@ -49,7 +49,7 @@ end
 
 #  Callback Functions
 
-add_body_enter_proc(Proc.new do |date| 
+add_body_enter_proc do |date| 
   @image_date_exif = date.strftime("%Y%m%d")
   ""
-end)
+end

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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.0.11
+  version: 5.1.2
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pushbullet_ruby
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -507,7 +513,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package