tdiary-contrib 4.0.2.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85cf1d5815f8a25ac6c6d5c5ba9cb4fc92203dfa
-  data.tar.gz: 24e64b73452bf435e9241af42a403f3d16ec9a1f
+  metadata.gz: b93a4e4a623dc81cccbe122dcecd09f37adf408b
+  data.tar.gz: ebed4176090ce9d2046b34b9273aa3e85d873d4b
 SHA512:
-  metadata.gz: be8344e9e8a190022cc3f5e514357e85e9638174ffe93a9bb09028734bea7e5e2a59ec75484099b5b89ddad3297dacc32f122081640947214ebc23429e2b1877
-  data.tar.gz: aa811bccb9496a12411a6f0ac0966f73574687184a544acde2a08136b42c3ab09704f4a6b5f74199fee565489966dbe29ccef222b1714b2aa2a09f4c67d26c91
+  metadata.gz: 9986ae7afd37e0605113b81b641a5e5e0dbc52c01b971e9e54d42fdca9655f9305f31927be6d9be2b7df869642964d0b46181d8f01f75477df11682669fb0d91
+  data.tar.gz: 2eecb6b945e59647fa851234ec610c0febf7e7ef4a2342bc2165014c75acc6fd8c2b11988a271c4cc1edd961725723f1d381140ffe4c36b41d067f54b67620fc

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'tdiary', '4.0.2'
 
 gem 'rake'
-gem 'rspec'
+gem 'rspec', '~> 3.0.0.beta2'
 
 platforms :ruby_18 do
   gem 'json'

data/Gemfile.lock

@@ -2,19 +2,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    docile (1.1.1)
+    docile (1.1.3)
     json (1.8.1)
-    multi_json (1.8.2)
-    rake (10.1.0)
+    multi_json (1.8.4)
+    rake (10.1.1)
     rcov (1.0.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec (3.0.0.beta2)
+      rspec-core (= 3.0.0.beta2)
+      rspec-expectations (= 3.0.0.beta2)
+      rspec-mocks (= 3.0.0.beta2)
+    rspec-core (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-expectations (3.0.0.beta2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.0.0.beta2)
+    rspec-mocks (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-support (3.0.0.beta2)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -32,6 +36,6 @@ DEPENDENCIES
   json
   rake
   rcov
-  rspec
+  rspec (~> 3.0.0.beta2)
   simplecov
   tdiary (= 4.0.2)

data/lib/extensions/contrib.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+require 'tdiary/extensions'
+
+module TDiary
+	module Extensions
+		class Contrib
+			def self.sp_path
+				File.join(TDiary::Contrib.root, 'plugin')
+			end
+
+			def self.assets_path
+				File.join(TDiary::Contrib.root, 'js')
+			end
+		end
+	end
+end

data/lib/tdiary-contrib.rb

@@ -1,20 +1,10 @@
-require 'tdiary'
-require 'tdiary/application'
+# -*- coding: utf-8 -*-
+require 'extensions/contrib'
 
 module TDiary
 	class Contrib
 		def self.root
 			File.expand_path('../..', __FILE__)
 		end
-
-		class Plugin
-			def self.setup(sp_path)
-				sp_path << File.join(TDiary::Contrib.root, 'plugin')
-			end
-		end
-	end
-
-	Application.configure do
-		config.assets_paths << File.join(TDiary::Contrib.root, 'js')
 	end
 end

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
-  module Contrib
-    VERSION = "4.0.2.1"
+  class Contrib
+    VERSION = "4.0.3"
   end
 end

data/plugin/coderay.rb

@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+#
+# coderay.rb - easy syntax highlighting for selected languages
+#  refer to the URL below. 
+#  http://coderay.rubychan.de/
+#
+# Copyright (C) 2013, tamoot <tamoot+tdiary@gmail.com>
+# You can redistribute it and/or modify it under GPL2.
+#
+
+require 'cgi'
+require 'erb'
+require 'coderay'
+
+@coderay_default_css ||= ::CodeRay::Encoders[:html]::CSS.new(:default).stylesheet
+
+def coderay(lang, text, options = {})
+   html = ::CodeRay.scan(text, lang).html(:line_numbers => :inline, :bold_every => false, :line_number_anchors => false)
+   %Q|<div class="CodeRay"><pre>#{html}</pre></div>|
+end
+
+add_header_proc do
+   coderay_css = ''
+   if @conf['coderay.css.url'] && @conf['coderay.css.url'].size > 0
+      coderay_css = %Q|<link rel="stylesheet" href="#{h @conf['coderay.css.url']}" type="text/css" media="all">|
+   else
+      coderay_css = <<-STYLE
+   <style type="text/css"><!--
+   #{@coderay_default_css}
+   -->
+   </style>
+STYLE
+   end
+
+   coderay_css
+end
+
+add_conf_proc( 'coderay', 'CodeRay' ) do
+   if @mode == 'saveconf' then
+      @conf['coderay.css.url'] = @cgi.params['coderay.css.url'][0]
+
+   end
+
+   coderay_conf = <<-HTML
+   <h3 class="subtitle">custom style</h3>
+
+   <p>The stylesheet path is used instead of CodeRay default. </p>
+   <p>Path: <input name="coderay.css.url" value="#{h @conf['coderay.css.url']}" size="70"></p>
+   <pre>
+   sample:
+   #{CGI::escape_html('<link rel="stylesheet" href="/your/tdiary/path/coderay.css" type="text/css" media="all">')}
+   </pre>
+
+
+   <h4>Print default stylesheet of CodeRay</h4>
+   <p>1. The coderay command installed along with the CodeRay gem can print out a stylesheet for you.</p>
+   <pre>
+   bundle exec coderay stylesheet > /your/tdiary/path/coderay.css
+   </pre>
+   <p>2. Edit your stylesheet and modify permissions.</p>
+
+   HTML
+
+   coderay_conf
+
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/plugin/image_ex.rb

@@ -275,9 +275,17 @@ add_form_proc do |date|
 			if imageex_useresize == 1 or imageex_useresize == 2
 				open(image_file,"rb") do |fh|
 					img = ImageSize.new(fh.read)
-					width = img.get_width
-					height = img.get_height
-					orig_type = img.get_type
+					begin
+						# old image_size.rb
+						width = img.get_width
+						height = img.get_height
+						orig_type = img.get_type
+					rescue NoMethodError
+						# image_size gem
+						width = img.width
+						height = img.height
+						orig_type = (img.format || "OTHER").to_s.upcase
+					end
 					if imageex_converttype == 0
 						new_type = "jpg"
 					elsif imageex_converttype == 1
@@ -383,23 +391,13 @@ add_form_proc do |date|
 	r << %Q[
 		<script type="text/javascript">
 		<!--
-		var elem=null
+		var elem=null;
 		function ins(val){
 			elem.value+=val
 		}
-		window.onload=function(){
-			for(var i=0;i<document.forms.length;i++){
-				for(var j=0;j<document.forms[i].elements.length;j++){
-					var e=document.forms[i].elements[j]
-					if(e.type&&e.type=="textarea"){
-						if(elem==null){
-							elem=e
-						}
-						e.onfocus=new Function("elem=this")
-					}
-				}
-			}
-		}
+		$(document).ready(function(){
+			$("textarea").focus(function() { elem = this; });
+		});
 		//-->
 		</script>
 	]

data/plugin/makerss_category.rb

@@ -26,7 +26,7 @@ class MakeRssCategory < MakeRssFull
 	def file
 		f = @conf['makerss.category.file'] || 'category.rdf'
 		f = 'category.rdf' if f.length == 0
-		f
+		f =~ %r|^/| ? f : "#{document_root}/#{f}"
 	end
 	
 	def write( encoder )
@@ -40,4 +40,4 @@ class MakeRssCategory < MakeRssFull
 	end
 end
 
-@makerss_rsses << MakeRssCategory::new( @conf )
+@makerss_rsses << MakeRssCategory::new( @conf, @cgi )

data/plugin/makerss_comment.rb

@@ -18,7 +18,7 @@ class MakeRssComments < MakeRssFull
 	def file
 		f = @conf['makerss.no_comments.file'] || 'comments.rdf'
 		f = 'comments.rdf' if f.length == 0
-		f
+		f =~ %r|^/| ? f : "#{document_root}/#{f}"
 	end
 	
 	def write( encoder )
@@ -32,4 +32,4 @@ class MakeRssComments < MakeRssFull
 	end
 end
 
-@makerss_rsses << MakeRssComments::new( @conf )
+@makerss_rsses << MakeRssComments::new( @conf, @cgi )

data/plugin/nhk_program_info.rb

@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+#
+# nhk_program_info.rb - embedded NHK program information
+# refer to following URL.
+# http://api-portal.nhk.or.jp/ja
+#
+# Copyright (C) 2014, tamoot <tamoot+tdiary@gmail.com>
+# You can redistribute it and/or modify it under GPL2.
+#
+
+require 'json'
+require 'date'
+require 'timeout'
+require 'open-uri'
+
+
+def nhk_program_info(id, service, area = nil)
+
+   area = @conf['nhk_api.default.area'] if area.nil? || area == ""
+
+   json = nil
+   begin
+      json = call_nhk_json(id, service, area)
+   rescue
+      return %Q|<p>#{__FILE__}: error, #{$!}</p>|
+   end
+
+   stime = DateTime::parse(json["start_time"]).strftime("%Y/%m/%d %H:%M:%S")
+   etime = DateTime::parse(json["end_time"]).strftime("%Y/%m/%d %H:%M:%S")
+
+   return <<-PROGRAM_HTML
+   <div class="amazon-detail">
+   <a href="#{json["program_url"]}">
+   <img src="#{json["program_logo"]["url"]}" alt="#{@conf.to_native json["title"]}" class="amazon-detail left">
+   <div class="amazon-detail-desc">
+   <span class="amazon-title">#{h json["service"]["name"]} - #{h json["title"]}</span><br><br>
+   <span class="amazon-title">#{h json["subtitle"]}</span><br><br>
+   <span class="amazon-price">#{h stime} - #{etime}</span><br>
+   <span class="amazon-price">#{h '情報提供:ＮＨＫ'}</span>
+   </div>
+   <br style="clear: left">
+   </a>
+   </div>
+   PROGRAM_HTML
+  
+end
+
+def call_nhk_json(id, service, area)
+
+   data = nil
+   nhk_endpoint = "http://api.nhk.or.jp/v1/pg/info/#{area}/#{service}/#{id}.json?key=#{@conf['nhk_api.id']}"
+
+   nhk_cache_path = "#{@cache_path}/nhk"
+   Dir::mkdir(nhk_cache_path) unless File::directory?(nhk_cache_path)
+
+   cache = "#{nhk_cache_path}/#{area}_#{service}_#{id}.json"
+   begin
+      data = File.read(cache)
+      File::delete(cache) if Time::now > File::mtime( cache ) + 60*60*24*30
+
+   rescue
+      open_param = [nhk_endpoint]
+      open_param << {:proxy => "http://#{@conf['proxy']}"} if @conf['proxy']
+
+      status = nil
+      data = nil
+      timeout(10) do
+         open(*open_param){ |ff| data = ff.read; status = ff.status[0] }
+      end
+      raise "API Error" if status.to_s != '200'
+      File::open(cache, 'wb') {|f| f.write(data) }
+
+
+   end
+
+   JSON::parse(data)['list'][service][0]
+end
+
+add_conf_proc( 'nhk', 'NHK API' ) do
+   if @mode == 'saveconf' then
+      @conf['nhk_api.id'] = @cgi.params['nhk_api.id'][0]
+      @conf['nhk_api.default.area'] = @cgi.params['nhk_api.default.area'][0]
+   end
+   
+   <<-HTML
+   <h3 class="subtitle">API key</h3>
+   <p><input name="nhk_api.id" value="#{h @conf['nhk_api.id']}" size="70"></p>
+   <p>Register your tDiary and get API key.</p>
+   <a href="http://www2.nhk.or.jp/api/">Go NHK API settings.</a></p>
+   <h3 class="subtitle">Default Area</h3>
+   <p><input name="nhk_api.default.area" value="#{h @conf['nhk_api.default.area']}" size="70"></p>
+   <a href="http://www2.nhk.or.jp/api/">Refer NHK API settings.</a></p>
+   HTML
+
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3
+

data/plugin/profile.rb

@@ -5,7 +5,7 @@
 #   profile(id[, service = :twitter])
 #   - id: user ID for profile service
 #   - service: profile service (default is :twitter)
-#     Choose from :github, :twitter, :friendfeed, :iddy
+#     Choose from :github, :twitter, :friendfeed
 #
 # Copyright (C) 2009 by MATSUOKA Kohei < http://www.machu.jp/ >
 # Distributed under the GPL.
@@ -132,23 +132,9 @@ module ::Profile
       end
     end
 
-    # iddy.jp
-    # this class is based on iddy.rb
+    # iddy.jp, for backward compatibility
     class Iddy < Base
-      ######################################################################
-      # If you will modify or release another version of this code,
-      # please get your own application key from iddy.jp and replace below.
-      ######################################################################
-      API_KEY = '9262ea8ffba962aabb4f1a1d3f1cfa953b11aa23' unless defined? API_KEY
-
-      property :name, '//response/users/user/accountname'
-      property :image, '//response/users/user/imageurl'
-      property :description, '/response/users/user/profile'
-      endpoint {|id| "http://iddy.jp/api/user/?apikey=#{API_KEY}&accountname=#{id}" }
-
-      def link
-        "http://iddy.jp/profile/#{@id}/"
-      end
+      # dummy class
     end
 
     # gravatar.com
@@ -181,10 +167,9 @@ def profile(id, service = :twitter, options = {})
     :twitter => Profile::Service::Twitter,
     :github => Profile::Service::GitHub,
     :friendfeed => Profile::Service::FriendFeed,
-    :iddy => Profile::Service::Iddy,
     :gravatar => Profile::Service::Gravatar,
     :hatena => Profile::Service::Hatena,
-  }[service.to_s.downcase.to_sym]
+  }[service.to_s.downcase.to_sym] || Profile::Service::Twitter
 
   # TODO: create cache manager class
 

data/plugin/search-bing.rb

@@ -9,6 +9,7 @@
 #
 # @options['search-bing.appid'] : Your Bing AppId
 # @options['search.result_filter'] : your dialy's URL format of DAY mode into Regexp.
+# @options['search-bing.base'] : Base URI of your diary (for debugging)
 #
 
 require 'timeout'
@@ -32,11 +33,16 @@ end
 def search_bing_api( q, start = 0 )
 	appid = @conf['search-bing.appid']
 
-	u = 'https://api.datamarket.azure.com/Data.ashx/Bing/SearchWeb/v1/Web'
+	u = 'https://api.datamarket.azure.com/Bing/SearchWeb/v1/Web'
 	u << "?Query=%27#{q}%27&Options=%27EnableHighlighting%27&$top=50&$skip=#{start}&$format=Json"
 	uri = URI( u )
 
-	open( uri, {:http_basic_authentication => [appid, appid]} ).read
+	begin
+		open( uri, {:http_basic_authentication => [appid, appid]} ).read
+	rescue SecurityError
+		### FIX ME: mysterious error at 1st access to the API
+		open( uri, {:http_basic_authentication => [appid, appid]} ).read
+	end
 
 ### FIX ME: this code failed on Timeout error, temporary using open-uri above.
 #	px_host, px_port = (@conf['proxy'] || '').split( /:/ )
@@ -58,12 +64,10 @@ def search_result
 	start = CGI::unescape( @cgi.params['start'][0] || '0' ).to_i
 
 	begin
-		uri = URI::parse( @conf.base_url )
-		#uri = URI::parse( 'http://sho.tdiary.net/' ) ### FOR DEBUGGING ###
+		uri = URI::parse( @conf['search-bing.base'] || @conf.base_url )
 		q = "#{query} site:#{uri.host}"
 		q << %Q| inurl:"#{uri.path}"| unless uri.path == '/'
-		xml = search_bing_api( u( q.untaint ), start )
-		json = JSON::parse( xml )
+		json = JSON::parse(search_bing_api(u(q.untaint), start))
 	rescue Net::HTTPError
 		return %Q|<p class="message">#$!</p>|
 	end