tdiary-contrib 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb4987d60e60c9a3130d9883de1ad14d41105c87
-  data.tar.gz: 0cc0f6d11ef5e64a16ad5c77273439f5a8eefa3a
+  metadata.gz: 7410e628979a4cbc25c8a0aa882935065c5364f2
+  data.tar.gz: 6f9b381d1c3c7d7d108ee5b6b5e0ba604d2f4962
 SHA512:
-  metadata.gz: 1dec6581b5097a1c9a4d1bcea6bab76387ba319fb2628b657eae092b27bca6c257d9847cb030e35a2e46222605d648de4503eea259310c5ecf0910b0b864e133
-  data.tar.gz: 7739d7edcc96fb474a81e25008482f568c55ab8e1daf59c3091226e4b76ab7e5022cc875b6370fe9965e9e26ffbe78c9ec81265e6f89f8628ba0534fb61b4160
+  metadata.gz: d270a15ecf5b5409a0e706bc800dbd08ff8919f8f8032e4b38d96d3a92ea0009475b23fcc2c68f2ba529b2aae3cd9c94503247f72f07269e756d1511993a8244
+  data.tar.gz: 1c981dc013b58bdf3dd221541435c72caa2644f758bff3b83f8e82b2303a2f3625cab4ec14f12b90509e2abecb960266bbca0fd572e0a2e435c1a0156bb466e8

data/Gemfile

@@ -3,5 +3,10 @@ source 'https://rubygems.org'
 gem 'tdiary', '~> 4.1.0'
 
 gem 'rake'
-gem 'rspec'
-gem 'simplecov'
+
+group :test do
+	gem 'rspec'
+	gem 'simplecov'
+	gem 'webmock'
+	gem 'pry'
+end

data/Gemfile.lock

@@ -1,37 +1,54 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.7)
+    coderay (1.1.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    method_source (0.8.2)
     multi_json (1.10.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
+    safe_yaml (1.0.4)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    tdiary (4.1.0.20141126)
+    slop (3.6.0)
+    tdiary (4.1.1)
       bundler (~> 1.3)
       thor (~> 0.18)
     thor (0.19.1)
+    webmock (1.20.4)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  pry
   rake
   rspec
   simplecov
   tdiary (~> 4.1.0)
+  webmock

data/js/picasa.js

@@ -80,7 +80,7 @@ $(function () {
 			var timerId = this.setErrorHandler();
 			var self = this;
 			$.ajax({
-				url: 'http://picasaweb.google.com/data/feed/api/user/' + this.userId,
+				url: '//picasaweb.google.com/data/feed/api/user/' + this.userId,
 				data: 'alt=json-in-script&max-results=25&thumbsize=128c&start-index=' + this.album_start_index,
 				dataType: 'jsonp',
 				success: function (data) {
@@ -99,7 +99,7 @@ $(function () {
 		getPhotos: function (albumId, fn) {
 			var timerId = this.setErrorHandler();
 			$.ajax({
-				url: 'http://picasaweb.google.com/data/feed/api/user/' + this.userId + '/albumid/' + albumId,
+				url: '//picasaweb.google.com/data/feed/api/user/' + this.userId + '/albumid/' + albumId,
 				data: 'alt=json-in-script&imgmax=' + this.imgMax + '&thumbsize=200',
 				dataType: 'jsonp',
 				success: function (data) {
@@ -113,7 +113,7 @@ $(function () {
 			var timerId = this.setErrorHandler();
 			var self = this;
 			$.ajax({
-				url: 'http://picasaweb.google.com/data/feed/api/user/' + this.userId,
+				url: '//picasaweb.google.com/data/feed/api/user/' + this.userId,
 				data: 'alt=json-in-script&imgmax=' + this.imgMax + '&thumbsize=200&kind=photo&max-results=25&start-index=' + this.recently_uploaded_photo_start_index,
 				dataType: 'jsonp',
 				success: function (data) {

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "4.1.1"
+    VERSION = "4.1.2"
   end
 end

data/plugin/datepicker.rb

@@ -12,9 +12,9 @@
 return if feed? || @conf.mobile_agent?
 
 if /\A(?:form|preview|append|edit|update)\z/ =~ @mode
-   enable_js('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
+   enable_js('//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')
    if @conf.lang == 'ja'
-      enable_js('http://ajax.googleapis.com/ajax/libs/jqueryui/1/i18n/jquery.ui.datepicker-ja.min.js')
+      enable_js('//ajax.googleapis.com/ajax/libs/jqueryui/1/i18n/jquery.ui.datepicker-ja.min.js')
    end
    enable_js('datepicker.js')
 end

data/plugin/flickr.rb

@@ -38,17 +38,17 @@ def flickr(photo_id, size = nil, place = 'flickr')
     return '[ERROR] flickr.rb: API Key is not specified.'
   end
   size ||= @conf['flickr.default_size']
-  size = 'small' if @conf.iphone?
+  size = 'small' if @conf.smartphone?
   photo = flickr_photo_info(photo_id.to_s, size)
   unless photo
     return '[ERROR] flickr.rb: failed to get photo.'
   end
 
-  if @cgi.mobile_agent?
+  if @conf.mobile_agent?
     body = %Q|<a href="#{photo[:src]}" class="flickr">#{photo[:title]}</a>|
   else
     body = %Q|<a href="#{photo[:page]}" class="flickr"><img title="#{photo[:title]}" alt="#{photo[:title]}" src="#{photo[:src]}" class="#{place}"|
-   unless @conf.iphone?
+   unless @conf.smartphone?
     body << %Q| width="#{photo[:width]}"| if photo[:width]
     body << %Q| height="#{photo[:height]}"| if photo[:height]
    end

data/plugin/google_map.rb

@@ -7,7 +7,6 @@
 # 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)
@@ -19,48 +18,53 @@ def google_geomap(address, params = {})
 end
 
 def google_map_common(params)
-   init_gmap_data
-   if feed?
-     require 'cgi'
-     query = params[:lat] && params[:lon] ? "#{params[:lat]},#{params[:lon]}" : params[:address]
-     url = %Q|http://maps.google.com/maps?q=#{CGI::escape(query)}|
-     return %Q|<a href="#{url}">#{url}</a>|
-   end
-   return 'not support this environment.' if @conf.mobile_agent?
-
+   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[:address] ||= nil
    params[:type]    ||= :ROADMAP
    params[:overview]||= false
 
-   dom_id = "#{@date.strftime("%Y%m")}_#{@gmap_count}"
+   if feed?
+      require 'cgi'
+      query = params[:lat] && params[:lon] ? "#{params[:lat]},#{params[:lon]}" : params[:address]
+      url   = %Q|http://maps.google.com/maps?q=#{CGI::escape(query)}|
+      return %Q|<a href="#{url}">#{url}</a>|
+   end
+   return 'not support this environment.' if @conf.mobile_agent?
+
+   dom_id = "#{@gmap_date.strftime("%Y%m%d")}_#{@gmap_count}"
    params.merge!(:id => dom_id)
    params.merge!(:width => 240, :height => 180) if @conf.iphone?
    @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="http://maps.google.com/maps/api/js?sensor=#{!@conf.smartphone?.nil?}"></script>\n|
    end
 end
 
-
+add_body_enter_proc do |date|
+   @gmap_data  = []
+   @gmap_date  = date
+   @gmap_count = 0
+   ''
+end
 
 add_body_leave_proc do |date|
-   init_gmap_data
    gmap_scripts = ''
    if !feed? && @gmap_data.any?
       gmap_scripts = %Q|<script type="text/javascript">\n<!--\n|
-      while @gmap_data.any?
-         data = @gmap_data.shift
+      @gmap_data.each do |data|
          if data[:address]
             gmap_scripts << google_geomap_script(data)
          else
@@ -72,42 +76,39 @@ add_body_leave_proc do |date|
    gmap_scripts
 end
 
-def init_gmap_data
-   @gmap_data  ||= []
-   @gmap_count ||= 0
-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|  var myOptions = {\n|
-   str << %Q|        zoom: #{hash[:zoom]},\n|
-   str << %Q|        overviewMapControl: #{hash[:overview]},\n|
-   str << %Q|        overviewMapControlOptions: {\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|         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|
+   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|
+   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|
+   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
@@ -116,44 +117,46 @@ end
 def google_geomap_script(hash)
    str = ''
    str << %Q|google.maps.event.addDomListener(window, 'load', function() {\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 mapdiv = document.getElementById("#{hash[:id]}");\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|
+   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|
+   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|
+   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|            }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 << %Q|   }\n|
    str << %Q|});\n|
 
    str

data/plugin/hatena_star.rb

@@ -10,7 +10,7 @@
 }
 
 add_header_proc do
-	hatena_star = %Q|\t<script type="text/javascript" src="http://s.hatena.ne.jp/js/HatenaStar.js"></script>\n|
+	hatena_star = %Q|\t<script type="text/javascript" src="//s.hatena.ne.jp/js/HatenaStar.js"></script>\n|
 	hatena_star << %Q|\t<script type="text/javascript"><!--
 		Hatena.Star.SiteConfig = {
 			entryNodes: {

data/plugin/instagr.rb

@@ -24,7 +24,7 @@ def instagr( short_url, size = :medium)
 
 	# img size
 	size = size.to_sym if size != :medium
-	maxwidth_data = {:small => 150, :medium => 306, :large => 612}
+	maxwidth_data = {:medium => 320, :large => 612}
 	maxwidth = maxwidth_data[ size ] ? maxwidth_data[ size ] : maxwidth_data[:medium]
 
 	# proxy
@@ -44,7 +44,7 @@ def instagr( short_url, size = :medium)
 		return <<-INSTAGR_DOM
 			<div class="instagr">
 				<a class="instagr" href="#{h short_url}" title="#{h @conf.to_native(json_data["title"])}">
-					<img src="#{h json_data["url"]}" width="#{h width}" height="#{h height}" alt="#{h @conf.to_native(json_data["title"])}">
+					<img src="#{h json_data["thumbnail_url"]}" width="#{h width}" height="#{h height}" alt="#{h @conf.to_native(json_data["title"])}">
 				</a>
 				<p>#{h json_data["author_name"]}'s photo.</p>
 			</div>

data/plugin/nicovideo.rb

@@ -22,7 +22,6 @@
 #
 require 'net/http'
 require 'timeout'
-require 'rexml/document'
 
 enable_js( 'nicovideo.js' )
 
@@ -35,10 +34,14 @@ def nicovideo_call_api( video_id )
 		px_port = 80 if px_host and !px_port
 		Net::HTTP::Proxy( px_host, px_port ).get_response( URI::parse( uri ) ).body
 	}
-	doc = REXML::Document::new( xml ).root
-	res = doc.elements.to_a( '/nicovideo_thumb_response' )[0]
-	if res.attributes['status'] == 'ok' then
-		res.elements.to_a( 'thumb' )[0]
+	status = xml.scan(%r|<nicovideo_thumb_response\s*status="(.*)">|).flatten.first
+	if status == 'ok' then
+		raw_api = xml.scan(%r|<thumb>(.*)</thumb>|m).flatten.first.scan(%r|<(.*?)>(.*)</.*?>|)
+		api = {}
+		raw_api.each do |key, value|
+			api[key] = @conf.to_native( value )
+		end
+		api
 	else
 		raise ::Errno::ENOENT::new
 	end
@@ -47,16 +50,16 @@ end
 def nicovideo_inline( video_id, elem, label = nil, link = nil )
 	i = {}
 	i[:id] = video_id
-	i[:url] = link || elem.to_a( 'watch_url' )[0].text
-	i[:thumb] = elem.to_a( 'thumbnail_url' )[0].text
-	i[:title] = label || elem.to_a( 'title' )[0].text
-	i[:desc] = elem.to_a( 'description' )[0].text
-	i[:comment] = @conf.mobile_agent? ? '' : elem.to_a( 'last_res_body' )[0].text
-	i[:date] = elem.to_a( 'first_retrieve' )[0].text
-	i[:length] = elem.to_a( 'length' )[0].text
-	i[:view] = elem.to_a( 'view_counter' )[0].text
-	i[:comment_num] = elem.to_a( 'comment_num' )[0].text
-	i[:mylist] = elem.to_a( 'mylist_counter' )[0].text
+	i[:url] = link || elem['watch_url']
+	i[:thumb] = elem['thumbnail_url']
+	i[:title] = label || elem['title']
+	i[:desc] = elem['description']
+	i[:comment] = @conf.mobile_agent? ? '' : elem['last_res_body']
+	i[:date] = elem['first_retrieve']
+	i[:length] = elem['length']
+	i[:view] = elem['view_counter']
+	i[:comment_num] = elem['comment_num']
+	i[:mylist] = elem['mylist_counter']
 
 	if feed? then
 		result = nicovideo_feed( i )
@@ -86,7 +89,7 @@ def nicovideo( video_id, label = nil, link = nil )
 	begin
 		r = ''
 		r << %Q|<div id="thumbnail-#{video_id}">|
-		api = nicovideo_call_api( video_id ).elements
+		api = nicovideo_call_api( video_id )
 		thumb = @conf.to_native( nicovideo_inline( video_id, api, label, link ), 'UTF-8' )
 		thumb.gsub!( /"INLINE_PLAYER"/, %Q|"#" onclick="return nicovideoPlayer( '#{video_id}' );"| )
 		r << thumb
@@ -101,7 +104,7 @@ def nicovideo( video_id, label = nil, link = nil )
 			r << %Q|</a>|
 			r << %Q|<div class="nicovideo-player-close" style="margin:4px;padding:8px;">|
 			r << %Q|<a href="#" onclick="return nicovideoThumbnail( '#{video_id}' )" style="background-color:black; color:white; margin:2px; padding:8px; border-color:white; border-radius:6px; border-width:2px; border-style:solid; text-decoration:none;">▲CLOSE PLAYER</a>|
-			r << %Q|&nbsp;<a href="#{api.to_a( 'watch_url' )[0].text}" style="background-color:black; color:white; margin:2px; padding:8px; border-color:white; border-radius:6px; border-width:2px; border-style:solid; text-decoration:none;">SHOW ORIGINAL&gt;</a>|
+			r << %Q|&nbsp;<a href="#{api['watch_url']}" style="background-color:black; color:white; margin:2px; padding:8px; border-color:white; border-radius:6px; border-width:2px; border-style:solid; text-decoration:none;">SHOW ORIGINAL&gt;</a>|
 			r << %Q|</div>|
 			r << %Q|</div>|
 		end
@@ -109,6 +112,8 @@ def nicovideo( video_id, label = nil, link = nil )
 	rescue ::Errno::ENOENT
 		"<strong>Sorry, #{video_id} was deleted.</strong>"
 	rescue Timeout::Error, NoMethodError, SecurityError, StandardError
+		puts $!
+		$@.each{|l| puts l}
 		nicovideo_iframe( video_id )
 	end
 end

data/plugin/picasa.rb

@@ -54,3 +54,19 @@ add_edit_proc do |date|
 		HTML
 	end
 end
+
+add_conf_proc( 'picasa', 'Picasa' ) do
+	if @mode == 'saveconf'
+		@conf['picasa.user'], = @cgi.params['picasa.user']
+		@conf['picasa.default_size'] = @cgi.params['picasa.default_size'][0].to_i
+		@conf['picasa.default_size'] = 400 if @conf['picasa.default_size'] == 0
+	end
+
+	<<-HTML
+	<h3 class="subtitle">Picasa user name</h3>
+	<p><input name="picasa.user" value="#{h @conf['picasa.user']}"></p>
+
+	<h3 class="subtitle">default size</h3>
+	<p><input name="picasa.default_size" value="#{h @conf['picasa.default_size']}"></p>
+	HTML
+end

data/plugin/rubykaigi.rb

@@ -9,6 +9,12 @@
 # Distributed under GPL.
 #
 
+def rubykaigi2014( role = 'attendee', size = nil )
+	r = role.split(/[ _]+/).join('-')
+	s = "@#{h size}" unless size.nil?
+	%Q|<a href="http://rubykaigi.org/2014/" style="display:block;margin:8px auto;text-align:center;"><img src="http://rubykaigi.org/2014/images/badge-for-#{h r}#{s}.png" alt="RubyKaigi 2014 #{h r}"></a>|
+end
+
 def rubykaigi2013( role = 'attendee', size = nil )
 	r = role.split(/[ _]+/).map{|s| s.capitalize}.join
 	s = "@#{h size}" unless size.nil?
@@ -83,7 +89,7 @@ def rubykaigi2008( role = 'attendee' )
 		role = 'attendee'
 		0
 	end
-	%Q|<div style="text-align: center; margin-top: 0.5em; margin-bottom: 0.5em;"><a href="http://jp.rubyist.net/RubyKaigi2008/"><img src="http://rubykaigi.tdiary.net/images/20080617_#{img}.png" width="160" height="79" alt="RubyKaigi2008#{h role.capitalize}" style="border-width: 0px;"></a></div>|
+	%Q|<div style="text-align: center; margin-top: 0.5em; margin-bottom: 0.5em;"><a href="http://jp.rubyist.net/RubyKaigi2008/"><img src="http://userimages.tdiary.net/rubykaigi/20080617_#{img}.png" width="160" height="79" alt="RubyKaigi2008#{h role.capitalize}" style="border-width: 0px;"></a></div>|
 end
 
 def sappororubykaigi02( role = 'attendee' )

data/plugin/search-google-custom.rb

@@ -20,7 +20,7 @@ def search_title
 end
 
 add_footer_proc do
-		%Q|<script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&lang=ja"></script>|
+		%Q|<script type="text/javascript" src="//www.google.com/cse/brand?form=cse-search-box&lang=ja"></script>|
 end
 
 def search_input_form(q='')

data/plugin/select-style.rb

@@ -0,0 +1,56 @@
+#
+# select-style.rb: select a style from installed styles
+#
+# add a line below, after load_cgi_conf in tdiary.conf:
+#    @style = @options2['style'] if @options2 && @options2['style']
+#
+
+def saveconf_style
+	if @mode == 'saveconf' then
+		@conf['style'] = @cgi.params['style'][0]
+	end
+end
+
+def enum_styles
+	TDiary::Style.constants(false).grep(/Diary$/).delete_if{|s|
+		s =~ /Base|Categorizable|Uncategorizable/
+	}.map{|s|
+		s.to_s.sub(/Diary$/, '').downcase
+	}.each{|s|
+		yield s
+	}
+end
+
+add_conf_proc( 'style', 'スタイル', 'update' ) do
+	saveconf_style
+
+	labels = {
+		'tdiary' => 'tDiary',
+		'wiki' => 'Wiki',
+		'gfm' => 'GFM',
+		'etdiary' => 'etDiary',
+		'emptdiary' => 'emptDiary',
+		'rd' => 'RD',
+	}
+
+	r = <<-HTML
+		<h3 class="subtitle">スタイルの指定</h3>
+		#{"<p>スタイル (日記の文法) を指定します。</p>" unless @conf.mobile_agent?}
+		<p>
+		<select name="style">
+	HTML
+	enum_styles do |style|
+		label = labels[style] || style
+		select = if (label == @conf['style']) or (!@conf['style'] && style == 'tdiary')
+			' selected'
+		else
+			''
+		end
+		r << %Q|<option value="#{label}"#{select}>#{labels[style] || style}</option>|
+	end
+	r << <<-HTML
+	</select>
+	</p>
+	#{"<p>スタイルについての詳細は<a href=\"http://tdiary-users.sourceforge.jp/cgi-bin/wiki.cgi?%A5%B9%A5%BF%A5%A4%A5%EB\">スタイル - tDiary の記法</a>をごらんください。</p>" unless @conf.mobile_agent?}
+	HTML
+end

data/plugin/tweet_quote.rb

@@ -24,7 +24,7 @@ require 'openssl'
 require 'json'
 
 def twitter_quote_option_keys
-	%w( oauth_consumer_key oauth_consumer_secret oauth_token oauth_token_secret, render_method ).map{|k| "twitter_quote.#{k}" }
+	%w( oauth_consumer_key oauth_consumer_secret oauth_token oauth_token_secret render_method ).map{|k| "twitter_quote.#{k}" }
 end
 
 def twitter_statuses_show_api( tweet_id )

data/spec/fixtures/flickr/5950109223.flickr.photos.getInfo.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rsp stat="ok">
+<photo id="5950109223" secret="040097db92" server="6006" farm="7" dateuploaded="1310997234" isfavorite="0" license="5" safety_level="0" rotation="0" originalsecret="45aaba502a" originalformat="jpg" views="111" media="photo">
+	<owner nsid="19594487@N00" username="machu." realname="" location="" iconserver="6" iconfarm="1" path_alias="machu" />
+	<title>RubyKaigi 2011</title>
+	<description />
+	<visibility ispublic="1" isfriend="0" isfamily="0" />
+	<dates posted="1310997234" taken="2011-07-18 18:44:49" takengranularity="0" takenunknown="0" lastupdate="1310997320" />
+	<editability cancomment="0" canaddmeta="0" />
+	<publiceditability cancomment="1" canaddmeta="1" />
+	<usage candownload="1" canblog="0" canprint="0" canshare="1" />
+	<comments>0</comments>
+	<notes />
+	<people haspeople="0" />
+	<tags>
+		<tag id="617957-5950109223-3919351" author="19594487@N00" authorname="machu." raw="rubykaigi" machine_tag="0">rubykaigi</tag>
+	</tags>
+	<urls>
+		<url type="photopage">https://www.flickr.com/photos/machu/5950109223/</url>
+	</urls>
+</photo>
+</rsp>