line-bot-api 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc272a376d9eb4be79d9c92ee485737c6474f652c0873923010f5b25d1d78c1a
-  data.tar.gz: 4beb042559850867763cec2920ac0715877c2b2a7b5538c8a749bd226de2571e
+  metadata.gz: d265a003f523763063653537df89119ee79f3fc1c987640fbd78090d081045ca
+  data.tar.gz: a5fd82fa00d302b4b804432b87fde84034492e7245a9665d4ab9f480a0fd12df
 SHA512:
-  metadata.gz: 6ca96d2225493a374bc23497b075a740ff95f469d4b2b832143083c96a1d4d319482ccb1c7b4a4f6bc0dbd93774bd49a6425c3dbc0a4d552b6afa6795125061e
-  data.tar.gz: 1809fa4bbadda5065d2f8ec1e8d4bc7fd266c1f0014623bd4606488ba6266cc8e4321fe498edf2aa63c8f6cab3bb397094d0c2aff12c37dad9c9bd5be5dfd439
+  metadata.gz: 6d89224a7a2eae22ff20ff38e08d472d595500356b54c6836cdf0af9e7345edeb42c6a6fcfb3c4500402c76635cd8e4d3e932526a0718e403fc5fa2d858b2d48
+  data.tar.gz: f2de6de836fa6f95a93f98acb88021a1206506dfebabd7f734c38747b6bbb141c59d3bebd6b7c2cc3743564dc498b929f700bdf33dada17d65a1953972dbe9eb

data/lib/line/bot/api.rb

@@ -22,7 +22,7 @@ module Line
 
       DEFAULT_HEADERS = {
         'Content-Type' => 'application/json; charset=UTF-8',
-        'User-Agent'   => "LINE-BotSDK-Ruby/#{Line::Bot::API::VERSION}"
+        'User-Agent'   => "LINE-BotSDK-Ruby/#{VERSION}"
       }.freeze
     end
   end

data/lib/line/bot/api/version.rb

@@ -15,7 +15,7 @@
 module Line
   module Bot
     module API
-      VERSION = "1.14.0"
+      VERSION = "1.14.1"
     end
   end
 end

data/lib/line/bot/client.rb

@@ -48,18 +48,18 @@ module Line
       end
 
       def httpclient
-        @httpclient ||= Line::Bot::HTTPClient.new(http_options)
+        @httpclient ||= HTTPClient.new(http_options)
       end
 
       def endpoint
-        @endpoint ||= Line::Bot::API::DEFAULT_ENDPOINT
+        @endpoint ||= API::DEFAULT_ENDPOINT
       end
 
       def blob_endpoint
         return @blob_endpoint if @blob_endpoint
 
-        @blob_endpoint = if endpoint == Line::Bot::API::DEFAULT_ENDPOINT
-                           Line::Bot::API::DEFAULT_BLOB_ENDPOINT
+        @blob_endpoint = if endpoint == API::DEFAULT_ENDPOINT
+                           API::DEFAULT_BLOB_ENDPOINT
                          else
                            # for backward compatible
                            endpoint
@@ -507,15 +507,8 @@ module Line
       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
 
@@ -605,7 +598,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def get(endpoint_base, endpoint_path, headers = {})
-        headers = Line::Bot::API::DEFAULT_HEADERS.merge(headers)
+        headers = API::DEFAULT_HEADERS.merge(headers)
         httpclient.get(endpoint_base + endpoint_path, headers)
       end
 
@@ -618,7 +611,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def post(endpoint_base, endpoint_path, payload = nil, headers = {})
-        headers = Line::Bot::API::DEFAULT_HEADERS.merge(headers)
+        headers = API::DEFAULT_HEADERS.merge(headers)
         httpclient.post(endpoint_base + endpoint_path, payload, headers)
       end
 
@@ -630,7 +623,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def delete(endpoint_base, endpoint_path, headers = {})
-        headers = Line::Bot::API::DEFAULT_HEADERS.merge(headers)
+        headers = API::DEFAULT_HEADERS.merge(headers)
         httpclient.delete(endpoint_base + endpoint_path, headers)
       end
 
@@ -644,10 +637,10 @@ module Line
 
         json['events'].map do |item|
           begin
-            klass = Line::Bot::Event.const_get(Line::Bot::Util.camelize(item['type']))
+            klass = Event.const_get(Util.camelize(item['type']))
             klass.new(item)
           rescue NameError
-            Line::Bot::Event::Base.new(item)
+            Event::Base.new(item)
           end
         end
       end
@@ -691,6 +684,21 @@ module Line
         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

data/lib/line/bot/event/message.rb

@@ -31,9 +31,9 @@ module Line
       # https://developers.line.biz/en/reference/messaging-api/#message-event
       class Message < Base
         def type
-          Line::Bot::Event::MessageType.const_get(@src['message']['type'].capitalize)
+          MessageType.const_get(@src['message']['type'].capitalize)
         rescue NameError => e
-          Line::Bot::Event::MessageType::Unsupport
+          MessageType::Unsupport
         end
 
         def message

data/lib/line/bot/event/things.rb

@@ -29,9 +29,9 @@ module Line
       # * https://developers.line.biz/en/reference/messaging-api/#scenario-result-event
       class Things < Base
         def type
-          Line::Bot::Event::ThingsType.const_get(Line::Bot::Util.camelize(@src['things']['type']))
+          ThingsType.const_get(Util.camelize(@src['things']['type']))
         rescue NameError
-          Line::Bot::Event::ThingsType::Unsupport
+          ThingsType::Unsupport
         end
 
         def device_id

data/line-bot-api.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: line-bot-api
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - LINE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '3.8'
 description: Line::Bot::API - SDK of the LINE Messaging API for Ruby
 email:
 - kimoto@linecorp.com