tdiary-contrib 5.1.4 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7589d91925dead78181297d0bfb4e994d79d2d362cbc822084367b85a593b56
-  data.tar.gz: 424a594824fad56caf9c40825d96c1c7eac62857dd0b04bad7028f4a7a7a5685
+  metadata.gz: 5c6c19593df443182f317dd5f95221f5d60a40f31f9f5f651d92658f317be523
+  data.tar.gz: d23ef645cdd7b6d991debef467c842a267c4881c90d5d9bf19282c4c3bea9a32
 SHA512:
-  metadata.gz: 656e6bdfc9982c2744c0a323e7b46037dbcf0eab0750add8b4b84807cf1ba99e6ce82f6f130c1e26139ee74dff629bdc7a14390f23537741680a0185ecef7925
-  data.tar.gz: '0463607988a55b8575c9fa62e16786e7f51e139f3f3cf9c461a7b3930d2efa9b782afaf52a08279e499bcc027399e4040f9a4f221cb306bcfcc7dba1d56e84a8'
+  metadata.gz: 59a4d79e22875821acbc05f0ba56130adaaa1e06add567e69a5dc745c98a541c01fb638e8fd0303cdeed6f4945b96900c773f680cd5b2bd13665257efd7cb2aa
+  data.tar.gz: 76012951b4740779a78732b3585244faffed3a61185a4e3ea3a4a73cc3ed6435d74360ab04685788666e453cc7556f826b3d35afa5d9e8bd46f6db0e8b6a0d30

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.1.4"
+    VERSION = "5.1.5"
   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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.5
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2021-02-28 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