tdiary-contrib 4.1.3 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad562683f3ef04d5be651c704d813ae64c34aae
-  data.tar.gz: 17a8e5702e650f9e613fbcb964bc5205bbb11f0e
+  metadata.gz: b0261647cb0391bb468ccc2df77df87cf5b6cf65
+  data.tar.gz: 6b51bbbe6917310a9027da41d4a04dbd122bf15a
 SHA512:
-  metadata.gz: 177f717e43f0448a05f5e923288e915f7e65e029422bbd12a16b7293b38e723a5223c80ad970d818fc1c043ca701582781b85617db3f0f6f3b5043a0c5f4925a
-  data.tar.gz: be994ffdfa8e0976b04730cc84858ab6542b50bc50369899c09f48d14c6f96ce601b8c5b139e24895006473231a3fa38653a216372fb0d5d6c262a9cbed72eaf
+  metadata.gz: da4972ac0fadf204dc2f4f1da359a16ae57ae32762acf35e46eba06a3495f7c3d376b341d43d52a46a6d066811e10aeea6bc8c3e4f86441d0ff8ac7215468892
+  data.tar.gz: 9b5e50c6d5ca78ad1d19948f0b17af6f981e774c11b70e7e5fc7ed5dbcc85d4163a3bd826efb75ab58cdf798d755b800617e5bf36a2dc9ca5456271f215ea670

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.7)
+    addressable (2.3.8)
     coderay (1.1.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
@@ -9,10 +9,9 @@ GEM
     docile (1.1.5)
     json (1.8.3)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    multi_json (1.10.1)
+    mime-types (2.6.2)
     netrc (0.10.3)
-    pry (0.10.1)
+    pry (0.10.2)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -20,34 +19,34 @@ GEM
     rest-client (1.7.3)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    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)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     ruby-pushbullet (0.1.3)
       json
       rest-client (~> 1.7.2)
     safe_yaml (1.0.4)
-    simplecov (0.9.1)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
-    tdiary (4.1.1)
+    tdiary (4.1.3)
       bundler (~> 1.3)
       thor (~> 0.18)
     thor (0.19.1)
-    webmock (1.20.4)
+    webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
 
@@ -64,4 +63,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.10.3
+   1.10.6

data/js/hide_sidebar_smartphone.js

@@ -0,0 +1,14 @@
+/*
+ * hide_sidebar_smartphone.js
+ *
+ * Copyright (C) 2011 by TADA Tadashi <t@tdtds.jp>
+ * You can distribute it under GPL2 or any later version.
+ */
+
+$(function(){
+	if($(window).width() <= 360) {
+		$('div.sidebar').hide();
+		$('div.main').attr('width', '100%').attr('float', 'none');
+	}
+});
+

data/js/image_ex.js

@@ -62,18 +62,20 @@ $(function() {
 		}
 	}
 
-	$(document).ready(function() {
-		$("img.image-ex").bind("load", function() {
-			resizeImage(this);
+	$(window).width() <= 360) {
+		$(document).ready(function() {
+			$("img.image-ex").bind("load", function() {
+				resizeImage(this);
+			});
 		});
-	});
 
-	// for when images have been cached
-	$(window).bind("load", function() {
-		$("img.image-ex").each(function() {
-			resizeImage(this);
+		// for when images have been cached
+		$(window).bind("load", function() {
+			$("img.image-ex").each(function() {
+				resizeImage(this);
+			});
 		});
-	});
+	}
 });
 
 // vim: set ts=3 sw=3 noexpandtab :

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "4.1.3"
+    VERSION = "4.2.0"
   end
 end

data/plugin/add_bookmark.rb

@@ -15,37 +15,33 @@ end
 add_subtitle_proc do |date, index, subtitle|
 	bookmark_init
 
-	if @conf.mobile_agent? then
-		caption = %Q|#{subtitle}|
-	else
-		caption = %Q|#{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)
-			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> |
-		end
-
-		if @conf['add.bookmark.hatena'] == 't' then
-			caption += %Q|<a href="http://b.hatena.ne.jp/append?#{h(section_url)}">|
-			caption += %Q|<img src="http://b.hatena.ne.jp/images/append.gif" width="16" height="12" style="border: 0 none;vertical-align: middle;" alt="#{@caption_hatena}" title="#{@caption_hatena}">|
-			caption += %Q|</a> |
-		end
-
-		if @conf['add.bookmark.livedoor'] == 't' then
-			caption += %Q|<a href="http://clip.livedoor.com/redirect?link=#{h(section_url)}" class="ldclip-redirect">|
-			caption += %Q|<img src="http://parts.blog.livedoor.jp/img/cmn/clip_16_16_w.gif" width="16" height="16" style="border: 0 none;vertical-align: middle;" alt="#{@caption_livedoor}" title="#{@caption_livedoor}">|
-			caption += %Q|</a> |
-		end
-
-		if @conf['add.bookmark.buzzurl'] == 't' then
-			caption += %Q|<a href="http://buzzurl.jp/entry/#{h(section_url)}">|
-			caption += %Q|<img src="http://buzzurl.jp/static/image/api/icon/add_icon_mini_10.gif" width="16" height="12" style="border: 0 none;vertical-align: middle;" title="#{@caption_buzzurl}" alt="#{@caption_buzzurl}" class="icon">|
-			caption += %Q|</a> |
-		end
+	caption = %Q|#{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)
+		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> |
+	end
+
+	if @conf['add.bookmark.hatena'] == 't' then
+		caption += %Q|<a href="http://b.hatena.ne.jp/append?#{h(section_url)}">|
+		caption += %Q|<img src="http://b.hatena.ne.jp/images/append.gif" width="16" height="12" style="border: 0 none;vertical-align: middle;" alt="#{@caption_hatena}" title="#{@caption_hatena}">|
+		caption += %Q|</a> |
+	end
+
+	if @conf['add.bookmark.livedoor'] == 't' then
+		caption += %Q|<a href="http://clip.livedoor.com/redirect?link=#{h(section_url)}" class="ldclip-redirect">|
+		caption += %Q|<img src="http://parts.blog.livedoor.jp/img/cmn/clip_16_16_w.gif" width="16" height="16" style="border: 0 none;vertical-align: middle;" alt="#{@caption_livedoor}" title="#{@caption_livedoor}">|
+		caption += %Q|</a> |
+	end
+
+	if @conf['add.bookmark.buzzurl'] == 't' then
+		caption += %Q|<a href="http://buzzurl.jp/entry/#{h(section_url)}">|
+		caption += %Q|<img src="http://buzzurl.jp/static/image/api/icon/add_icon_mini_10.gif" width="16" height="12" style="border: 0 none;vertical-align: middle;" title="#{@caption_buzzurl}" alt="#{@caption_buzzurl}" class="icon">|
+		caption += %Q|</a> |
 	end
 
 	<<-HTML

data/plugin/cocomment.rb

@@ -4,7 +4,7 @@
 # You can redistribute it and/or modify it under GPL2.
 #
 
-if @mode == 'day' and not bot? and not @conf.mobile_agent? then
+if @mode == 'day' and not bot?
 	add_body_enter_proc do |date|
 		<<-SCRIPT
 		<script type="text/javascript">

data/plugin/comment_pushbullet.rb

@@ -33,9 +33,10 @@ def comment_pushbullet
 	serial = @diaries[@date.strftime('%Y%m%d')].count_comments(true)
 	title = %Q|#{@date.strftime(header)}-#{serial} #{@comment.name}|
 	body = @comment.body.sub( /[\r\n]+\Z/, '' )
+	link = @conf.base_url + anchor(@date.strftime('%Y%m%d')) + '#c' + "%02d"%serial
 
 	Pushbullet.api_token = @conf['comment_pushbullet.access_token']
-	Pushbullet::Contact.me.push_note(title, body)
+	Pushbullet::Contact.me.push_link(title,link,body)
 end
 
 add_update_proc do

data/plugin/datepicker.rb

@@ -9,7 +9,7 @@
 #
 # not support
 #
-return if feed? || @conf.mobile_agent?
+return if feed?
 
 if /\A(?:form|preview|append|edit|update)\z/ =~ @mode
    enable_js('//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js')

data/plugin/everytrail.rb

@@ -9,9 +9,6 @@ def everytrail_adjust_size( size )
    s = size.collect {|i| i.to_i }
    s[0] = 400 if s[0] == 0
    s[1] = 300 if s[1] == 0
-   if @conf.iphone? then
-      s = [300, 300 * s[1] / s[0]]
-   end
    s
 end
 
@@ -28,8 +25,6 @@ def everytrail_flash( trip_id, label = nil, size = [400, 300] )
 end
 
 def everytrail_widget( trip_id, latitude = nil, longtitude = nil, label = nil, size = [400, 300] )
-   return '' if @conf.iphone?
-
    size = everytrail_adjust_size( size )
    lat_param = latitude ? "&startLat=#{latitude}" : ''
    lon_param = longtitude ? "&startLon=#{longtitude}" : ''

data/plugin/flickr.rb

@@ -38,22 +38,15 @@ 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.smartphone?
   photo = flickr_photo_info(photo_id.to_s, size)
   unless photo
     return '[ERROR] flickr.rb: failed to get photo.'
   end
 
-  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.smartphone?
-    body << %Q| width="#{photo[:width]}"| if photo[:width]
-    body << %Q| height="#{photo[:height]}"| if photo[:height]
-   end
-    body << %Q|></a>|
-  end
+  body = %Q|<a href="#{photo[:page]}" class="flickr"><img title="#{photo[:title]}" alt="#{photo[:title]}" src="#{photo[:src]}" class="#{place}"|
+  body << %Q| width="#{photo[:width]}"| if photo[:width]
+  body << %Q| height="#{photo[:height]}"| if photo[:height]
+  body << %Q|></a>|
 
   body
 end

data/plugin/google_adsense.rb

@@ -74,7 +74,7 @@ def google_adsense_init( layout )
 end
 
 add_section_leave_proc do |date,index|
-	if @mode == 'day' and !@conf.iphone? and index == 1 and @conf['google_adsense.slot'] then
+	if @mode == 'day' and index == 1 and @conf['google_adsense.slot'] then
 		%Q|<div class="google-adsense">#{google_adsense( 0, @conf['google_adsense.slot'] )}</div>|
 	else
 		''

data/plugin/google_map.rb

@@ -47,11 +47,9 @@ def google_map_common(params)
       return %Q|<a href="#{url}">#{url}</a>| if url
 
    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
 
@@ -60,7 +58,7 @@ 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|
+      %Q|<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=true"></script>\n|
    end
 end
 

data/plugin/hb_footer4sec_js.rb

@@ -15,7 +15,7 @@ def permalink( date, index, escape = true )
 end
 
 add_section_leave_proc do |date, index|
-	if @mode == 'day' and not bot? and not @conf.mobile_agent? then
+	if @mode == 'day' and not bot?
 		<<-SCRIPT
 		<script type= "text/javascript"><!--
 		var hatena_bookmark_anywhere_limit = 10;

data/plugin/hide_sidebar_smartphone.rb

@@ -0,0 +1,6 @@
+# hide_sidebar_smartphone.rb
+#
+# Copyright (C) 2011 by TADA Tadashi <t@tdtds.jp>
+# You can distribute it under GPL2 or any later version.
+#
+enable_js( 'hide_sidebar_smartphone.js' )

data/plugin/image_ex.rb

@@ -84,10 +84,7 @@
 @imageex_thumbnailsize = @options && @options['image_ex.previewsize'] || 120
 @imageex_yearlydir = @options && @options['image_ex.yearlydir'] || 0
 
-if @conf.smartphone?
-	enable_js("image_ex.js")
-end
-
+enable_js("image_ex.js")
 
 add_body_enter_proc(Proc.new do |date|
 	@image_date = date.strftime("%Y%m%d")

data/plugin/image_gps.rb

@@ -92,7 +92,7 @@ def image( id, alt = 'image', thumbnail = nil, size = nil, place = 'photo' )
       detail += "#{exif[e].to_s}"+sep if exif.tag?(e)
     }
     unless lat.nil?
-      unless (google_maps_api_key == '' || @conf.smartphone?)
+      unless google_maps_api_key == ''
         map_img = %Q["http://maps.googleapis.com/maps/api/staticmap?format=gif&]
         map_img += %Q[center=#{lat},#{lon}&zoom=14&size=200x200&markers=#{lat},#{lon}&]
         map_img += %Q[key=#{google_maps_api_key}&sensor=false"]
@@ -111,21 +111,14 @@ def image( id, alt = 'image', thumbnail = nil, size = nil, place = 'photo' )
 
   url  = ''
 
-  if @conf.mobile_agent?
-    url += %Q[<a href=#{google}/maps/m?q=#{lat},#{lon}>] unless lat.nil?
-    url += thumbnail ? img_t : img
-    url += %Q[</a>] unless lat.nil?
-  else
-    url += %Q[<div class="photo_detail">]
-    url += %Q[<a href="#{@image_url}/#{image}">]
-    url += thumbnail ? img_t : img
-    url += %Q[</a>]
-    url += %Q[#{detail}] if detail
-    url += %Q[</div>]
-  end
+  url += %Q[<div class="photo_detail">]
+  url += %Q[<a href="#{@image_url}/#{image}">]
+  url += thumbnail ? img_t : img
+  url += %Q[</a>]
+  url += %Q[#{detail}] if detail
+  url += %Q[</div>]
 
   url
-
 end
 add_header_proc do
   if @mode !~ /conf$/ and not bot? then

data/plugin/jquery_ui_theme.rb

@@ -9,7 +9,7 @@
 #
 # not support
 #
-return if feed? || @conf.mobile_agent?
+return if feed?
 
 add_header_proc do
    if /\A(?:form|preview|append|edit|update)\z/ =~ @mode

data/plugin/latlonglab_route.rb

@@ -8,7 +8,7 @@
 
 def route( id, w = 480, h = 480 )
 
-  if feed? or @conf.mobile_agent?
+  if feed?
     return %Q|<p><a href="http://latlonglab.yahoo.co.jp/route/watch?id=#{id}">Link to LatLongLab Route</a></p>|
   end
 

data/plugin/livedoor_weather.rb

@@ -97,7 +97,7 @@ def lwws_to_html(date)
 
 		result = ""
 		result << %Q|<div class="lwws">|
-		if @conf['lwws.icon.disp'] != "t" or @conf.mobile_agent? then
+		if @conf['lwws.icon.disp'] != "t" then
 			result << %Q|<a href="#{h(detail_url)}">#{telop}</a>|
 		else
 			result << %Q|<a href="#{h(detail_url)}"><img src="#{url}" border="0" alt="#{title}" title="#{title}" width=#{width} height="#{height}"></a>|
@@ -158,7 +158,7 @@ def lwws_conf_proc
 end
 
 add_body_enter_proc do |date|
-	unless @conf.mobile_agent? or @conf.iphone? or feed? or bot?
+	unless feed? or bot?
 		lwws_to_html(date)
 	end
 end

data/plugin/navi_day.rb

@@ -46,9 +46,9 @@ end
 alias :calc_links_navi_day_backup :calc_links
 
 def calc_links
-	if not (@conf.secure and @conf.mobile_agent?) and \
+	if not @conf.secure and \
 	       (/day|edit/ =~ @mode or \
-	        (@conf.mobile_agent? and /latest|month|nyear/ =~ @mode)) then
+	        /latest|month|nyear/ =~ @mode) then
 		if /(latest|month|nyear)/ === @mode
 			today = @diaries.keys.sort[-1]
 		else

data/plugin/nicovideo.rb

@@ -54,7 +54,7 @@ def nicovideo_inline( video_id, elem, label = nil, link = nil )
 	i[:thumb] = elem['thumbnail_url']
 	i[:title] = label || elem['title']
 	i[:desc] = elem['description']
-	i[:comment] = @conf.mobile_agent? ? '' : elem['last_res_body']
+	i[:comment] = elem['last_res_body']
 	i[:date] = elem['first_retrieve']
 	i[:length] = elem['length']
 	i[:view] = elem['view_counter']
@@ -74,7 +74,7 @@ def nicovideo_iframe( video_id )
 end
 
 def nicovideo_player( video_id, size = [544,384] )
-	if feed? or @conf.mobile_agent? or @conf.iphone? then
+	if feed?
 		nicovideo( video_id )
 	else
 		q = ''
@@ -94,7 +94,7 @@ def nicovideo( video_id, label = nil, link = nil )
 		thumb.gsub!( /"INLINE_PLAYER"/, %Q|"#" onclick="return nicovideoPlayer( '#{video_id}' );"| )
 		r << thumb
 		r << '</div>'
-		if feed? or @conf.mobile_agent? or @conf.iphone? then
+		if feed?
 			r.gsub!( /<a(?:[ \t\n\r][^>]*)?>/, '' )
 			r.gsub!( %r{</a[ \t\n\r]*>}, '' )
 		else

data/plugin/picasa.rb

@@ -19,14 +19,7 @@
 #
 
 def picasa( src, alt = "photo", place = 'photo' )
-	src.sub!( %r|/s\d+/|, "/s200/" ) if @conf.iphone?
-
-	if @cgi.mobile_agent?
-		body = %Q|<a href="#{src}">#{alt}</a>|
-	else
-		body = %Q|<img title="#{alt}" alt="#{alt}" src="#{src}" class="#{place} picasa">|
-	end
-	body
+	%Q|<img title="#{alt}" alt="#{alt}" src="#{src}" class="#{place} picasa">|
 end
 
 def picasa_left( src, alt = "photo" )

data/plugin/section_footer.rb

@@ -53,40 +53,38 @@ end
 add_section_leave_proc do |date, index|
 	r = '<div class="tags">'
 
-	unless @conf.mobile_agent? then
-		# カテゴリタグの追加
-		if @category_to_tag_list and not @category_to_tag_list.empty? then
-			r << "Tags: "
-			@category_to_tag_list.each do |tag, blog|
-				if blog
-					r << %Q|<a href="#{@index}?blogcategory=#{h tag}">#{tag}</a> |
-				else
-					r << category_anchor( "#{tag}" ).sub( /^\[/, '' ).sub( /\]$/, '' ) << ' '
-				end
+	# カテゴリタグの追加
+	if @category_to_tag_list and not @category_to_tag_list.empty? then
+		r << "Tags: "
+		@category_to_tag_list.each do |tag, blog|
+			if blog
+				r << %Q|<a href="#{@index}?blogcategory=#{h tag}">#{tag}</a> |
+			else
+				r << category_anchor( "#{tag}" ).sub( /^\[/, '' ).sub( /\]$/, '' ) << ' '
 			end
 		end
+	end
 
-		# 「このエントリの Delicious history (JSON)」
-		r << add_delicious_json(date, index)
+	# 「このエントリの Delicious history (JSON)」
+	r << add_delicious_json(date, index)
 
-		# 「このエントリを含む Delicious (画像API)」
-		# r << add_delicious(date, index)
+	# 「このエントリを含む Delicious (画像API)」
+	# r << add_delicious(date, index)
 
-		# 「このエントリを含むはてなブックーク」
-		r << add_hatenabm(date, index)
+	# 「このエントリを含むはてなブックーク」
+	r << add_hatenabm(date, index)
 
-		# 「このエントリを含む livedoor クリップ」
-		r << add_ldclip(date, index)
+	# 「このエントリを含む livedoor クリップ」
+	r << add_ldclip(date, index)
 
-		# 「このエントリを含む Buzzurl」
-		r << add_buzzurl(date, index)
+	# 「このエントリを含む Buzzurl」
+	r << add_buzzurl(date, index)
 
-		# 「このエントリを含む Yahoo!ブックマーク」
-		r << add_yahoobm(date, index)
+	# 「このエントリを含む Yahoo!ブックマーク」
+	r << add_yahoobm(date, index)
 
-		# Permalinkの追加
-		r << add_permalink(date, index)
-	end
+	# Permalinkの追加
+	r << add_permalink(date, index)
 
 	r << "</div>\n"
 end

data/plugin/section_footer2.rb

@@ -99,7 +99,7 @@ def subtitle_link( date, index, subtitle )
 end
 
 add_section_leave_proc do |date, index|
-	unless @conf.mobile_agent? or @conf.iphone? or feed? or bot?
+	unless feed? or bot?
 		r = '<div class="tags">'
 		# add category_tag
 		if @category_to_tag_list and not @category_to_tag_list.empty? then

data/plugin/select-style.rb

@@ -35,7 +35,7 @@ add_conf_proc( 'style', 'スタイル', 'update' ) do
 
 	r = <<-HTML
 		<h3 class="subtitle">スタイルの指定</h3>
-		#{"<p>スタイル (日記の文法) を指定します。</p>" unless @conf.mobile_agent?}
+		<p>スタイル (日記の文法) を指定します。</p>
 		<p>
 		<select name="style">
 	HTML
@@ -51,6 +51,6 @@ add_conf_proc( 'style', 'スタイル', 'update' ) do
 	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?}
+	<p>スタイルについての詳細は<a href="http://tdiary-users.sourceforge.jp/cgi-bin/wiki.cgi?%A5%B9%A5%BF%A5%A4%A5%EB">スタイル - tDiary の記法</a>をごらんください。</p>
 	HTML
 end

data/plugin/select_style.rb

@@ -27,7 +27,7 @@ add_conf_proc( 'style', 'スタイル' ) do
 
 	r = <<-HTML
 	<h3 class="subtitle">スタイルの指定</h3>
-	#{"<p>スタイル (日記の文法) を指定します。</p>" unless @conf.mobile_agent?}
+	<p>スタイル (日記の文法) を指定します。</p>
 	<p>
 	<select name="style">
 	HTML
@@ -37,6 +37,6 @@ add_conf_proc( 'style', 'スタイル' ) do
 	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?}
+	<p>スタイルについての詳細は<a href="http://tdiary-users.sourceforge.jp/cgi-bin/wiki.cgi?%A5%B9%A5%BF%A5%A4%A5%EB">スタイル - tDiary の記法</a>をごらんください。</p>
 	HTML
 end

data/plugin/tatsu_zine.rb

@@ -69,13 +69,13 @@ if __FILE__ == $0
 		def test_tatsu_zine
 			expect = <<-EOS
 	<a class="amazon-detail" href="http://tatsu-zine.com/books/winrubybuild"><span class="amazon-detail">
-		<img class="amazon-detail left" src="http://tatsu-zine.com/images/books/1/cover_s.jpg"
+		<img class="amazon-detail left" src="http://tatsu-zine.com/images/books/1/cover_l.jpg"
 		height="150" width="100"
 		alt="Ruby環境構築講座 Windows編">
 		<span class="amazon-detail-desc">
 			<span class="amazon-title">Ruby環境構築講座 Windows編</span><br>
 			<span class="amazon-author">arton</span><br>
-			<span class="amazon-price">1,000円(税込)</span>
+			<span class="amazon-price">1036</span>
 		</span><br style="clear: left">
 	</span></a>
 EOS

data/plugin/tdiarygraph_flashstyle.rb

@@ -265,11 +265,7 @@ end
 
 
 def tdiarygraph_flashstyle_preview
-	unless @conf.mobile_agent?
-	<<-r
-		<p>#{if @conf['tdiarygraph_f.preview'] == "1" then "#{tdiarygraph_flashstyle}" else "プレビュー表示を有効にすると、ここに Flash が表示されます。" end}</p>
-	r
-	end
+	%Q|<p>#{if @conf['tdiarygraph_f.preview'] == "1" then "#{tdiarygraph_flashstyle}" else "プレビュー表示を有効にすると、ここに Flash が表示されます。" end}</p>|
 end
 
 

data/plugin/tdiarytimes_flashstyle.rb

@@ -240,11 +240,7 @@ end
 
 
 def tdiarytimes_flashstyle_preview
-	unless @conf.mobile_agent?
-	<<-r
-		<p>#{if @conf['tdiarytimes_f.preview'] == "1" then "#{tdiarytimes_flashstyle}" else "プレビュー表示を有効にすると、ここに Flash が表示されます。" end}</p>
-	r
-	end
+	%Q|<p>#{if @conf['tdiarytimes_f.preview'] == "1" then "#{tdiarytimes_flashstyle}" else "プレビュー表示を有効にすると、ここに Flash が表示されます。" end}</p>|
 end
 
 def tdiarytimes_flashstyle_templete( filename="tdiarytimes234x30.swf", argvs="", width="234", height="30" )

data/plugin/tdiarytimes_textstyle.rb

@@ -212,13 +212,6 @@ end
 # --------------------------------------------------------------------
 
 def tdiarytimes_textstyle(init_text = nil, entr_text = nil, init_color = nil, entr_color = nil, fade_color = nil, init_css = nil, entr_css = nil, title_text = nil, fade_time = nil)
-
-
-    # モバイル端末、テキストブラウザ、CSS非対応ブラウザ、検索ボットなどには結果を出力しない
-
-    unless @cgi.mobile_agent? || @cgi.user_agent =~ %r[(#{tdiarytimes_textstyle_ignore_user_agent})]i
-
-
 	r = ""
 
 

data/plugin/twitter_anywhere.rb

@@ -158,9 +158,7 @@ add_conf_proc( 'twitter_anywhere', 'Twitter Anywhere' ) do
 end
 
 def support_anywhere?
-   return false if @conf.mobile_agent? || feed?
-   return true
-
+   return !feed?
 end
 
 def ready_anywhere?

data/plugin/ustream.rb

@@ -11,7 +11,7 @@ def ustream( id, type = :recorded )
 	end
 
 	# insert recorded video
-	if @conf.mobile_agent? or @conf.iphone? or feed? then
+	if feed? then
 		return %Q|<a href="http://www.ustream.tv/recorded/#{id}">Link to Ustream ##{id}</a></p><p>|
 	end
 

data/plugin/vimeo.rb

@@ -6,7 +6,7 @@
 #
 
 def vimeo( id )
-	if @conf.mobile_agent? or @conf.iphone? or feed? then
+	if feed? then
 		return %Q|<a href="http://vimeo.com/#{id}">Link to vimeo ##{id}</a></p><p>|
 	end
 

data/plugin/yahoo_map.rb

@@ -44,18 +44,14 @@ def yahoo_map(lat, lon, options = {})
    options[:layer] ||= 17
    options[:size] ||= 'medium'
 
-   if feed? or @conf.mobile_agent? then
+   if feed?
       return %Q|<p><a href="http://map.yahoo.co.jp/pl?type=scroll&amp;lat=#{lat}&amp;lon=#{lon}&amp;z=17&amp;mode=map&amp;pointer=on&amp;datum=wgs&amp;fa=ks&amp;home=on&amp;hlat=#{lat}&amp;hlon=#{lon}&amp;layout=&amp;ei=utf-8&amp;p=">Link to Yahoo! JAPAN Map </a></p>|
    end
 
    # define map size
-   height = {'iphone' => '240px', 'small'=> '240px', 'medium' => '360px', 'large' => '480px'}
-   width = {'iphone' => '240px', 'small' => '320px', 'medium' => '480px', 'large' => '640px'}
-   if @conf.iphone? then
-      size = 'iphone'
-   else
-      size = options[:size]
-   end
+   height = {'small'=> '240px', 'medium' => '360px', 'large' => '480px'}
+   width = {'small' => '320px', 'medium' => '480px', 'large' => '640px'}
+   size = options[:size]
 
    ymapid = generate_ymapid(lat, lon, options[:layer], options[:size])
    ymap_info = {:ymapid => ymapid, :lat => lat, :lon => lon, :layer => options[:layer]}

data/plugin/youtube.rb

@@ -6,15 +6,8 @@
 # usage: <%= youtube 'VIDEO_ID' %>
 #
 def youtube( video_id, size = [425,350] )
-	if @conf.mobile_agent? or feed? then
+	if feed?
 		%Q|<div class="youtube"><a href="http://www.youtube.com/watch?v=#{video_id}">YouTube (#{video_id})</a></div>|
-	elsif defined?( :smartphone? ) and @conf.smartphone?
-		size = [240, 194]
-		<<-TAG
-		<iframe class="youtube-player" type="text/html" width="#{size[0]}" height="#{size[1]}" src="http://www.youtube.com/embed/#{video_id}" frameborder="0">
-		</iframe>
-		<div class="youtube"><a href="http://www.youtube.com/watch?v=#{video_id}">YouTube (#{video_id})</a></div>
-		TAG
 	else
 		<<-TAG
 		<iframe class="youtube-player" type="text/html" width="#{size[0]}" height="#{size[1]}" src="http://www.youtube.com/embed/#{video_id}" frameborder="0">

data/spec/spec_helper.rb

@@ -152,11 +152,11 @@ class PluginFake
 		end
 
 		def mobile_agent?
-			@cgi.mobile_agent?
+			false
 		end
 
     def smartphone?
-      @cgi.iphone?
+      false
     end
 
 		def bot?
@@ -169,7 +169,7 @@ class PluginFake
   end
 
 	def iphone?
-		@conf.cgi.iphone?
+		false
 	end
 	alias ipod? iphone?
 end
@@ -182,17 +182,11 @@ class CGIFake
 	end
 
 	def mobile_agent?
-		self.user_agent =~ %r[
-			^DoCoMo|
-			^(?:KDDI|UP\.Browser)|
-			^(?:J-(?:PHONE|EMULATOR)|Vodafone|SoftBank|MOT-|[VS]emulator)|
-			WILLCOM|DDIPOCKET|
-			PDXGW|ASTEL|Palmscape|Xiino|sharp\ pda\ browser|Windows\ CE|L-mode
-		]x
+		false
 	end
 
 	def iphone?
-		self.user_agent =~ /iP(?:hone|od)/
+		false
 	end
 end
 

data/spec/youtube_spec.rb

@@ -5,8 +5,6 @@ describe "youtube plugin" do
 	DUMMY_YOUTUBE_VIDEO_ID = 1234567890
 
   {
-    'DoCoMo' => %|<div class="youtube"><a href="http://www.youtube.com/watch?v=#{DUMMY_YOUTUBE_VIDEO_ID}">YouTube (#{DUMMY_YOUTUBE_VIDEO_ID})</a></div>|,
-    'iPhone' => %|\t\t<iframe class="youtube-player" type="text/html" width="240" height="194" src="http://www.youtube.com/embed/#{DUMMY_YOUTUBE_VIDEO_ID}" frameborder="0">\n\t\t</iframe>\n\t\t<div class="youtube"><a href="http://www.youtube.com/watch?v=#{DUMMY_YOUTUBE_VIDEO_ID}">YouTube (#{DUMMY_YOUTUBE_VIDEO_ID})</a></div>\n|,
     'Mozilla' => %|\t\t<iframe class="youtube-player" type="text/html" width="425" height="350" src="http://www.youtube.com/embed/#{DUMMY_YOUTUBE_VIDEO_ID}" frameborder="0">\n\t\t</iframe>\n|
   }.each do |k,v|
     it 'should render object tag in :user_agent' do

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

@@ -244,22 +244,16 @@ begin
 		'type' => 'text/html',
 		'Vary' => 'User-Agent'
 	}
-	if @cgi.mobile_agent? then
-		body = conf.to_mobile( tdiary.eval_rhtml( 'i.' ) )
-		head['charset'] = conf.mobile_encoding
-		head['Content-Length'] = body.bytesize.to_s
+	if @cgi['type'] == 'rss'
+		head['type'] = "application/xml; charset=#{conf.encoding}"
+		body = tdiary.eval_rxml
 	else
-		if @cgi['type'] == 'rss'
-			head['type'] = "application/xml; charset=#{conf.encoding}"
-			body = tdiary.eval_rxml
-		else
-			body = tdiary.eval_rhtml
-		end
-		head['charset'] = conf.encoding
-		head['Content-Length'] = body.bytesize.to_s
-		head['Pragma'] = 'no-cache'
-		head['Cache-Control'] = 'no-cache'
+		body = tdiary.eval_rhtml
 	end
+	head['charset'] = conf.encoding
+	head['Content-Length'] = body.bytesize.to_s
+	head['Pragma'] = 'no-cache'
+	head['Cache-Control'] = 'no-cache'
 	print @cgi.header( head )
 	print body
 rescue Exception

data/util/image-gallery/README.ja

@@ -10,8 +10,8 @@ tDiary Image Gallery Ver 2.1.0 -- README.ja --
 
 ■使い方の詳細は…
 　以下のサイトをご覧下さい。
-  ・配布サイト
-　　　http://www1.whi.m-net.ne.jp/n-kashi/image-gallery2.html
+  ・ドキュメント・サイト
+　　　http://exception.rash.jp/tdiary/image-gallery2.html
   ・作者の日記のサポート・ページ
 　　　http://exception.rash.jp/diary/?date=20010101
 

data/util/rast-search/rast-search.rb

@@ -219,22 +219,16 @@ begin
 		'type' => 'text/html',
 		'Vary' => 'User-Agent'
 	}
-	if @cgi.mobile_agent? then
-		body = conf.to_mobile( tdiary.eval_rhtml( 'i.' ) )
-		head['charset'] = conf.mobile_encoding
-		head['Content-Length'] = body.size.to_s
+	if @cgi['type'] == 'rss'
+		head['type'] = "application/xml; charset=#{conf.encoding}"
+		body = tdiary.eval_rxml
 	else
-		if @cgi['type'] == 'rss'
-			head['type'] = "application/xml; charset=#{conf.encoding}"
-			body = tdiary.eval_rxml
-		else
-			body = tdiary.eval_rhtml
-		end
-		head['charset'] = conf.encoding
-		head['Content-Length'] = body.size.to_s
-		head['Pragma'] = 'no-cache'
-		head['Cache-Control'] = 'no-cache'
+		body = tdiary.eval_rhtml
 	end
+	head['charset'] = conf.encoding
+	head['Content-Length'] = body.size.to_s
+	head['Pragma'] = 'no-cache'
+	head['Cache-Control'] = 'no-cache'
 	print @cgi.header( head )
 	print body
 rescue Exception

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.2.0
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -121,6 +121,7 @@ files:
 - js/datepicker.js
 - js/editor.js
 - js/flickr.js
+- js/hide_sidebar_smartphone.js
 - js/image_ex.js
 - js/jquery.socialbutton.js
 - js/nicovideo.js
@@ -227,7 +228,7 @@ files:
 - plugin/hb_footer4sec.rb
 - plugin/hb_footer4sec_js.rb
 - plugin/hide_comment_form.rb
-- plugin/hide_sidebar_iphone.rb
+- plugin/hide_sidebar_smartphone.rb
 - plugin/iddy.rb
 - plugin/image_ex.rb
 - plugin/image_gps.rb
@@ -464,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package

data/plugin/hide_sidebar_iphone.rb

@@ -1,21 +0,0 @@
-# hide_sidebar_iphone.rb
-#
-# Copyright (C) 2008 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
-# You can redistribute it and/or modify it under GPL2.
-#
-
-add_header_proc do
-	if @conf.iphone? then
-		<<-CSS
-		<style type="text/css"><!--
-		div.sidebar {
-			display: none;
-		}
-		div.main {
-			width: 100%;
-			float: none;
-		}
-		--></style>
-		CSS
-	end
-end