tdiary-contrib 5.1.3 → 5.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e197ac500c058bedf4550b8348befa06bf061335dd95e70aebed756de26ce461
-  data.tar.gz: 32eb86bd9e7c014e1dc1b0a5fd046810cf494c26ed508a2708e70d00eff42917
+  metadata.gz: 7b0d0fc16d8d41985c2d59b9b5b7e5ed0fb592685277e159041d1e1800a8404d
+  data.tar.gz: 24321238bd6d69f6f3af587dbc52896fc2d99de93e1c644411f0dfdf2cb93b51
 SHA512:
-  metadata.gz: '08910590a8a4409a832c67f9e2105fc39f25a2b9515fcc86a247990267d3ccd5410d181ae23e68b68362a66b91d2bd1c4cc3ffeaebd90cf8c55c6837ff74b25d'
-  data.tar.gz: ff83cf724de444e5f1c61518d2be03457eb1cf65aa3c9ff7fd58109a763f902bb6180abc7c3a7fad78c8524c68e44e9751406fa14e5c424701cd6c88c50882bf
+  metadata.gz: bff5525297303e4ac9937d8c52134a0d06d8c6a7df833fc3004198434c996f4e4b4f5c0eb03eb676bf163510701563435fa3b2cb7c5905c5b19fe316f36a4233
+  data.tar.gz: 235cbdfe3b640941dd2652d517c3f3b6cb026f0f57c25ac1e0d4ae3c0c6fea5aef23beb7ca305ac62eaf5e4e3f643d961556807f40218f3312c7af190f5de032

data/lib/tdiary/contrib/version.rb

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

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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.1.7
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2021-08-29 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.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package