tdiary-contrib 5.1.7 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b0d0fc16d8d41985c2d59b9b5b7e5ed0fb592685277e159041d1e1800a8404d
-  data.tar.gz: 24321238bd6d69f6f3af587dbc52896fc2d99de93e1c644411f0dfdf2cb93b51
+  metadata.gz: 26ed0292336afd37dbf602aacebe5816077ad450883500b6d0b37a81fe56aa99
+  data.tar.gz: 9064adbae3f2a4a7c40ef91b1d737c24e3c219f5dd5cded6429f626ab9c0544b
 SHA512:
-  metadata.gz: bff5525297303e4ac9937d8c52134a0d06d8c6a7df833fc3004198434c996f4e4b4f5c0eb03eb676bf163510701563435fa3b2cb7c5905c5b19fe316f36a4233
-  data.tar.gz: 235cbdfe3b640941dd2652d517c3f3b6cb026f0f57c25ac1e0d4ae3c0c6fea5aef23beb7ca305ac62eaf5e4e3f643d961556807f40218f3312c7af190f5de032
+  metadata.gz: 8e9476fa421de7453b2fc1649e45be709d1328617c7d898cf47f28d608b1e36afdbfac3746f1af34849cd229e8c7d7def852b2d10cc9c2093e6048b319e57e00
+  data.tar.gz: 280e114e9d5f0671153a2e2eb3e1172ffa5cd350b19183eb06cb8098719a80ce38d67b9bd144ed44038bbfe7a3440bda6a01c8ff54dc8300f4f6e78445af3466

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.1.7"
+	  VERSION = "5.2.0"
   end
 end

data/plugin/google_analytics.rb

@@ -13,15 +13,15 @@ end
 def google_analytics_insert_code
 	return '' unless @conf['google_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');
+		<!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id=UA-#{@conf['google_analytics.profile']}"></script>
+		<script>
+			window.dataLayer = window.dataLayer || [];
+			function gtag(){dataLayer.push(arguments);}
+			gtag('js', new Date());
 
-		ga('create', 'UA-#{@conf['google_analytics.profile']}', 'auto');
-		ga('send', 'pageview');
-	// --></script>
+			gtag('config', 'UA-#{@conf['google_analytics.profile']}');
+		</script>
 	HTML
 end
 
@@ -34,7 +34,7 @@ add_conf_proc( 'google_analytics', 'Google Analytics' ) do
 	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>
+		<p>UA-<input name="google_analytics.profile" value="#{h @conf['google_analytics.profile']}"></p>
 	HTML
 	if defined? AMP
 		r << <<-HTML

data/plugin/profile.rb

@@ -59,7 +59,7 @@ module ::Profile
 			# get a XML document from endpoint and create REXML::Document instance
 			def fetch(endpoint)
 				Timeout.timeout(5) do
-					open(endpoint) do |f|
+					URI.open(endpoint) do |f|
 						doc = REXML::Document.new(f)
 					end
 				end
@@ -90,7 +90,7 @@ module ::Profile
 			def fetch(endpoint)
 				require 'json'
 				Timeout.timeout(5) do
-					doc = open(endpoint) {|f| JSON.parse(f.read) }
+					doc = URI.open(endpoint) {|f| JSON.parse(f.read) }
 				end
 			end
 
@@ -128,7 +128,7 @@ module ::Profile
 				require 'json'
 				Timeout.timeout(5) do
 					begin
-						doc = open(endpoint) {|f| JSON.parse(f.read) }
+						doc = URI.open(endpoint) {|f| JSON.parse(f.read) }
 					rescue RuntimeError => err
 						if err.message =~ /^redirection forbidden: /
 							 endpoint.sub!(/www/, @options[:lang])

data/spec/google_analytics_spec.rb

@@ -44,15 +44,15 @@ describe "google_analytics plugin" do
 
 	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('send', 'pageview');
-		// --></script>
+			<!-- Global site tag (gtag.js) - Google Analytics -->
+			<script async src="https://www.googletagmanager.com/gtag/js?id=UA-53836-1"></script>
+			<script>
+				window.dataLayer = window.dataLayer || [];
+				function gtag(){dataLayer.push(arguments);}
+				gtag('js', new Date());
+
+				gtag('config', 'UA-53836-1');
+			</script>
 		SCRIPT
 		expected.gsub( /^\t/, '' ).chomp
 	end

data/util/image-gallery/views/gallery.rhtml

@@ -26,9 +26,9 @@
 						<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>
+                       <p><a href="<%= format_link_viewer_image(@image_hash.key(@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>
+                       <p><a href="<%= format_link_viewer_image(@image_hash.key(@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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.1.7
+  version: 5.2.0
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -558,7 +558,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package