tdiary-contrib 5.0.5 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d47b569ca7f9fe177f670b8e60ba493b80831ce
-  data.tar.gz: 1575e8d48b554035e7d7d806eefaa8c64fcf909f
+  metadata.gz: a05b3f25047b6bc6e9017c6c7994464cefac13fd
+  data.tar.gz: c95af7773f37e017db01f658171af17335a47586
 SHA512:
-  metadata.gz: 41cd6a1edd86c27e2e6412fc6a737f1759da17be066d82df9b4e97b382fbda663544fd939b2c98aaa6d30ddfcb2bb883c420d81adb7284dcc404b26d69cd8d78
-  data.tar.gz: 759786b536e9c10d7cd495de44bb90d80f34a6923199765019ded3f689ff46eeeff983ae60f52e7dbdd6eb0fd9c3a6a95f2a44529e937ae8807b796299e273bb
+  metadata.gz: 3ea47a5edc86322387c752dc256a9510e1871218a67ab1880aac45a2773e71462378c970547c4fdb489dc3e0c2d7bfd8d72097172ca21623e7fea07592608413
+  data.tar.gz: 765627b88d1e2e0f64b5249ad8aa26477f357396c250fdbd6491e5f786416a2fbceb7b963e0395d0e39bcf9027111d5e9abe9966deb11b74ac524cf779ba3ce6

data/js/google_photos.js

@@ -48,16 +48,20 @@ $(function() {
       .setDeveloperKey(developerKey)
       .setLocale('ja')
       .setCallback(pickerCallback)
+      .enableFeature(google.picker.Feature.MULTISELECT_ENABLED)
       .build();
     picker.setVisible(true);
   }
 
   function pickerCallback(data) {
     if (data[google.picker.Response.ACTION] == google.picker.Action.PICKED) {
-      var doc = data[google.picker.Response.DOCUMENTS][0];
-      var image = doc.thumbnails[doc.thumbnails.length - 1];
-      var tag = $.makePluginTag("google_photos '" + image.url + "', '" + image.width + "', '" + image.height + "'");
-      $('#body').insertAtCaret(tag);
+      var tag = [];
+      for (var i = 0; i < data[google.picker.Response.DOCUMENTS].length; i++) {
+        var doc = data[google.picker.Response.DOCUMENTS][i];
+        var image = doc.thumbnails[doc.thumbnails.length - 1];
+        tag.push($.makePluginTag("google_photos '" + image.url + "', '" + image.width + "', '" + image.height + "'"));
+      }
+      $('#body').insertAtCaret(tag.join("\n") + "\n");
     }
   }
 });

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.0.5"
+    VERSION = "5.0.6"
   end
 end

data/plugin/google_photos.rb

@@ -5,15 +5,24 @@
 # Distributed under the GPL
 #
 
-def google_photos(src, width, height, alt="photo", place="photo")
+def google_photos(src, width, height, alt="photo", place="photo", scale=nil)
+	scale = scale || @conf['google_photos.scale'] || 100
+	width = width.to_i * (scale.to_f / 100)
+	height = height.to_i * (scale.to_f / 100)
 	%Q|<img title="#{alt}" width="#{width}" height="#{height}" alt="#{alt}" src="#{src}" class="#{place} google">|
 end
 
-def google_photos_left(src, width, height, alt="photo")
+def google_photos_left(src, width, height, alt="photo", scale=nil)
+	scale = scale || @conf['google_photos.scale'] || 100
+	width = width.to_i * (scale.to_f / 100)
+	height = height.to_i * (scale.to_f / 100)
 	google_photos(src, width, height, alt, 'left')
 end
 
-def google_photos_right(src, width, height, alt="photo")
+def google_photos_right(src, width, height, alt="photo", scale=nil)
+	scale = scale || @conf['google_photos.scale'] || 100
+	width = width.to_i * (scale.to_f / 100)
+	height = height.to_i * (scale.to_f / 100)
 	google_photos(src, width, height, alt, 'right')
 end
 
@@ -40,6 +49,8 @@ add_conf_proc('google_photos', 'Googleフォト') do
   if @mode == 'saveconf'
     @conf['google_photos.api_key'] = @cgi.params['google_photos.api_key'][0]
     @conf['google_photos.client_id'] = @cgi.params['google_photos.client_id'][0]
+    @conf['google_photos.scale'] = @cgi.params['google_photos.scale'][0]
+    @conf['google_photos.scale'] = 100 if @conf['google_photos.scale'].nil? || @conf['google_photos.scale'].empty?
   end
 
   r = <<-_HTML
@@ -63,5 +74,7 @@ add_conf_proc('google_photos', 'Googleフォト') do
 	<p><input type="text" name="google_photos.api_key" size="100" value="#{@conf['google_photos.api_key']}"></p>
 	<h3>認証用クライアントID</h3>
 	<p><input type="text" name="google_photos.client_id" size="100" value="#{@conf['google_photos.client_id']}"></p>
+	<h3>サムネイルからの縮小率 (単位%。数値1〜100)</h3>
+	<p><input type="text" name="google_photos.scale" size="100" value="#{@conf['google_photos.scale']}"></p>
 _HTML
 end

data/plugin/plantuml.rb

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# create image by PlantUML http://plantuml.com/
+#
+# Copyright (c) tamoot <tamoot+tdiary@gmail.com>
+# Distributed under the GPL
+#
+
+require 'uri'
+require 'zlib'
+require 'digest/md5'
+
+module ::PlantUML
+   module Deflate
+
+      CHARS ||= ('0'..'9').to_a + ('A'..'Z').to_a + ('a'..'z').to_a + ['-', '_']
+
+      def self.compress(text)
+         compressed = Zlib::Deflate.deflate(text, Zlib::BEST_COMPRESSION)
+         compressed.chars.each_slice(3).map do |chars|
+            append3bytes(chars[0].ord, chars[1]&.ord.to_i, chars[2]&.ord.to_i)
+         end.join
+      end
+
+      private
+
+      def self.append3bytes(b1, b2, b3)
+         [
+            b1 >> 2,
+            ((b1 & 0x3) << 4) | (b2 >> 4),
+            ((b2 & 0xF) << 2) | (b3 >> 6),
+            b3 & 0x3F,
+         ].map { |c| CHARS[c & 0x3F] || '?' }.join
+      end
+   end
+
+end
+
+def plantuml(text)
+   html = %Q|<div class="plantuml">|
+
+   begin
+      uri = URI::parse( @conf['plantuml.server'] )
+      uri.path.gsub!(/\/+$/, "")
+      uri.path << '/png/' << PlantUML::Deflate::compress(text)
+      html << %Q|<img src=#{uri}></img>|
+   rescue
+      html << %Q|Error: #{$!.message}|
+   end
+
+   html << %Q|</div>|
+
+end
+
+add_conf_proc('plantuml_server', 'PlantUMLサーバ') do
+   if @mode == 'saveconf'
+      @conf['plantuml.server'] = @cgi.params['plantuml.server'][0]
+   end
+
+   r = <<-_HTML
+   <h3>Summary</h3>
+   <p>The image is generated by using specified PlantUML server.</p>
+   <h3>URL</h3>
+   <p>Please specify the PlantUML server URL (official site or your own PlantUML server)
+   <li> Official PlantUML server: http://www.plantuml.com/plantuml/</li>
+   <p><input type="text" name="plantuml.server" size="100" value="#{@conf['plantuml.server']}"></p>
+   _HTML
+
+   r
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.6
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -315,6 +315,7 @@ files:
 - plugin/openid.rb
 - plugin/opensearch_ad.rb
 - plugin/picasa.rb
+- plugin/plantuml.rb
 - plugin/playstore.rb
 - plugin/plugin_checker.rb
 - plugin/popit.rb
@@ -505,7 +506,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package