tdiary-contrib 5.1.4 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7589d91925dead78181297d0bfb4e994d79d2d362cbc822084367b85a593b56
-  data.tar.gz: 424a594824fad56caf9c40825d96c1c7eac62857dd0b04bad7028f4a7a7a5685
+  metadata.gz: 26ed0292336afd37dbf602aacebe5816077ad450883500b6d0b37a81fe56aa99
+  data.tar.gz: 9064adbae3f2a4a7c40ef91b1d737c24e3c219f5dd5cded6429f626ab9c0544b
 SHA512:
-  metadata.gz: 656e6bdfc9982c2744c0a323e7b46037dbcf0eab0750add8b4b84807cf1ba99e6ce82f6f130c1e26139ee74dff629bdc7a14390f23537741680a0185ecef7925
-  data.tar.gz: '0463607988a55b8575c9fa62e16786e7f51e139f3f3cf9c461a7b3930d2efa9b782afaf52a08279e499bcc027399e4040f9a4f221cb306bcfcc7dba1d56e84a8'
+  metadata.gz: 8e9476fa421de7453b2fc1649e45be709d1328617c7d898cf47f28d608b1e36afdbfac3746f1af34849cd229e8c7d7def852b2d10cc9c2093e6048b319e57e00
+  data.tar.gz: 280e114e9d5f0671153a2e2eb3e1172ffa5cd350b19183eb06cb8098719a80ce38d67b9bd144ed44038bbfe7a3440bda6a01c8ff54dc8300f4f6e78445af3466

data/lib/tdiary/contrib/version.rb

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

@@ -1,4 +1,4 @@
-require 'Calendar.rb'
+require 'holiday_japan'
 require 'date'
 unless Time::new.respond_to?( :strftime_holiday_backup )
 then
@@ -7,8 +7,8 @@ then
    alias strftime_holiday_backup strftime
    def strftime( format )
     holiday = ""
-    day = Day.new(self.day,self.month,self.year,self.wday)
-    holiday = day.holiday_name_jp if day.holiday?
+    day = Date.new(self.year, self.month, self.day)
+    holiday = HolidayJapan.name(day) if HolidayJapan.check(day)
     strftime_holiday_backup( format.gsub( /%K/, holiday ) )
    end
   end

data/plugin/my_hotentry.rb

@@ -44,7 +44,7 @@ class MyHotEntry
     begin
       Timeout.timeout(5) do
         # convert Tempfile to String because REXML can't accept Tempfile
-        open(rss_url) do |f|
+        URI.open(rss_url) do |f|
           rss = REXML::Document.new(f.readlines.join("\n"))
         end
       end

data/plugin/ogp.rb

@@ -41,6 +41,7 @@ def ogp_tag
 			section_index = @cgi.params['p'][0] || sections.size
             begin
 				section = sections[section_index.to_i - 1].body_to_html
+				@image_date = @date.strftime("%Y%m%d") # hack for image plugin
 				section_html = apply_plugin(section)
 
 				headers['og:description'] = ogp_description(section_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.4
+  version: 5.2.0
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: holiday_japan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -544,7 +558,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package