tdiary-contrib 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b861b8e242e49d48b1bf2a4d221e45358aeac56
-  data.tar.gz: da7a57a662ae3892930d9b6854ed82070a0cc277
+  metadata.gz: a618c3a15f193c43756a0bb8ecd1df26e9d317a6
+  data.tar.gz: d0a68910bcda472a2d9f056378f0d90157420b75
 SHA512:
-  metadata.gz: a1a4b72e93928bac1131636987550e6f2ca4fa4a9bc5ce13fa8ef822ecbf4b04e9493f0d51595e542adf165f34976634bfb9d0827b819ed8ae5b0f78918f616a
-  data.tar.gz: ad99181c743a43a23eb42be2627130cc608d3634cce262509856858bc0b148c1146d7098abb9f9f8653691198edaa71fdbeac7874e07764fc38361710202d6b2
+  metadata.gz: c7b58f2bef33ed390c5d7de5159991a6b114eec164f1e18b0ad758cfc6c6d0ffe2b6dd7f12f240da6551d942a08c5b9d973cb2b077a92ace9fa3285e20e005d2
+  data.tar.gz: e3245824b3d1f11295fd172e0043dc7f5ea46d3fd5876ea2b1ed89406af74adbe20c92ce229175c28d3db06869338f89a0dead941d5c1728e037c847aaf308d1

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.0.3"
+    VERSION = "5.0.4"
   end
 end

data/plugin/google_analytics.rb

@@ -29,10 +29,44 @@ end
 add_conf_proc( 'google_analytics', 'Google Analytics' ) do
 	if @mode == 'saveconf' then
 		@conf['google_analytics.profile'] = @cgi.params['google_analytics.profile'][0]
+		@conf['google_analytics.amp.profile'] = @cgi.params['google_analytics.amp.profile'][0]
 	end
-	<<-HTML
+	r = <<-HTML
 		<h3>Google Analytics Profile</h3>
 		<p>set your Profile ID (NNNNN-N)</p>
 		<p><input name="google_analytics.profile" value="#{h @conf['google_analytics.profile']}"></p>
 	HTML
+	if defined? AMP
+		r << <<-HTML
+			<h3>Google Analytics Profile for AMP page</h3>
+			<p>set your Profile ID (NNNNN-N) for AMP page</p>
+			<p><input name="google_analytics.amp.profile" value="#{h @conf['google_analytics.amp.profile']}"></p>
+		HTML
+	end
+	r
+end
+
+if defined? AMP
+	add_amp_header_proc do
+		%Q|<script async custom-element="amp-analytics"
+			src="https://cdn.ampproject.org/v0/amp-analytics-0.1.js"></script>|
+	end
+
+	add_amp_body_enter_proc do
+		profile_id = %w(google_analytics.amp.profile google_analytics.profile).map {|key|
+			@conf[key]
+		}.find {|profile|
+			profile && !profile.empty?
+		}
+		<<-HTML
+			<amp-analytics type="googleanalytics" id="analytics1">
+			<script type="application/json">
+			{
+				"vars": { "account": "UA-#{h profile_id}" },
+				"triggers": { "trackPageview": { "on": "visible", "request": "pageview" } }
+			}
+			</script>
+			</amp-analytics>
+		HTML
+	end
 end

data/plugin/picasa.rb

@@ -29,37 +29,3 @@ end
 def picasa_right( src, alt = "photo" )
 	picasa( src, alt, 'right' )
 end
-
-if /\A(form|edit|preview|showcomment)\z/ === @mode then
-	enable_js( 'picasa.js' )
-	add_js_setting( '$tDiary.plugin.picasa' )
-	add_js_setting( '$tDiary.plugin.picasa.userId', %Q|'#{@conf['picasa.user']}'| )
-	add_js_setting( '$tDiary.plugin.picasa.imgMax', %Q|'#{@conf[ 'picasa.default_size'] || 400}'| )
-end
-
-add_edit_proc do |date|
-	unless @conf['picasa.user']
-		'<p>[ERROR] picasa.rb: Picasa username is not specified.</p>'
-	else
-		<<-HTML
-			<h3 class="plugin_picasa"><span>Picasa Web Album</span></h3>
-			<div id="plugin_picasa"></div>
-		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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -191,7 +191,6 @@ files:
 - js/image_ex.js
 - js/jquery.socialbutton.js
 - js/nicovideo.js
-- js/picasa.js
 - js/plugin_checker.js
 - js/referer.js
 - js/show_and_hide.js
@@ -503,7 +502,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package

data/js/picasa.js

@@ -1,268 +0,0 @@
-/*
- picasa.js: javascript for picasa.rb plugin of tDiary
- 
- Copyright (C) 2011 by hb <smallstyle@gmail.com>
- You can redistribute it and/or modify it under GPL2.
- */
-$(function () {
-	var CanvasLoadingImage = function (rgb) {
-			this.canvas = null;
-			this.ctx = null;
-			this.width = 200;
-			this.height = 32;
-			this.rgb = rgb || '0, 0, 0';
-			this.initialize();
-		}
-
-	CanvasLoadingImage.prototype = {
-		initialize: function () {
-			this.canvas = $('<canvas>', {
-				text: 'loading...'
-			}).attr({
-				'width': this.width,
-				'height': this.height
-			});
-			if (this.canvas.get(0).getContext) {
-				this.ctx = this.canvas.get(0).getContext('2d');
-			}
-		},
-
-		draw: function (idx) {
-			var ctx = this.ctx;
-			ctx.clearRect(0, 0, this.width, this.height);
-			for (i = 0; i < 10; i++) {
-				ctx.fillStyle = i > idx ? 'rgba(' + this.rgb + ', 0.25)' : 'rgb(' + this.rgb + ')';
-				ctx.fillRect(i * (this.width / 10), 0, (this.width / 10) - 4, this.height);
-			}
-			return idx < 10 ? idx + 1 : 0;
-		},
-
-		start: function () {
-			var self = this;
-			var idx = 0;
-			this.timer = setInterval(function () {
-				idx = self.draw(idx);
-			}, 100)
-		},
-
-		stop: function () {
-			clearInterval(this.timer);
-		}
-	}
-	
-	var PicasaService = function (userId, imgMax) {
-			this.userId = userId;
-			this.imgMax = imgMax || 400;
-			this.has_more_photos = false;
-			this.has_more_albums = false;
-			this.recently_uploaded_photo_start_index = 1;
-			this.album_start_index = 1;
-		};
-
-	PicasaService.prototype = {
-		setRecentlyUploadedPhotoStartIndex: function(index) {
-			this.recently_uploaded_photo_start_index = index;
-		},
-
-		setAlbumStartIndex: function(index) {
-			this.album_start_index = 1;
-		},
-		
-		hasMorePhotos: function () {
-			return this.has_more_photos;
-		},
-
-		hasMoreAlbums: function() {
-			return this.has_more_albums;
-		},
-
-		getAlbums: function (fn) {
-			var timerId = this.setErrorHandler();
-			var self = this;
-			$.ajax({
-				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) {
-					clearTimeout(timerId);
-					self.album_start_index += 25;
-					if (self.album_start_index < data.feed.openSearch$totalResults.$t) {
-						self.has_more_albums = true;
-					} else {
-						self.has_more_albums = false;
-					}
-					fn(data.feed.entry);
-				}
-			});
-		},
-
-		getPhotos: function (albumId, fn) {
-			var timerId = this.setErrorHandler();
-			$.ajax({
-				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) {
-					clearTimeout(timerId);
-					fn(data.feed.entry);
-				}
-			});
-		},
-		
-		getPhotosRecentlyUploaded: function (fn) {
-			var timerId = this.setErrorHandler();
-			var self = this;
-			$.ajax({
-				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) {
-					clearTimeout(timerId);
-					self.recently_uploaded_photo_start_index += 25;
-					if (self.recently_uploaded_photo_start_index < data.feed.openSearch$totalResults.$t) {
-						self.has_more_photos = true;
-					} else {
-						self.has_more_photos = false;
-					}
-					fn(data.feed.entry);
-				}
-			});
-		},
-
-		setErrorHandler: function () {
-			var timerId = setTimeout(function () {
-				clearTimeout(timerId);
-				$('#plugin_picasa canvas').hide();
-				$('#plugin_picasa').append(
-				$('<span>', {
-					text: 'Picasa Web Serviceの呼び出しに失敗しました'
-				}).css('color', 'red'));
-			}, 10000);
-			return timerId;
-		}
-	};
-	
-	$('<input>')
-		.attr({
-			id: 'plugin_picasa_recent',
-			type: 'button',
-			value: 'Picasaから写真を取得する'
-		})
-		.css({
-			'margin-left': '5px'
-		})
-		.appendTo('#plugin_picasa');
-
-	var showPhoto = function(photo) {
-		$('<img>')
-			.click(function () {
-				$('#body').insertAtCaret($.makePluginTag('picasa', [photo.content.src, $.trim(photo.summary.$t)]));
-			})
-			.attr({
-				src: photo.media$group.media$thumbnail[0].url,
-				title: $.trim(photo.summary.$t),
-				alt: $.trim(photo.summary.$t)
-			})
-			.css({
-				'cursor': 'pointer',
-				'margin': '5px',
-				'border': 'solid 1px #aaa'
-			})
-			.appendTo('#photos');
-	};
-
-	var showAlbum = function (album) {
-				$('<li>').attr('title', album.title.$t + 'の写真一覧を表示する').css({
-					'cursor': 'pointer',
-					'list-style': 'none',
-					'float': 'left',
-					'width': '128px',
-					'height': '128px',
-					'background-image': 'url(' + album.media$group.media$thumbnail[0].url + ')',
-					'margin': '5px',
-					'border': 'solid 1px #aaaaaa',
-					'overflow': 'hidden'
-				}).click(function () {
-					$('h3.plugin_picasa span')
-						.css('cursor', 'pointer')
-						.attr('title', 'アルバム一覧を表示する')
-						.unbind('click')
-						.click(function () {
-							$('h3.plugin_picasa span.title').remove();
-							$('.photo').remove();
-							$('.album').show();
-						});
-					$('<span>', {
-						text: ' > ' + album.title.$t
-					}).addClass('title').appendTo('h3.plugin_picasa');
-					$('<div>').css({
-						'overflow': 'auto',
-						'height': '300px'
-					}).attr('id', 'photos').addClass('photo').appendTo('#plugin_picasa');
-					$('.album').hide();
-					$(loading.canvas).show();
-					loading.start();
-					service.getPhotos(album.gphoto$id.$t, function (photos) {
-						$(loading.canvas).hide();
-						loading.stop();
-						$.each(photos, function (j, photo) {
-							showPhoto(photo);
-						});
-					});
-				}).append(
-				$('<span>', {
-					text: album.title.$t
-				}).css({
-					'display': 'block',
-					'text-align': 'center',
-					'color': '#fff',
-					'background-color': 'rgba(0, 0, 0, 0.5)'
-				})).appendTo('#albums');
-	};
-
-	var service = new PicasaService($tDiary.plugin.picasa.userId, $tDiary.plugin.picasa.imgMax);
-	var loading = new CanvasLoadingImage();
-
-	var showAlbums = function(){
-		service.setAlbumStartIndex(1);
-		$('h3.plugin_picasa span.title').remove();
-		$('#albums').remove();
-		$('.photo').remove();
-		$('<ul>').css({
-			'overflow': 'auto',
-			'height': '300px'
-		}).attr('id', 'albums').addClass('album')
-		.scroll(function(){
-		if (($(this).height() + $(this).scrollTop()) > ($(this).get(0).scrollHeight - 250)) {
-			if (!service.active && service.hasMoreAlbums()) {
-				service.active = true;
-				service.getAlbums(function(next_albums) {
-					service.active = false;
-					$.each(next_albums, function(m, next_album) {
-						showAlbum(next_album);
-					});
-				});
-			}
-		}
-		})
-		.appendTo('#plugin_picasa');
-
-		$(loading.canvas).show();
-		loading.start();
-		service.getAlbums(function (albums) {
-			$(loading.canvas).hide();
-			loading.stop();
-			$.each(albums, function(l, album) {
-				showAlbum(album)
-			});
-		});
-	}
-
-	$('#plugin_picasa_recent').click(function(){
-		$('#plugin_picasa')
-			.css('height', '300px')
-			.empty();
-		$(loading.canvas).appendTo($('#plugin_picasa'));
-		showAlbums();
-	});
-});