Merge pull request #177 from yskkin/open_uri

Accept open-uri as create_rich_menu_image's argument

Author: kimoto

lib/line/bot/client.rb

@@ -507,15 +507,8 @@ def get_rich_menu_image(rich_menu_id)
       def create_rich_menu_image(rich_menu_id, file)
         channel_token_required
 
-        content_type = 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
-
         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
 
@@ -691,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

line-bot-api.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11" if RUBY_VERSION < "2.3"
   spec.add_development_dependency 'rake', "~> 10.4"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webmock", "~> 1.24"
+  spec.add_development_dependency "webmock", "~> 3.8"
 end

spec/line/bot/rich_menu_spec.rb

@@ -2,6 +2,7 @@
 require 'webmock/rspec'
 require 'json'
 require 'tempfile'
+require 'open-uri'
 
 RICH_MENU_CONTENT = <<"EOS"
 {
@@ -177,6 +178,24 @@
       .with(body: File.open(RICH_MENU_IMAGE_FILE_PATH).read)
   end
 
+  it 'uploads and attaches an image to a rich menu from uri' do
+    uri_template = Addressable::Template.new Line::Bot::API::DEFAULT_BLOB_ENDPOINT + '/bot/richmenu/1234567/content'
+
+    stub_request(:post, uri_template).to_return(body: '{}', status: 200).with do |request|
+      expect(request.headers["Content-Type"]).to eq('image/png')
+    end
+
+    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' })
+
+    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)
+  end
+
   it "uploads invalid extension's file" do
     uri_template = Addressable::Template.new Line::Bot::API::DEFAULT_ENDPOINT + '/bot/richmenu/1234567/content'
     stub_request(:post, uri_template).to_return(body: '{}', status: 200)
@@ -186,4 +205,17 @@
       end
     end.to raise_error(ArgumentError)
   end
+
+  it 'uploads invalid content type uri' do
+    uri_template = Addressable::Template.new Line::Bot::API::DEFAULT_ENDPOINT + '/bot/richmenu/1234567/content'
+    stub_request(:post, uri_template).to_return(body: '{}', status: 200)
+
+    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' })
+
+    expect do
+      client.create_rich_menu_image('1234567', URI.parse(text_url).open)
+    end.to raise_error(ArgumentError)
+  end
 end