Merge pull request #2187 from pooza/4_5_2

4.5.2
pooza · May 15, 2021 · 4657a4a · 4657a4a
2 parents facd7fe + 50227f7
commit 4657a4a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -156,7 +156,7 @@ GEM
     et-orbi (1.2.4)
       tzinfo
     eventmachine (1.2.7)
-    execjs (2.8.0)
+    execjs (2.8.1)
     facets (3.1.0)
     faraday (1.4.1)
       faraday-excon (~> 1.1)
@@ -225,12 +225,12 @@ GEM
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
     nio4r (2.5.7)
-    nokogiri (1.11.3)
+    nokogiri (1.11.4)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    nokogiri (1.11.3-x86_64-darwin)
+    nokogiri (1.11.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.11.3-x86_64-linux)
+    nokogiri (1.11.4-x86_64-linux)
       racc (~> 1.4)
     nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)

diff --git a/app/lib/mulukhiya/controller/feed_controller.rb b/app/lib/mulukhiya/controller/feed_controller.rb
@@ -28,6 +28,7 @@ class FeedController < Controller
         storage = RenderStorage.new
         raise Ginseng::NotFoundError, "Resource #{request.path} not found." unless command
         raise Ginseng::NotFoundError, "Resource #{request.path} not found." unless storage[command]
+        @renderer = RSS20FeedRenderer.new
         return storage[command]
       rescue => e
         e = Ginseng::Error.create(e)

diff --git a/app/lib/mulukhiya/renderer/script_renderer.rb b/app/lib/mulukhiya/renderer/script_renderer.rb
@@ -10,6 +10,9 @@ def dir
     def to_s
       return uglifier.compile(File.read(path)) if minimize?
       return File.read(path)
+    rescue => e
+      logger.error(error: e)
+      return File.read(path)
     end
 
     def minimize?

diff --git a/config/application.yaml b/config/application.yaml
@@ -1,5 +1,5 @@
 package:
-  version: 4.5.1
+  version: 4.5.2
   url: https://github.com/pooza/mulukhiya-toot-proxy
   description: 投稿内容の更新等を行うプロキシ。通称「モロヘイヤ」。
   authors:

diff --git a/test/api_controller.rb b/test/api_controller.rb
@@ -114,6 +114,7 @@ def test_costom_endpoints
       config['/api/custom'].each do |entry|
         get File.join('/', entry['path'])
         assert(last_response.ok?)
+        assert_equal(last_response.content_type, 'application/json; charset=UTF-8')
       end
     end
   end

diff --git a/test/feed_controller.rb b/test/feed_controller.rb
@@ -84,6 +84,7 @@ def test_costom_endpoints
       config['/feed/custom'].each do |entry|
         get File.join('/', entry['path'])
         assert(last_response.ok?)
+        assert_equal(last_response.content_type, 'application/rss+xml; charset=UTF-8')
       end
     end
   end