tdiary-contrib 4.0.4 → 4.0.5.1

data/plugin/twitter_summary_card.rb

@@ -41,7 +41,7 @@ add_conf_proc('Twitter Summary Card', 'Twitter Summary Card') do
   <<-HTML
   <h2>Twitter Summary Card</h2>
   <p>
-  Please refer to the following documentation at first. 
+  Please refer to the following documentation at first.
   <ul>
     <li><a href="https://dev.twitter.com/docs/cards/types/summary-card" target="_blank">Summary Card | Twitter Developers</a></li>
   </ul>

data/plugin/vote.rb

@@ -3,8 +3,8 @@
 # You can redistribute it and/or modify it under GPL2.
 #
 # ref. http://elpeo.jp/diary/20060622.html#p01
-# 
-# .tdiary-vote { 
+#
+# .tdiary-vote {
 #   float: left;
 #   background-color: aqua;
 # }
@@ -53,7 +53,7 @@ def get_vote( date, uid )
 			voted = db['voter'].include?( uid ) if db.root?( 'voter' )
 			db.abort
 		end
-	end		
+	end
 	[h, voted]
 end
 
@@ -81,7 +81,7 @@ end
 
 unless bot? then
 	if @mode == 'comment' && @cgi.valid?( 'vote' ) && @cgi.cookies['tdiary_vote'][0] then
-		add_vote( @date, @cgi.params['vote'][0], @cgi.cookies['tdiary_vote'][0] ) 
+		add_vote( @date, @cgi.params['vote'][0], @cgi.cookies['tdiary_vote'][0] )
 	end
 
 	add_footer_proc do

data/plugin/yahoo_kousei.rb

@@ -1,5 +1,5 @@
 #
-# yahoo_kousei.rb - 
+# yahoo_kousei.rb -
 #  Yahoo!JAPANデベロッパーネットワークの校正支援APIを利用して、
 #  日本語文の校正作業を支援します。文字の入力ミスや言葉の誤用がないか、
 #  わかりにくい表記や不適切な表現が使われていないかなどをチェックします。
@@ -32,7 +32,7 @@ def kousei_api( sentence )
 
 	px_host, px_port = (@conf['proxy'] || '').split( /:/ )
 	px_port = 80 if px_host and !px_port
-	
+
 	xml = ''
 	Net::HTTP::Proxy( px_host, px_port ).start( 'jlp.yahooapis.jp' ) do |http|
 		xml = http.post( '/KouseiService/V1/kousei', query ).body

data/plugin/yo_update.rb

@@ -0,0 +1,214 @@
+# -*- coding: utf-8 -*-
+#
+# yo_update.rb - Yo all when an entry or a comment is posted
+#
+# Copyright (C) 2014, zunda <zundan at gmail.com>
+#
+# Permission is granted for use, copying, modification,
+# distribution, and distribution of modified versions of this
+# work under the terms of GPL version 2 or later.
+#
+
+require 'uri'
+require 'timeout'
+require 'net/http'
+require 'json'
+
+YO_UPDATE_TIMEOUT = 10
+
+class YoUpdateError < StandardError; end
+
+def yo_update_api_key
+	r = @conf['yo_update.api_key']
+	if not r or r.empty?
+		return nil
+	end
+	return r
+end
+
+def yo_update_access_api(req)
+	if @conf['proxy']
+		proxy_uri = URI("http://" + @conf['proxy'])
+		proxy_addr = proxy_uri.host
+		proxy_port = proxy_uri.port
+	else
+		proxy_addr = nil
+		proxy_port = nil
+	end
+	begin
+		timeout(YO_UPDATE_TIMEOUT) do
+			return Net::HTTP.start(req.uri.host, req.uri.port, proxy_addr, proxt_port){|http|
+				http.request(req)
+			}
+		end
+	rescue Timeout::Error
+		raise YoUpdateError, "Timeout accessing Yo API"
+	rescue SocketError => e
+		raise YoUpdateError, e.message
+	end
+end
+
+def yo_update_send_yo(username = nil)
+	api_key = yo_update_api_key
+	unless api_key
+		raise YoUpdateError, "Yo API Key is not set"
+	end
+	unless username
+		req = Net::HTTP::Post.new(URI("http://api.justyo.co/yoall/"))
+		req.set_form_data('api_token' => yo_update_api_key)
+		expected = '{}'
+	else
+		req = Net::HTTP::Post.new(URI("http://api.justyo.co/yo/"))
+		req.set_form_data('api_token' => yo_update_api_key, 'username' => username)
+		expected = '{"result": "OK"}'
+	end
+	res = yo_update_access_api(req)
+	data = res.body
+	unless data == expected
+		raise YoUpdateError, "error from Yo API: #{data}"
+	end
+	return data
+end
+
+def yo_update_send_yo_or_log(username = nil)
+	return unless yo_update_api_key
+	begin
+		yo_update_send_yo(username)
+	rescue YoUpdateError => e
+		@logger.error "yo_update.rb: #{e.message}"
+	end
+end
+
+def yo_update_subscribers_count
+	api_key = yo_update_api_key
+	unless api_key
+		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)}")
+	)
+	res = yo_update_access_api(req)
+	data = res.body
+	begin
+		r = JSON::parse(data)
+		if r.has_key?('result')
+			return r['result']
+		else
+			raise YoUpdateError, "Error from Yo API: #{data}"
+		end
+	rescue JSON::ParserError
+		raise YoUpdateError, "Error from Yo API: #{data}"
+	end
+end
+
+unless defined? yo_update_conf_label	# maybe defined in a language resource
+	def yo_update_conf_label
+		'Send Yo with updates'
+	end
+end
+
+unless defined? yo_update_test_result_label	# maybe defined in a language resource
+	def yo_update_test_result_label(username, result)
+		"- Sent to <tt>#{h username}</tt> and got <tt>#{h result}</tt>"
+	end
+end
+
+unless defined? yo_update_conf_html	# maybe defined in a language resource
+	def yo_update_conf_html(conf, n_subscribers, test_result)
+		action_label = {
+			'send_on_update' => 'when an entry is added',
+			'send_on_comment' => 'when a comment is posted',
+		}
+		<<-HTML
+		<h3 class="subtitle">API key</h3>
+		<p><input name="yo_update.api_key" value="#{h conf['yo_update.api_key']}" size="40"></p>
+		<h3 class="subtitle">Username</h3>
+		<p><input name="yo_update.username" value="#{h conf['yo_update.username']}" size="40"></p>
+		<h3 class="subtitle">Send Yo</h3>
+		<ul>
+		#{%w(send_on_update send_on_comment).map{|action|
+			checked = conf["yo_update.#{action}"] ? ' checked' : ''
+			%Q|<li><label for="yo_update.#{action}"><input id="yo_update.#{action}" name="yo_update.#{action}" value="t" type="checkbox"#{checked}>#{action_label[action]}</label>|
+		}.join("\n\t")}
+		</ul>
+		<p>Test sending Yo! to <input name="yo_update.test" value="" size="10">#{test_result}</p>
+		<h3 class="subtitle">Current Subscribers</h3>
+		<p>#{h n_subscribers}</p>
+		<h3 class="subtitle">Yo button</h3>
+		<p>Add the following to somewhere or your diary.</p>
+		<pre>&lt;div id=&quot;yo-button&quot;&gt;&lt;/div&gt;</pre>
+		<h3 class="subtitle">Howto</h3>
+		<ol>
+		<li>Sign in with your personal Yo account at <a href="http://dev.justyo.co/">http://dev.justyo.co/</a>
+		<li>Follow the instructions to obtain new API account.
+			Please leave the Callback URL blank.
+		<li>Copy the API key and API username above.
+		</ol>
+		HTML
+	end
+end
+
+add_conf_proc('yo_update', yo_update_conf_label) do
+	test_result = ''
+	if @mode == 'saveconf' then
+		@conf['yo_update.api_key'] = @cgi.params['yo_update.api_key'][0]
+		@conf['yo_update.username'] = @cgi.params['yo_update.username'][0]
+		@conf['yo_update.send_on_update'] = (@cgi.params['yo_update.send_on_update'][0] == 't')
+		@conf['yo_update.send_on_comment'] = (@cgi.params['yo_update.send_on_comment'][0] == 't')
+		test_username = @cgi.params['yo_update.test'][0]
+		if test_username and not test_username.empty?
+			begin
+				result = yo_update_send_yo(test_username)
+			rescue YoUpdateError => e
+				result = e.message
+			end
+			test_result = yo_update_test_result_label(test_username, result)
+		end
+	end
+	unless @conf.has_key?('yo_update.send_on_update')
+		@conf['yo_update.send_on_update'] = true
+	end
+	begin
+		n_subscribers = yo_update_subscribers_count
+	rescue YoUpdateError => e
+		n_subscribers = e.message
+	end
+	yo_update_conf_html(@conf, n_subscribers, test_result)
+end
+
+add_update_proc do
+	if @mode == 'append' and @conf['yo_update.send_on_update']
+		yo_update_send_yo_or_log
+	elsif @mode == 'comment' and @comment and @comment.visible? and @conf['yo_update.send_on_comment']
+		yo_update_send_yo_or_log
+	end
+end
+
+add_header_proc do
+	if @conf['yo_update.api_key']
+		triggers = []
+		triggers << 'Entry' if @conf['yo_update.send_on_update']
+		triggers << 'Tsukkomi' if @conf['yo_update.send_on_comment']
+		trigger_str = "#{triggers.join(' or ')} is added"
+		<<-HTML
+	<script type="text/javascript"><!--
+		var _yoData = {
+			"username": "#{@conf['yo_update.username']}",
+			"trigger": "#{trigger_str}"
+		};
+		var s = document.createElement("script");
+		s.type = "text/javascript";
+		s.src = "//yoapp.s3.amazonaws.com/js/yo-button.js";
+		(document.head || document.getElementsByTagName("head")[0]).appendChild(s);
+	--></script>
+		HTML
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3 sw=3

data/plugin/zenback.rb

@@ -15,12 +15,12 @@ if @mode == 'day' and (respond_to?(:section_mode?) ? section_mode? : true)
   end
 	if defined? add_comment_leave_proc
 		add_comment_leave_proc do
-      "<!-- zenback_body_end -->" + 
+      "<!-- zenback_body_end -->" +
 			insert_zenback
 		end
 	else
 		add_body_leave_proc do
-      "<!-- zenback_body_end -->" + 
+      "<!-- zenback_body_end -->" +
 			insert_zenback
 		end
 	end

data/spec/apple_webclip_spec.rb

@@ -13,8 +13,8 @@ describe "apple_webclip plugin" do
 			plugin = setup_apple_webclip_plugin('http://example.com/example.png')
 			@header_snippet = plugin.header_proc
 		end
-			
-		it "header include url" do 
+
+		it "header include url" do
 			expect(@header_snippet).to eq(%Q|\t<link rel="apple-touch-icon" href="http://example.com/example.png">|)
 		end
 	end
@@ -25,8 +25,8 @@ describe "apple_webclip plugin" do
 				plugin = setup_apple_webclip_plugin('')
 				@header_snippet = plugin.header_proc
 			end
-			
-			it "header is empty" do 
+
+			it "header is empty" do
 				expect(@header_snippet).to be_empty
 			end
 		end
@@ -36,8 +36,8 @@ describe "apple_webclip plugin" do
 				plugin = setup_apple_webclip_plugin(nil)
 				@header_snippet = plugin.header_proc
 			end
-			
-			it "header is empty" do 
+
+			it "header is empty" do
 				expect(@header_snippet).to be_empty
 			end
 		end

data/util/estraier-search/estraier-register.rb

@@ -186,7 +186,7 @@ module ::TDiary
 				@db.put_doc(doc)
 			end
 		end
-		
+
 		protected
 
 		def mode; 'day'; end
@@ -265,7 +265,7 @@ else
 		conf.hide_comment_form = true
 		conf.show_nyear = false
 		def conf.bot?; true; end
-	
+
 		diary = @diaries[@date.strftime('%Y%m%d')]
 		TDiary::EstraierDB.new(conf).transaction do |estraier_db|
 			TDiary::EstraierRegister.new(estraier_db, diary).execute(true)

data/util/image-gallery/image-gallery.rb

@@ -5,10 +5,10 @@
 # Copyright (c) 2005-2013 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
 # You can redistribute it and/or modify it under GPL2.
 
-if RUBY_VERSION >= '1.9.0' 
-  Encoding::default_external = 'UTF-8' 
-  $LOAD_PATH.push('./') 
-end 
+if RUBY_VERSION >= '1.9.0'
+  Encoding::default_external = 'UTF-8'
+  $LOAD_PATH.push('./')
+end
 
 if FileTest::symlink?( __FILE__ ) then
   org_path = File::dirname( File::readlink( __FILE__ ) )
@@ -29,7 +29,7 @@ module TDiary
     attr_writer :file, :url, :title, :subtitle, :date, :width, :height, :type
   end
 
-  
+
   class TDiaryGallery < ::TDiary::TDiaryBase
     MAX_PAGES = 20
     ORDER_OPTIONS = [
@@ -71,7 +71,7 @@ module TDiary
       @width  = conf.options['image-gallery.width']
       @width  = "160" if @width == nil
       @vwidth = conf.options['image-gallery.vwidth']
-      @vwidth = "640" if @vwidth == nil 
+      @vwidth = "640" if @vwidth == nil
       @show_exif = conf.options['image-gallery.show_exif']
       @show_exif = false if @show_exif == nil
       @use_mid_image = conf.options['image-gallery.use_mid_image']
@@ -212,7 +212,7 @@ module TDiary
       rescue
       end
     end
-    
+
     def format_links(count)
       page_count = (count - 1) / @num + 1
       current_page = @start / @num + 1
@@ -306,7 +306,7 @@ module TDiary
         elsif @page_month != ""
           prevmonth = (@page_date << 1).strftime("%Y%m")
           nextmonth = (@page_date >> 1).strftime("%Y%m")
-          if @name_filter[0] == ?^ and @name_filter[5] == ?/ 
+          if @name_filter[0] == ?^ and @name_filter[5] == ?/
             prevmonth = %Q[^#{prevmonth[0,4]}/#{prevmonth}]
             nextmonth = %Q[^#{nextmonth[0,4]}/#{nextmonth}]
           elsif @name_filter[0] == ?^

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

@@ -94,7 +94,7 @@ def image_info_rcimg( filename )
     data = $'
 
     until data.empty?
-      if RUBY_VERSION >= '1.9.0' 
+      if RUBY_VERSION >= '1.9.0'
         break if data[0].unpack("C").first != 0xFF
         break if data[1].unpack("C").first == 0xD9
       else
@@ -230,7 +230,7 @@ def init_rcimg
     make_image_hash_rcimg
     keysort_rcimg
     if @recent_image_use_cache
-      save_cache_rcimg 
+      save_cache_rcimg
     end
   end
 end
@@ -294,7 +294,7 @@ def count_image(name_filter = nil, title_filter = nil)
   init_rcimg
 
   if name_filter == nil and title_filter == nil
-    count = @recent_image_keys.length 
+    count = @recent_image_keys.length
   else
     @recent_image_keys.each do |key|
       image = @recent_image_hash[key]
@@ -350,7 +350,7 @@ end
 #  Callback Functions
 
 # this is for view_exif().
-add_body_enter_proc(Proc.new do |date| 
+add_body_enter_proc(Proc.new do |date|
   @image_date_exif = date.strftime("%Y%m%d")
   ""
 end)

data/util/posttdiary/posttdiary-ex.rb

@@ -8,7 +8,7 @@
 # 2010.10.19: v.1.71: Modified by K.Sakurai (http://ks.nwr.jp)
 #  Acknowledgements:
 #   * Based on posttdiary.rb & tdiary.rb by TADA.
-#   * Some codes partially imported from Enikki Plugin Ex. : 
+#   * Some codes partially imported from Enikki Plugin Ex. :
 #     http://shimoi.s26.xrea.com/hiki/hiki.cgi?TdiaryEnikkiEx
 #   * Thanks to taketori for image size detection method.
 #   * Thanks to NOB for debugging.
@@ -124,7 +124,7 @@ def usage( detailed_help )
 !		          ex2. -z 140   (same to 140x140)
 ! 		  --image-format,    -f format string:
 !		          Specify the format string of the image tag
-!		          These variables can be used in the format string: 
+!		          These variables can be used in the format string:
 !		              $0 : image serial number
 !		              $1 : image url
 !		              $2 : thumbnail image url (when -t is specified)
@@ -420,7 +420,7 @@ end
 
 def add_body_text( prev, sub_head , sub_body )
 	addtext = prev
-	if prev.size > 0 and !(prev =~ /\n$/) then 
+	if prev.size > 0 and !(prev =~ /\n$/) then
 		addtext += "\n"
 	end
 	if sub_head =~ %r[^Content-Transfer-Encoding:\s*base64]i then
@@ -630,7 +630,7 @@ def parse_mail( head, body , image_dir )
 				orglist[imgnum] = orgname
 			end
 		end
-	elsif head =~ /^Content-Type:\s*text\/plain/i 
+	elsif head =~ /^Content-Type:\s*text\/plain/i
 		textbody = add_body_text( textbody , head, body )
 	else
 		raise "posttdiary-ex: can not read this mail (illegal format)"
@@ -912,7 +912,7 @@ begin
 		user = ARGV.shift.dup
 		pass = ARGV.shift.dup
 	end
-	
+
 	require 'base64'
 	require 'nkf'
 	require 'net/http'
@@ -921,7 +921,7 @@ begin
 
 	mail = NKF::nkf( '-m0 -Xwd', ARGF.read )
 	raise "posttdiary-ex: no mail text." if not mail or mail.length == 0
-	
+
 	head, body = mail.split( /(?:\r\n){2}|\r\r|\n\n/, 2 )
 	body = "" unless body
 	addr, subject, tmpimglist, orglist, @body = parse_mail( head, body, image_dir )
@@ -971,7 +971,7 @@ begin
 	else
 		now = tmp
 	end
-	
+
 	topic_year = now.strftime( "%Y" )
 	topic_month = now.strftime( "%m" )
 	topic_date = now.strftime( "%d" )