tdiary-contrib 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 405cd097929d2ebb15d36cf9c8dcd4fe8febacda
-  data.tar.gz: b8970c2874a69145ef16384c8e831ed0cc7de9de
+  metadata.gz: cb4987d60e60c9a3130d9883de1ad14d41105c87
+  data.tar.gz: 0cc0f6d11ef5e64a16ad5c77273439f5a8eefa3a
 SHA512:
-  metadata.gz: 42f28c48e85063137b70a21b069ae36be86f6b1daa55ea8d6f64ceb03f6559aaff1f473a056c58169a173a8d781c747e86841725e7f3020ae1c3fef84d45c6e0
-  data.tar.gz: 68ab7a4e1eef86197e9415bc803f3d15f4132110277c07e3af74752d3eabe1644d23636c5713b553df17437a20a73c1cbb68b9f4f256dd4c55e21e5105a19fe2
+  metadata.gz: 1dec6581b5097a1c9a4d1bcea6bab76387ba319fb2628b657eae092b27bca6c257d9847cb030e35a2e46222605d648de4503eea259310c5ecf0910b0b864e133
+  data.tar.gz: 7739d7edcc96fb474a81e25008482f568c55ab8e1daf59c3091226e4b76ab7e5022cc875b6370fe9965e9e26ffbe78c9ec81265e6f89f8628ba0534fb61b4160

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'tdiary', '~> 4.0.2'
+gem 'tdiary', '~> 4.1.0'
 
 gem 'rake'
 gem 'rspec'

data/Gemfile.lock

@@ -4,12 +4,12 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     multi_json (1.10.1)
-    rake (10.3.2)
+    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.6)
+    rspec-core (3.1.7)
       rspec-support (~> 3.1.0)
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -22,7 +22,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    tdiary (4.0.5.1)
+    tdiary (4.1.0.20141126)
       bundler (~> 1.3)
       thor (~> 0.18)
     thor (0.19.1)
@@ -34,4 +34,4 @@ DEPENDENCIES
   rake
   rspec
   simplecov
-  tdiary (~> 4.0.2)
+  tdiary (~> 4.1.0)

data/README.en.md

@@ -3,6 +3,15 @@
 This package include some utilities and plugins for tDiary.
 See documents in each directories.
 
+To use with tDiary, make "Gemfile.local" file on top of
+tDiary, and write a line like below:
+
+```
+gem 'tdiary-contrib'
+```
+
+----
+
 See licenses and copyrights in each theme files. If no license
 or copyright, it can be distoributed by GPL2, and it has a
 copyright below:

data/README.md

@@ -4,6 +4,15 @@
 インが収録されています。ドキュメントはそれぞれのツールのディレクトリ
 に含まれています。
 
+tDiaryで使う場合は、tDiaryのトップディレクトリに Gemfile.local という
+ファイルを作成し、以下のように記述します:
+
+```
+gem 'tdiary-contrib'
+```
+
+----
+
 著作権およびライセンスは各テーマのファイルに記述してあるものに従いま
 すが、特に明記されていない場合、配布条件はGPL2、著作権は以下になりま
 す。

data/js/socialbutton.js

@@ -87,7 +87,7 @@ $(function() {
     $('.socialbuttons').css('height', '1em')
     var bottom = $(window).height() + $(window).scrollTop();
 
-    $($tDiary.blogkit ? '.day' : '.section')
+    $($tDiary.blogkit ? '.day' : '.day .section')
       .filter(function() {
         return bottom > $(this).offset().top;
       })
@@ -103,7 +103,7 @@ $(function() {
         } else if (anchor.size() == 0) {
           // The section may not have an anchor on etdiary style.
           // https://github.com/tdiary/tdiary-contrib/issues/59
-          var url = $(this).parents('.day').find('h2 a:first').get(0).href;
+          var url = ($(this).parents('.day').find('h2 a:first').get(0)||'').href;
           var title = $(this).parents('.day').find('h2 .title').text();
         } else {
           var url = anchor.get(0).href;

data/lib/tdiary/contrib/version.rb

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

data/plugin/google_universal_analytics.rb

@@ -0,0 +1,39 @@
+#
+# Google Universal Analytics plugin for tDiary
+#
+# Copyright (C) 2014 TSUNEMATSU Shinya <s@tnmt.info>
+# You can redistribute it and/or modify it under GPL2.
+#
+if /^(?:latest|day|month|nyear|search)$/ =~ @mode then
+	add_footer_proc do
+		google_universal_analytics_insert_code
+	end
+end
+
+def google_universal_analytics_insert_code
+	return '' unless @conf['google_universal_analytics.profile']
+	<<-HTML
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-#{h @conf['google_universal_analytics.profile']}', 'auto');
+  ga('require', 'displayfeatures');
+  ga('send', 'pageview');
+</script>
+	HTML
+end
+
+# UA-53836-1
+add_conf_proc( 'google_universal_analytics', 'Google Universal Analytics' ) do
+	if @mode == 'saveconf' then
+		@conf['google_universal_analytics.profile'] = @cgi.params['google_universal_analytics.profile'][0]
+	end
+	<<-HTML
+		<h3>Google Universal Analytics Profile</h3>
+		<p>set your Profile ID (NNNNN-N)</p>
+		<p><input name="google_universal_analytics.profile" value="#{h @conf['google_universal_analytics.profile']}"></p>
+	HTML
+end

data/plugin/mathjax.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# mathjax.rb $Revision: $
+#
+# MathJaxを使った数式表示のためのプラグイン
+#
+# MathJaxでTeXやMathMLを使った数式を埋め込むことができます。
+#
+# MathJaxについては、http://www.mathjax.org/ を参照のこと
+#
+# Copyright (C) 2014 by Yuh Ohmura <http://yutopia.pussycat.jp/diary/>
+#
+=begin ChangeLog
+2014-12-17 Yuh Ohmura
+	* created.
+=end
+add_header_proc do
+'<script type="text/x-mathjax-config">
+  MathJax.Hub.Config({tex2jax: {inlineMath: [[\'$\',\'$\'], ["\\\\(","\\\\)"]]}});
+</script>
+<script type="text/javascript"
+  src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+</script>'
+end

data/spec/google_universal_analytics_spec.rb

@@ -0,0 +1,60 @@
+$:.unshift(File.dirname(__FILE__))
+require 'spec_helper'
+
+describe "google_universal_analytics plugin" do
+	def setup_google_universal_analytics_plugin(profile_id, mode)
+		fake_plugin(:google_universal_analytics) { |plugin|
+			plugin.mode = mode
+			plugin.conf['google_universal_analytics.profile'] = profile_id
+		}
+	end
+
+	describe "should render javascript" do
+		before do
+			@plugin = setup_google_universal_analytics_plugin('53836-1', 'latest')
+		end
+
+		it "for footer" do
+			snippet = @plugin.footer_proc
+			expect(snippet).to eq(expected_html_footer_snippet)
+		end
+	end
+
+	describe "should render javascript" do
+		before do
+			@plugin = setup_google_universal_analytics_plugin('53836-1', 'conf')
+		end
+
+		it "for footer" do
+			snippet = @plugin.footer_proc
+			expect(snippet).to be_empty
+		end
+	end
+
+	describe "should not render when profile_id is empty" do
+		before do
+			@plugin = setup_google_universal_analytics_plugin(nil, 'latest')
+		end
+
+		it "for footer" do
+			snippet = @plugin.footer_proc
+			expect(snippet).to be_empty
+		end
+	end
+
+	def expected_html_footer_snippet
+		expected = <<-SCRIPT
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-53836-1', 'auto');
+  ga('require', 'displayfeatures');
+  ga('send', 'pageview');
+</script>
+		SCRIPT
+		expected.gsub( /^\t/, '' ).chomp
+	end
+end

data/util/image-gallery/README.ja

@@ -1,6 +1,6 @@
-tDiary Image Gallery Ver 2.0.4 -- README.ja --
+tDiary Image Gallery Ver 2.1.0 -- README.ja --
 
-  Copyright (c) 2005-2013 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
+  Copyright (c) 2005-2014 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
   You can redistribute it and/or modify it under GPL2.
 ===================
 

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-# image-gallery.rb $Revision: 2.0.4 $
+# image-gallery.rb $Revision: 2.1.0 $
 #
 # Copyright (c) 2005-2013 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
 # You can redistribute it and/or modify it under GPL2.
@@ -16,6 +16,7 @@ else
   org_path = File::dirname( __FILE__ )
 end
 $:.unshift( org_path.untaint )
+$:.unshift( (org_path + '/lib').untaint ) unless $:.include?( org_path + '/lib' )
 require 'tdiary'
 require 'pstore'
 require 'date'
@@ -43,7 +44,7 @@ module TDiary
 
     def initialize( cgi, rhtml, conf )
       super
-      @img_version = "2.0.4"
+      @img_version = "2.1.0"
       @image_hash = Hash[]
       @image_num = 0
       @image_keys = []

data/util/image-gallery/js/SmoothGallery/css/jd.gallery.css

@@ -3,7 +3,8 @@
 	width: 720px;
 	height: 720px;
 	z-index:5;
-	border: 1px solid #000;
+	border: 0;
+	margin: 0;
 }
 
 .jdGallery a

data/util/image-gallery/js/SmoothGallery/scripts/jd.gallery.js

@@ -59,7 +59,7 @@ var gallery = {
 		preloader: true,
 		preloaderImage: true,
 		preloaderErrorImage: true,
-		fullScreen: false,  // TEST
+		fullScreen: false,
 		/* Data retrieval */
 		manualData: [],
 		populateFrom: false,
@@ -128,17 +128,28 @@ var gallery = {
 			this.populateData();
 		element.style.display="block";
 
-		if(this.options.fullScreen)  //TEST
+		if(this.options.fullScreen)
 		{
-			var size = window.getSize();
-//			if(document.body.offsetHeight>window.innerHeight)
-//			  size.x-=18;
+			var sizex = window.innerWidth;
+			var sizey = window.innerHeight;
 			element.setStyles({
 				'position':'absolute',
 				'top':'0px',
 				'left':'0px',
-				'width':size.x + 14,
-				'height':size.y - 8
+				'width':sizex,
+				'height':sizey
+			});
+
+			window.addEvent('resize', function(event) {
+				var sizex = window.innerWidth;
+				var sizey = window.innerHeight;
+				element.setStyles({
+					'position':'absolute',
+					'top':'0px',
+					'left':'0px',
+					'width':sizex,
+					'height':sizey
+				});
 			});
 		}
 
@@ -249,41 +260,45 @@ var gallery = {
 				currentImg.load = function(imageStyle, i) {
 					if (!imageStyle.loaded)	{
 						this.galleryData[i].imgloader = new Asset.image(imageStyle.source, {
-		                            'onload'  : function(img, i){
-													img.loaded = true;
-													img.width = this.galleryData[i].imgloader.width;
-													img.height = this.galleryData[i].imgloader.height;
-													top_height = this.topElement.getStyle('height').toInt();
-													top_width = this.topElement.getStyle('width').toInt();
-													new_width = img.width;
-													new_height = img.height;
-													margin_top = 0;
-													if(top_height < img.height && img.height >= img.width){
-														new_height = top_height;
-														new_width = Math.round(top_height*img.width/img.height);
-													} else if(top_width < img.width && img.height <= img.width) {
-														new_width = top_width;
-														new_height = Math.round(top_width*img.height/img.width);
-														margin_top = Math.round((top_height - new_height)/2);
-													} else {
-														margin_top = Math.round((top_height - img.height)/2);
-													}
-													img.element.appendChild(new Element('img').set('src',img.source).setStyles({
-														'margin':'0 auto',
-														'display':'block',
-														'width':new_width+'px',
-														'height':new_height+'px',
-														'margin-top':margin_top+'px'
-													}));
-												}.pass([imageStyle, i], this)
+						'onload'  : function(img, i){
+							img.loaded = true;
+							img.width = this.galleryData[i].imgloader.width;
+							img.height = this.galleryData[i].imgloader.height;
+							top_height = this.topElement.getStyle('height').toInt();
+							top_width = this.topElement.getStyle('width').toInt();
+							new_width = img.width;
+							new_height = img.height;
+							margin_top = 0;
+							if(top_height < img.height && img.height >= img.width){
+								new_height = top_height;
+								new_width = Math.round(top_height*img.width/img.height);
+							} else if(top_width < img.width && img.height <= img.width) {
+								new_width = top_width;
+								new_height = Math.round(top_width*img.height/img.width);
+								if(new_height > top_height) {
+									new_height = top_height;
+	    								new_width = Math.round(top_height*img.width/img.height);
+								}
+								margin_top = Math.round((top_height - new_height)/2);
+							} else {
+								margin_top = Math.round((top_height - img.height)/2);
+							}
+							img.element.appendChild(new Element('img').set('src',img.source).setStyles({
+								'margin':'0 auto',
+								'display':'block',
+								'width':new_width+'px',
+								'height':new_height+'px',
+								'margin-top':margin_top+'px'
+							}));
+						}.pass([imageStyle, i], this)
 						});
 					}
 				}.pass([currentImg, i], this);
 			} else {
-					currentImg.element.appendChild(new Element('img').set('src',this.galleryData[i].image).setStyles({
-						'margin':'0 auto',
-						'display':'block'
-					}));
+				currentImg.element.appendChild(new Element('img').set('src',this.galleryData[i].image).setStyles({
+					'margin':'0 auto',
+					'display':'block'
+				}));
 			}
 			this.galleryElements[parseInt(i)] = currentImg;
 		}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -218,6 +218,7 @@ files:
 - plugin/google_analytics.rb
 - plugin/google_map.rb
 - plugin/google_sitemaps.rb
+- plugin/google_universal_analytics.rb
 - plugin/google_webmaster.rb
 - plugin/hatena_bookmark_nocomment.rb
 - plugin/hatena_star.rb
@@ -257,6 +258,7 @@ files:
 - plugin/make_link.rb
 - plugin/makerss_category.rb
 - plugin/makerss_comment.rb
+- plugin/mathjax.rb
 - plugin/microsummary.rb
 - plugin/mm_footer.rb
 - plugin/monthly_autopagerize.rb
@@ -330,6 +332,7 @@ files:
 - spec/gist_spec.rb
 - spec/github_link_spec.rb
 - spec/google_analytics_spec.rb
+- spec/google_universal_analytics_spec.rb
 - spec/jdate_spec.rb
 - spec/jmonth_spec.rb
 - spec/jyear_spec.rb
@@ -362,7 +365,6 @@ files:
 - util/estraier-search/ja/estraier-register.rb
 - util/image-gallery/README.ja
 - util/image-gallery/image-gallery.rb
-- util/image-gallery/image-gallery.rb.euc-jp
 - util/image-gallery/js/SmoothGallery/Changelog
 - util/image-gallery/js/SmoothGallery/css/ReMooz.css
 - util/image-gallery/js/SmoothGallery/css/img/carrow1.gif
@@ -403,10 +405,9 @@ files:
 - util/image-gallery/js/SmoothGallery/scripts/resizer.php
 - util/image-gallery/misc/plugin/recent_image.rb
 - util/image-gallery/misc/plugin/view_exif.rb
-- util/image-gallery/skel/gallery.rhtml
-- util/image-gallery/skel/gallery.rhtml.euc-jp
 - util/image-gallery/tdiary.conf.igsample
 - util/image-gallery/theme/image-gallery.css
+- util/image-gallery/views/gallery.rhtml
 - util/image2flickr.rb
 - util/posttdiary/README.ja
 - util/posttdiary/posttdiary-ex.rb
@@ -468,6 +469,7 @@ test_files:
 - spec/gist_spec.rb
 - spec/github_link_spec.rb
 - spec/google_analytics_spec.rb
+- spec/google_universal_analytics_spec.rb
 - spec/jdate_spec.rb
 - spec/jmonth_spec.rb
 - spec/jyear_spec.rb

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

@@ -1,523 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-# image-gallery.rb $Revision: 2.0.4 $
-#
-# 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 = 'EUC-JP' 
-  $LOAD_PATH.push('./') 
-end 
-
-if FileTest::symlink?( __FILE__ ) then
-  org_path = File::dirname( File::readlink( __FILE__ ) )
-else
-  org_path = File::dirname( __FILE__ )
-end
-$:.unshift( org_path.untaint )
-require 'tdiary'
-require 'pstore'
-require 'date'
-
-
-# class TDiaryGallery
-#
-module TDiary
-  class ImageData
-    attr_reader :file, :url, :title, :subtitle, :date, :width, :height, :type
-    attr_writer :file, :url, :title, :subtitle, :date, :width, :height, :type
-  end
-
-  
-  class TDiaryGallery < ::TDiary::TDiaryBase
-    MAX_PAGES = 20
-    ORDER_OPTIONS = [
-    ["asc", "��������"],
-    ["desc", "�Ť���"],
-    ]
-    MODE_OPTIONS = [
-    ["list", "�ꥹ��"],
-    ["slide", "���饤��"],
-    ]
-
-    def initialize( cgi, rhtml, conf )
-      super
-      @img_version = "2.0.4"
-      @image_hash = Hash[]
-      @image_num = 0
-      @image_keys = []
-      @images = []
-      @exifstr = []
-      @t_page_title = ""
-
-      get_conf(conf)
-      parse_args(cgi)
-      format_form
-      read_cache
-      make_image_data
-      check_name_filter_dateformat
-      make_page_title
-    end
-
-    private
-
-    def get_conf(conf)
-      @column = conf.options['image-gallery.column'].to_i
-      @column = 3 if @column == 0
-      @line   = conf.options['image-gallery.line'].to_i
-      @line   = 4 if @line == 0
-      @num = @line * @column
-      @width  = conf.options['image-gallery.width']
-      @width  = "160" if @width == nil
-      @vwidth = conf.options['image-gallery.vwidth']
-      @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']
-      @use_mid_image = false if @use_mid_image == nil
-    end
-
-    def parse_args(cgi)
-      @start = cgi["start"].to_i
-      @order = @cgi["order"].empty? ? "asc" : @cgi["order"]
-      @name_filter  = @cgi["name"].empty? ? "" : @cgi["name"].strip
-      @title_filter = @cgi["title"].empty? ? "" : @cgi["title"].strip
-      @subtitle_filter = @cgi["subtitle"].empty? ? "" : @cgi["subtitle"].strip
-      @mode = @cgi["mode"].empty? ? "list" : @cgi["mode"].strip
-      @mode = "list" if @mode != "viewer" and @mode != "slide" and @mode != "fslide"
-      @key   = cgi["key"].empty? ? "" : cgi["key"].strip
-      @page_title = cgi["pagetitle"].empty? ? "" : @cgi["pagetitle"].strip
-      @show_inputfield = true;
-      show_inputfield = @cgi["showinputfield"].strip
-      @show_inputfield = false if show_inputfield == "false"
-    end
-
-    def read_cache
-      begin
-        db = PStore.new("#{@io.cache_path}/gallery/image-gallery2.dat") # for tDiary 3.1.3 or later
-      rescue
-        db = PStore.new("#{cache_path}/gallery/image-gallery2.dat")     # for tDiary 3.1.2 or faster
-      end
-      db.transaction do
-        @image_hash = db["recent_image_hash"]
-        @image_keys = db["recent_image_keys"]
-        @image_url  = db["recent_image_url"]
-        @image_dir  = db["recent_image_dir"]
-        db.abort
-      end
-    end
-
-    def make_image_data
-      if @name_filter != "" or @title_filter != "" or @subtitle_filter != ""
-        @image_keys.reject! { |key|
-          image = @image_hash[key]
-          (@name_filter  != "" and image.file.match(@name_filter) == nil) or
-          (@title_filter != "" and image.title.match(@title_filter) == nil) or
-          (@subtitle_filter != "" and image.subtitle.match(@subtitle_filter) == nil)
-        }
-      end
-      @image_num = @image_keys.length
-      @image_keys = @image_keys.reverse if @order == "asc"
-
-      if @mode == "list" or @mode == "slide" or @mode == "fslide"
-        if @key != ""
-          index = @image_keys.index(@key)
-          if index != nil
-            @start = (index / @num) * @num
-          else
-            return
-          end
-        end
-        @num.times do |i|
-          index = @start + i
-          break if @image_keys[index] == nil
-          @images.push(@image_hash[@image_keys[index]])
-        end
-      elsif @mode == "viewer"
-        if @key != ""
-          index = @image_keys.index(@key)
-          if index != nil
-            @start = index
-          else
-            @start = 0
-          end
-        end
-        @images.push(@image_hash[@image_keys[@start]])
-        width, height = @images[0].width.to_i, @images[0].height.to_i
-        size = ((width > height ? width : height) > @vwidth.to_i) ? @vwidth : width
-        if width > height
-          @sizestr = %Q[width="#{size}" height="#{(size.to_i*height/width).to_s}"]
-        else
-          @sizestr = %Q[width="#{(size.to_i*width/height).to_s}" height="#{size}"]
-        end
-        if @show_exif and @images[0].type == "jpg"
-          begin
-            require 'exifparser'
-            @exifstr = read_exif_data("#{@image_dir}/#{@images[0].file}")
-          rescue
-            exp = []
-            exp.push(($!).to_s)
-            ($!).backtrace.each do |btinfo|
-              exp.push(btinfo)
-            end
-            @exifstr = exp
-          end
-        end
-      end
-    end
-
-    def check_name_filter_dateformat
-      @page_year  = ""
-      @page_month = ""
-      @page_day   = ""
-      @page_date  = nil
-      return if @name_filter == ""
-      t_name_filter = @name_filter.dup
-      t_name_filter["^"] = "" if t_name_filter[0] == ?^
-      t_name_filter = t_name_filter[5,8] if t_name_filter[4] == ?/
-      begin
-        if t_name_filter.index(/[\d]{8}/) != nil
-          @page_year  = t_name_filter[0,4]
-          @page_month = t_name_filter[4,2]
-          @page_day   = t_name_filter[6,2]
-          @page_date  = Date.new(@page_year.to_i, @page_month.to_i, @page_day.to_i)
-
-        elsif t_name_filter.index(/[\d]{6}/) != nil
-          @page_year  = t_name_filter[0,4]
-          @page_month = t_name_filter[4,2]
-          @page_date  = Date.new(@page_year.to_i, @page_month.to_i, 1)
-
-        elsif t_name_filter.index(/[\d]{4}/) != nil and t_name_filter[0,4].to_i >= 1970
-          @page_year  = t_name_filter[0,4]
-          @page_date  = Date.new(@page_year.to_i, 1, 1)
-        end
-      rescue
-        @page_year  = ""
-        @page_month = ""
-        @page_day   = ""
-        @page_date  = nil
-        return
-      end
-    end
-
-    def make_page_title
-      return if @page_title == ""
-      @t_page_title = String.new(@page_title)
-      @t_page_title.gsub!("@year",  @page_year)
-      @t_page_title.gsub!("@month", @page_month)
-      @t_page_title.gsub!("@day",   @page_day)
-      begin
-        @t_page_title.gsub!("@subtitle", @images[0].subtitle)
-      rescue
-      end
-    end
-    
-    def format_links(count)
-      page_count = (count - 1) / @num + 1
-      current_page = @start / @num + 1
-      first_page = current_page - (MAX_PAGES / 2 - 1)
-      if first_page < 1
-        first_page = 1
-      end
-      last_page = first_page + MAX_PAGES - 1
-      if last_page > page_count
-        last_page = page_count
-      end
-      buf = "<p id=\"navi\" class=\"infobar\">\n"
-      if current_page > 1
-        buf << format_link("&laquo;��Ƭ��&nbsp;", 0, 0, @mode)
-        buf << format_link("&lt;����", @start - @num, @num, @mode)
-      end
-      if first_page > 1
-        buf << "... "
-      end
-      for i in first_page..last_page
-        if i == current_page
-          buf << "#{i} "
-        else
-          buf << format_link(i.to_s, (i - 1) * @num, @num, @mode)
-        end
-      end
-      if last_page < page_count
-        buf << "... "
-      end
-      if current_page < page_count
-        buf << format_link("����&gt;", @start + @num, @num, @mode)
-        buf.concat(format_link("&nbsp;�Ǹ��&raquo;", (page_count - 1) * @num, 0, @mode))
-      end
-      buf << "</p>\n"
-      return buf
-    end
-
-    def format_link(label, start, num, mode)
-      return format('<a href="%s?mode=%s;%sstart=%d">%s</a> ',
-              _(@cgi.script_name ? @cgi.script_name : ''),
-              mode,
-              make_cgi_param,
-              start, label)
-    end
-
-    def format_links_viewer
-      buf = "<p id=\"vnavi\" class=\"infobar\">\n"
-      if @start == 0
-        buf << "&laquo;����"
-      else
-        buf << format_link_viewer("&laquo;����", @image_keys[@start - 1])
-      end
-      buf << "&nbsp;&nbsp;|&nbsp;&nbsp;"
-      buf << format_link("������", (@start / @num) * @num, 0, "list")
-      buf << "&nbsp;&nbsp;|&nbsp;&nbsp;"
-      if @start == @image_keys.length - 1
-        buf << "����&raquo;"
-      else
-        buf << format_link_viewer("����&raquo;", @image_keys[@start + 1])
-      end
-      buf << "</p>\n"
-      return buf
-    end
-
-    def format_link_viewer(label, key)
-      return format('<a href="%s?%smode=viewer;key=%s">%s</a>',
-              _(@cgi.script_name ? @cgi.script_name : ''),
-              make_cgi_param,
-              key, label)
-    end
-
-    def format_link_viewer_image(key)
-      return format('%s?%smode=viewer;key=%s',
-              _(@cgi.script_name ? @cgi.script_name : ''),
-              make_cgi_param,
-              key)
-    end
-
-    def format_links_date
-      return "" unless @name_filter != "" and @title_filter == "" and  @subtitle_filter == ""
-
-      begin
-        buf = "<p id=\"ynavi\" class=\"infobar\">\n"
-        if @page_day != ""
-          yesterday = (@page_date - 1).strftime("%Y%m%d")
-          tomorrow  = (@page_date + 1).strftime("%Y%m%d")
-          buf << format_link_date(%Q[&laquo;#{(@page_date - 1).to_s}], yesterday)
-          buf << format('&nbsp;&nbsp;|&nbsp;&nbsp;<a href="%s?mode=%s;order=%s">%s</a>&nbsp;&nbsp;|&nbsp;&nbsp;', _(@cgi.script_name ? @cgi.script_name : ''), _(@mode), _(@order), '������')
-          buf << format_link_date(%Q[#{(@page_date + 1).to_s}&raquo;], tomorrow)
-
-        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] == ?/ 
-            prevmonth = %Q[^#{prevmonth[0,4]}/#{prevmonth}]
-            nextmonth = %Q[^#{nextmonth[0,4]}/#{nextmonth}]
-          elsif @name_filter[0] == ?^
-            prevmonth = %Q[^#{prevmonth[0,4]}]
-            nextmonth = %Q[^#{nextmonth[0,4]}]
-          end
-          buf << format_link_date(%Q[&laquo;#{(@page_date << 1).to_s[0,7]}], prevmonth)
-          buf << format('&nbsp;&nbsp;|&nbsp;&nbsp;<a href="%s?mode=%s;order=%s">%s</a>&nbsp;&nbsp;|&nbsp;&nbsp;', _(@cgi.script_name ? @cgi.script_name : ''), _(@mode), _(@order), '������')
-          buf << format_link_date(%Q[#{(@page_date >> 1).to_s[0,7]}&raquo;], nextmonth)
-
-        elsif @page_year != ""
-          year = @page_year.to_i
-          buf << format_link_date(%Q[&laquo;#{(year - 1).to_s}], "^"+(year - 1).to_s)
-          buf << format('&nbsp;&nbsp;|&nbsp;&nbsp;<a href="%s?mode=%s;order=%s">%s</a>&nbsp;&nbsp;|&nbsp;&nbsp;', _(@cgi.script_name ? @cgi.script_name : ''), _(@mode), _(@order), '������')
-          buf << format_link_date(%Q[#{(year + 1).to_s}&raquo;], "^"+(year + 1).to_s)
-        end
-
-        buf << "</p>\n"
-        return buf
-      rescue
-        return ""
-      end
-    end
-
-    def format_link_date(label, name_filter)
-      cgi_params = make_cgi_param
-      if cgi_params.gsub!(/name=[^;]*;/, "name=#{CGI::escape(name_filter)};") == nil
-        cgi_params = "name=" + CGI::escape(name_filter) + ";" + cgi_params
-      end
-      return format('<a href="%s?mode=%s;%s">%s</a>',
-              _(@cgi.script_name ? @cgi.script_name : ''),
-              @mode,
-              cgi_params,
-              label)
-    end
-
-    def format_link_viewer_date(label, name_filter)
-      return format('<a href="%s?mode=list;order=desc;name=%s">%s</a>',
-              _(@cgi.script_name ? @cgi.script_name : ''),
-              CGI::escape(name_filter),
-              label)
-    end
-
-    def format_link_viewer_category(subtitle)
-      buf = ""
-      subtitle.scan(/\[[^\]]*\]/).each do |category|
-        tag = category[1..-2]
-        next if tag[0] == ?[
-        buf << format('[<a href="%s?mode=list;order=desc;subtitle=%s">%s</a>]',
-              _(@cgi.script_name ? @cgi.script_name : ''),
-              CGI::escape("\\[" + tag + "\\]"), tag)
-      end
-      return buf
-    end
-
-    def format_link_list_category(images)
-      categories = []
-      images.each do |image|
-        categories |= image.subtitle.scan(/\[[^\]]*\]/)
-      end
-      buf = ""
-      categories.each do |category|
-        tag = category[1..-2]
-        next if tag[0] == ?[
-        buf << format('[<a href="%s?mode=list;order=desc;subtitle=%s">%s</a>]',
-              _(@cgi.script_name ? @cgi.script_name : ''),
-              CGI::escape("\\[" + tag + "\\]"), tag)
-      end
-      return buf
-    end
-
-    def get_other_mode_link
-      case @mode
-      when "list"
-        format_link("[SLIDESHOW]", @start, @num, "slide") + format_link("[SLIDESHOW(FullScreen)]", @start, @num, "fslide")
-      when "slide"
-        format_link("[LIST]", @start, @num, "list") + format_link("[SLIDESHOW(FullScreen)]", @start, @num, "fslide")
-      when "fslide"
-        format_link("[LIST]", @start, @num, "list") + format_link("[SLIDESHOW]", @start, @num, "slide")
-      end
-    end
-
-    def make_cgi_param
-      buf = ""
-      buf << "name=#{CGI::escape(@name_filter)};"         if @name_filter != ""
-      buf << "title=#{CGI::escape(@title_filter)};"       if @title_filter != ""
-      buf << "subtitle=#{CGI::escape(@subtitle_filter)};" if @subtitle_filter != ""
-      buf << "pagetitle=#{CGI::escape(@page_title)};"     if @page_title != ""
-      buf << "showinputfield=false;" if not @show_inputfield
-      buf << "order=#{@order};"
-      return buf
-    end
-
-    def format_options(options, value)
-      return options.collect { |val, label|
-        if val == value
-          "<option value=\"#{_(val)}\" selected>#{_(label)}</option>"
-        else
-          "<option value=\"#{_(val)}\">#{_(label)}</option>"
-        end
-      }.join("\n")
-    end
-
-    def format_form
-      @order_options = format_options(ORDER_OPTIONS, @order)
-      @mode_options  = format_options(MODE_OPTIONS,  @mode )
-    end
-
-    def _(str)
-      CGI::escapeHTML(str)
-    end
-
-    def read_exif_data(file)
-      exifstr = []
-      str = ""
-      exif = ExifParser.new(file)
-      return exifstr if exif == nil
-
-      exifstr.push("-- IFD0 (main image) --")
-      exif.each(:IFD0) do |tag|
-        next if tag.name == "Unknown"
-        str = "#{tag.name} : #{tag.to_s}"
-        exifstr.push(str)
-      end
-
-      exifstr.push("-- Exif SubIFD --")
-      exif.each(:Exif) do |tag|
-        next if tag.name == "Unknown"
-        str = "#{tag.name} : #{tag.to_s}"
-        exifstr.push(str)
-      end
-
-      exifstr.push("-- MakerNote --")
-      exif.each(:MakerNote) do |tag|
-        next if tag.name == "Unknown" or tag.name == "NikonCameraSerialNumber"
-        str = "#{tag.name} : #{tag.to_s}"
-        exifstr.push(str)
-      end
-
-      exifstr.push("-- GPS --")
-      exif.each(:GPS) do |tag|
-        next if tag.name == "Unknown"
-        str = "#{tag.name} : #{tag.to_s}"
-        exifstr.push(str)
-      end
-
-      return exifstr
-
-    end
-
-
-    def js_start_gallery
-      if @mode == "fslide"
-      <<-EOS
-      <script type="text/javascript">
-      function startGallery() {
-        var myGallery = new gallery($('myGallery'), {
-          timed: true,
-          fullScreen: true
-        });
-      }
-      window.addEvent('domready',startGallery);
-      </script>
-      EOS
-      elsif @mode == "slide"
-      <<-EOS2
-      <script type="text/javascript">
-      function startGallery() {
-        var myGallery = new gallery($('myGallery'), {
-          timed: true,
-        });
-      }
-      window.addEvent('domready',startGallery);
-      </script>
-      EOS2
-      end
-    end
-  end
-end
-
-begin
-  @cgi = CGI::new
-  if TDiary::Config.instance_method(:initialize).arity == 0
-    # for tDiary 2.0 or earlier
-    conf = TDiary::Config::new
-  else
-    # for tDiary 2.1 or later
-    request = TDiary::Request.new( ENV, @cgi )
-    conf = TDiary::Config::new(@cgi, request)
-  end
-  tdiary = TDiary::TDiaryGallery::new( @cgi, 'gallery.rhtml', conf )
-
-  head = {
-    'type' => 'text/html',
-    'Vary' => 'User-Agent'
-  }
-  body = tdiary.eval_rhtml
-  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
-  if @cgi then
-    print @cgi.header( 'type' => 'text/plain' )
-  else
-    print "Content-Type: text/plain\n\n"
-  end
-  puts "#$! (#{$!.class})"
-  puts ""
-  puts $@.join( "\n" )
-end

data/util/image-gallery/skel/gallery.rhtml.euc-jp

@@ -1,154 +0,0 @@
-<%# gallery.rhtml $Revision: 2.0.1 $ %>
-<%# Copyright (c) 2005-2012 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp> %>
-<%# You can redistribute it and/or modify it under GPL2. %>
-
-<div class="adminmenu"><%%=navi_user%></div><h1><%= CGI::escapeHTML( @conf.html_title ) %> [Image Gallery]</h1>
-
-<% if @images.length == 0 %>
-<p>��������ե�����Ϥ���ޤ���</p>
-	<%= format_links_date %>
-<% else %>
-<% if @mode == "list" or @mode == "slide" or @mode == "fslide" %>
-	<%= format_links_date %>
-	<div class="day">
-		<% if @images.length != 0 %>
-			<h2><span class="date"><%=  _(@conf.to_native(@t_page_title)) %>&nbsp;&nbsp;Page&nbsp;<%=@start / @num + 1 %></span>&nbsp;<span class="nyear">[<%= @image_num %> ���� <%= @start + 1 %> - <%= @start + @images.length %> ����]&nbsp;&nbsp;<%= get_other_mode_link %></span></h2>
-		<% end %>
-		<div class="body">
-			<div class="section">
-			<div class="categorylink"><%= format_link_list_category(@images) %></div>
-				<% if @mode == "list" %>
-				<table class="imagelist">
-					<% @line.times do |line|%>
- 						<tr>
-						<% @column.times do |column| %>
-						<% i = line * @column + column %>
-						<td>
-						<% if @images[i] != nil %>
-							<% if @images[i].width.to_i > @images[i].height.to_i %>
-								<p><a href="<%= format_link_viewer_image(@image_hash.index(@images[i])) %>"><img src="<%= @image_url %>/<%= @images[i].url %>" width="<%= @width %>" height="<%= (@width.to_i*@images[i].height.to_i/@images[i].width.to_i).to_s %>" alt="<%= @images[i].file %>" title="<%= @images[i].file %>" class="imagebody"></a></p>
-							<% else %>
-								<p><a href="<%= format_link_viewer_image(@image_hash.index(@images[i])) %>"><img src="<%= @image_url %>/<%= @images[i].url %>" width="<%= (@width.to_i*@images[i].width.to_i/@images[i].height.to_i).to_s %>" height="<%= @width %>" alt="<%= @images[i].file %>" title="<%= @images[i].file %>" class="imagebody"></a></p>
-							<% end %>
-							<p class="imagetitle"><%= CGI::escapeHTML(@images[i].title) %></p>
-							<p class="imagedate"><a href="./?date=<%= @images[i].date %>"  title="<%= CGI::escapeHTML(@images[i].subtitle) %>"><%= @images[i].date.sub(/(\d{4})(\d{2})(\d{2})/, '\1-\2-\3') %></a></p>
-							<% end %>
-						</td>
-						<% end %>
-						</tr>
-						<% break if @images[(line + 1) * @column] == nil %>
-					<% end %>
-				</table>
-				<% elsif @mode == "slide" or @mode == "fslide" %>
-					<%= js_start_gallery %>
-					<div class="content">
-					<div id="myGallery">
-					<% (@line * @column).times do |i| %>
-						<div class="imageElement">
-						<h3><%= CGI::escapeHTML(@images[i].title) %>[<%= @images[i].date.sub(/(\d{4})(\d{2})(\d{2})/, '\1-\2-\3') %>]</h3>
-						<p><%= CGI::escapeHTML(@images[i].subtitle) %></p>
-						<a href="./?date=<%= @images[i].date %>" title="to Diary" class="open"></a>
-						<% image_file = @images[i].file.dup %>
-						<% if @use_mid_image && @mode == "slide" %>
-							<% if image_file[4] == ?/ %>
-								<% image_file[4] = "/m" %>
-							<% else %>
-								<% image_file = "m" + image_file %>
-							<% end %>
-						<% end %>
-						<img src="<%= @image_url %>/<%= image_file %>" class="full" />
-						<img src="<%= @image_url %>/<%= @images[i].url %>" class="thumbnail" />
-						</div>
-						<% break if @images[i+1] == nil %>
-					<% end %>
-					</div>
-				</div>
-				<% end %>
-			</div>
-		</div>
-	</div>
-	<div class="referer">
-	<% if @image_num > 0 %>
-		<%= format_links(@image_num) %>
-	<% end %>
-	</div>
-
-<% elsif @mode == "viewer" %>
-	<%= format_links_viewer %>
-	<div class="day">
-		<h2><span class="date">&nbsp;<a href="./?date=<%= @images[0].date %>" title="<%= CGI::escapeHTML(@images[0].subtitle) %>"><%= @images[0].date.sub(/(\d{4})(\d{2})(\d{2})/, '\1-\2-\3') %></a></span>&nbsp;&nbsp;<span class="title"><%= CGI::escapeHTML(@images[0].title) %></span>&nbsp;&nbsp;<span class="nyear">[<%= @images[0].file %>:<%= @images[0].width %>(w)��<%= @images[0].height %>(h)]</span></h2>
-		<div class="body">
-			<% image_file = @images[0].file.dup %>
-			<% month_filter = ((image_file[4] == ?/) ? %Q[^#{image_file[0,4]}/#{image_file[5,6]}] : %Q[^#{image_file[0,6]}]) %>
-			<div class="categorylink">&raquo;<%= format_link_viewer_date(@images[0].date[0,4], "^"+@images[0].date[0,4]) %>-<%= format_link_viewer_date(@images[0].date[4,2], month_filter) %>-<%= format_link_viewer_date(@images[0].date[6,2], @images[0].date[0,8]) %>&nbsp;|&nbsp;<%= format_link_viewer_category(@images[0].subtitle) %></div>
-			<div class="section">
-				<table class="imageview">
-					<tr>
-						<td colspan="2">
-							<% image_file = @images[0].file.dup %>
-							<% if @use_mid_image %>
-								<% if image_file[4] == ?/ %>
-									<% image_file[4] = "/m" %>
-								<% else %>
-									<% image_file = "m" + image_file %>
-								<% end %>
-							<% end %>
-							<a href="<%= @image_url %>/<%= @images[0].file %>"><img src="<%= @image_url %>/<%= image_file %>" <%= @sizestr %> alt="<%= CGI::escapeHTML(@images[0].title) %>" title="<%= CGI::escapeHTML(@images[0].title) %>" class="imagebody"></a>
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<% if @show_exif and @exifstr.length != 0 %>
-								<strong><p class="infobar"> - EXIF Data -</p></strong>
-								<strong><p class="exiftitle"><%= @exifstr[0] %></p></strong>
-								<ul class="exifdata">
-								<% i = 1 %>
-								<% while i < @exifstr.length %>
-									<% if @exifstr.length > 5 and i == @exifstr.length / 2 %>
-							</ul>
-						</td>
-					<td>
-							<ul class="exifdata">
-									<% end %>
-									<% if @exifstr[i][0,2] == "--" %>
-							</ul>
-							<strong><p class="exiftitle"><%= @exifstr[i] %></p></strong>
-							<ul class="exifdata">
-									<% else %>
-									<li><%= @exifstr[i] %></li>
-									<% end %>
-										<% i = i + 1 %>
-								<% end %>
-								</ul>
-						</td>
-							<% end %>
-					</tr>
-				</table>
-			</div>
-		</div>
-	</div>
-<% end %>
-<% end %>
-
-<% if @show_inputfield %>
-<form action="<%= @cgi.script_name ? _(@cgi.script_name) : '' %>">
-<p>
-����������:&nbsp;�ե�����̾��<input type="text" name="name" value="<%= _(@conf.to_native(@name_filter)) %>" size="16" />
-&nbsp;�����Υ��֥����ȥ�:<input type="text" name="subtitle" value="<%= _(@conf.to_native(@subtitle_filter)) %>" size="16" />
-&nbsp;�����Υ����ȥ�:<input type="text" name="title" value="<%= _(@conf.to_native(@title_filter)) %>" size="16" />
-</p>
-<p>
-�¤��ؤ�:
-<select name="order">
-<%= @order_options %>
-</select>&nbsp;&nbsp;
-ɽ������:
-<select name="mode">
-<%= @mode_options %>
-</select>
-<input type="submit" value="ɽ��" />
-</p>
-</form>
-<div class="footer">
-Generated by <a href="http://www1.whi.m-net.ne.jp/n-kashi/image-gallery2.html">tDiary Image Gallery</a> version <%= @img_version %></div>
-<% end %>