fix rubocop

Author: Yoshiyuki Kinjo

lib/line/bot/client.rb

@@ -507,21 +507,8 @@ def get_rich_menu_image(rich_menu_id)
       def create_rich_menu_image(rich_menu_id, file)
         channel_token_required
 
-        content_type = if file.respond_to?(:content_type)
-                         content_type = file.content_type
-                         raise ArgumentError, "invalid content type: #{content_type}" unless ['image/jpeg', 'image/png'].include?(content_type)
-                         content_type
-                       else
-                         case file.path
-                         when /\.jpe?g\z/i then 'image/jpeg'
-                         when /\.png\z/i   then 'image/png'
-                         else
-                           raise ArgumentError, "invalid file extension: #{file.path}"
-                         end
-                       end
-
         endpoint_path = "/bot/richmenu/#{rich_menu_id}/content"
-        headers = credentials.merge('Content-Type' => content_type)
+        headers = credentials.merge('Content-Type' => content_type(file))
         post(blob_endpoint, endpoint_path, file.rewind && file.read, headers)
       end
 
@@ -697,6 +684,21 @@ def secure_compare(a, b)
         res == 0
       end
 
+      def content_type(file)
+        if file.respond_to?(:content_type)
+          content_type = file.content_type
+          raise ArgumentError, "invalid content type: #{content_type}" unless ['image/jpeg', 'image/png'].include?(content_type)
+          content_type
+        else
+          case file.path
+          when /\.jpe?g\z/i then 'image/jpeg'
+          when /\.png\z/i   then 'image/png'
+          else
+            raise ArgumentError, "invalid file extension: #{file.path}"
+          end
+        end
+      end
+
       def channel_token_required
         raise ArgumentError, '`channel_token` is not configured' unless channel_token
       end

spec/line/bot/rich_menu_spec.rb

@@ -188,9 +188,9 @@
     image_url = 'https://line.example.org/rich_menu.png'
     image_content = File.open(RICH_MENU_IMAGE_FILE_PATH).read
     image_content.force_encoding('ASCII-8BIT')
-    stub_request(:get, image_url).to_return(body: image_content, status: 200, headers: {'Content-type': 'image/png' })
+    stub_request(:get, image_url).to_return(body: image_content, status: 200, headers: { 'Content-type' => 'image/png' })
 
-    client.create_rich_menu_image('1234567', open(image_url))
+    client.create_rich_menu_image('1234567', URI.parse(image_url).open)
 
     expect(WebMock).to have_requested(:post, Line::Bot::API::DEFAULT_BLOB_ENDPOINT + '/bot/richmenu/1234567/content')
       .with(body: image_content)
@@ -212,10 +212,10 @@
 
     text_url = 'https://line.example.org/rich_menu.txt'
     text_content = File.open(RICH_MENU_INVALID_FILE_EXTENSION_PATH).read
-    stub_request(:get, text_url).to_return(body: text_content, status: 200, headers: {'Content-type': 'plain/text' })
+    stub_request(:get, text_url).to_return(body: text_content, status: 200, headers: { 'Content-type' => 'plain/text' })
 
     expect do
-      client.create_rich_menu_image('1234567', open(text_url))
+      client.create_rich_menu_image('1234567', URI.parse(text_url).open)
     end.to raise_error(ArgumentError)
   end
 end