tdiary-contrib 5.1.6 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 445c03139666ef9446619035bc574c61e7f62c62bff04026f85ae720a4d6ca16
-  data.tar.gz: 371bda7528f839ba925bc26d62851d74007e9a1e0d4650812c128144bd2c130f
+  metadata.gz: fcb604c9bc510bdab8d4a60b72c569e696cbfed0ec2ee449feecc2fb23aee897
+  data.tar.gz: 1f27b8f1307fae519ce30fdd217240d196e3c5b1dcf8dd96bfebe709891ad9ca
 SHA512:
-  metadata.gz: 44bdd42397b196e882655fe50927f7cd4b251055a5c182e7356a4550b31f813806c3ea29eb6a7d6182eb8e068e7c3780bd1211ce780c020cb3195bd8338af24f
-  data.tar.gz: cd835977ffaf48acb7bc722425926bb959e58e9a1076deddcf4ee3321303015ae76522c4557cd3081d7e49a3e6bf1041a11cebe3793ff7d99f3f063cb50c0054
+  metadata.gz: c83381fe467ff37cb6cc532ec837c52b0bfe35132625f7a4c2af3076c1b98cd174e305a0248c28e4ba2beab17aca1f506fefb38bd3bc3eb06dbdb1cc2f76f1e7
+  data.tar.gz: e68b45d7474d973cf1d40b976decac035808965f56f144333dd6c8ba3525831ef99d2fe5bee413b55b190bb60c985fd957768e3247d720cfb253c718a3ec9852

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.1.6"
+	  VERSION = "5.2.1"
   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/openid.rb

@@ -43,6 +43,7 @@ if /^(?:latest|conf|saveconf)$/ =~ @mode then
 			nil,
 			['https://open.login.yahooapis.com/openid/op/auth', 'https://me.yahoo.com/a/<ID>'],
 			'http://open.login.yahooapis.com/openid20/www.yahoo.com/xrds'),
+		'Launchpad' => @openid_config.new(['https://login.launchpad.net/+openid', 'https://login.launchpad.net/+id/<ID>']),
 	}
 
 	if @conf['openid.service'] and @conf['openid.id'] then

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/plugin/tatsu_zine.rb

@@ -6,6 +6,7 @@
 # USAGE: {{tatsu_zine 1}}
 
 require 'open-uri'
+require 'openssl'
 
 def tatsu_zine_cache_dir
 	cache = "#{@cache_path}/tatsu-zine"
@@ -33,10 +34,10 @@ def tatsu_zine( id, doc = nil )
 	end
 
 	link = "https://tatsu-zine.com/books/#{id}"
-	doc ||= open(link, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read
+	doc ||= URI.open(link, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read
 	title = doc.match(%r|<meta property="og:title" content="(.*)">|).to_a[1]
 	image = doc.match(%r|<meta property="og:image" content="(.*)">|).to_a[1]
-	price = doc.match(%r|span itemprop="price">(.*)</span>|).to_a[1]
+	price = doc.match(%r|span itemprop="price">(.*?)</span>|m).to_a[1].gsub(/,/,'').to_i
 	author = doc.match(%r|<p itemprop="author" class="author">(.*)</p>|).to_a[1]
 
 	result = <<-EOS
@@ -47,7 +48,7 @@ def tatsu_zine( id, doc = nil )
 		<span class="amazon-detail-desc">
 			<span class="amazon-title">#{h title}</span><br>
 			<span class="amazon-author">#{h author}</span><br>
-			<span class="amazon-price">#{h price}</span>
+			<span class="amazon-price">#{h price}円</span>
 		</span><br style="clear: left">
 	</span></a>
 EOS

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.6
+  version: 5.2.1
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -143,21 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debase
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -558,7 +544,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package