line-bot-api 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0258918c87b7575b3311c3b5418e0902150fdddcfda4f6efba06622e44ec4bec'
-  data.tar.gz: 339c25cea7f80a9049591ca5236b0a35240ee57f07d4de7b0549bba91799ab31
+  metadata.gz: 191b846d917a61448e7e38976390aeb56846229ccdc2a69c404d0ca04a3bcb89
+  data.tar.gz: 595b93123023a3c9060190969657ca06d2bc7472281bcfe43ee1ef7b4c95324a
 SHA512:
-  metadata.gz: 554a0d06637e0887ab60e89ea4e52d7c6e0e29df6ac8878926a5a21ef3e69e0ac920d2ec465a2b164ae3adcbf0d31a031bae22def8964b66057d1246210c081a
-  data.tar.gz: 074c31b20b2ba958eb22542b4332624e1f0b63e854148c1d8c9b7da0c34a1b1f9d44dd342caa3d40e1bd93431d2cebc50c8f5c2deea0caa5efb3d611f7cb7be2
+  metadata.gz: '094bbf24cc58e2b444a410b02052d15bcd545ad77e62a4cf8765d5a6d8e5e4011ff735196bffd3d95d2ab77e6cdb70a17240dfe524f71380d2633b5efea5455b'
+  data.tar.gz: f54a7e01bd1b28f28eac6e299e739a8d59d390056acac28fb7d5a957f56e2f28fa71a26a3e07a7bed212c605af735486e2213465aa417025e18aafe6d95c05d7

data/README.md

@@ -23,7 +23,7 @@ gem 'line-bot-api'
 
 And then execute:
 
-```ruby
+```sh
 bundle
 ```
 
@@ -44,6 +44,7 @@ require 'line/bot'
 
 def client
   @client ||= Line::Bot::Client.new { |config|
+    config.channel_id = ENV["LINE_CHANNEL_ID"]
     config.channel_secret = ENV["LINE_CHANNEL_SECRET"]
     config.channel_token = ENV["LINE_CHANNEL_TOKEN"]
   }

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

@@ -16,7 +16,6 @@ module Line
   module Bot
     module API
       class Error < StandardError; end
-      class InvalidCredentialsError < Error; end
     end
   end
 end

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

@@ -15,7 +15,7 @@
 module Line
   module Bot
     module API
-      VERSION = "1.10.0"
+      VERSION = "1.11.0"
     end
   end
 end

data/lib/line/bot/client.rb

@@ -13,16 +13,16 @@
 # under the License.
 
 require 'line/bot/request'
-require 'line/bot/api/errors'
 require 'base64'
 require 'net/http'
 require 'openssl'
+require 'uri'
 
 module Line
   module Bot
     class Client
       #  @return [String]
-      attr_accessor :channel_token, :channel_secret, :endpoint
+      attr_accessor :channel_token, :channel_id, :channel_secret, :endpoint
 
       # @return [Object]
       attr_accessor :httpclient
@@ -57,8 +57,47 @@ module Line
         }
       end
 
-      def credentials?
-        credentials.values.all?
+      # Issue channel access token
+      #
+      # @param grant_type [String] Grant type
+      #
+      # @return [Net::HTTPResponse]
+      def issue_channel_token(grant_type = 'client_credentials')
+        channel_id_required
+        channel_secret_required
+
+        payload = URI.encode_www_form(
+          grant_type:    grant_type,
+          client_id:     channel_id,
+          client_secret: channel_secret
+        )
+
+        request = Request.new do |config|
+          config.httpclient    = httpclient
+          config.endpoint      = endpoint
+          config.endpoint_path = '/oauth/accessToken'
+          config.content_type  = 'application/x-www-form-urlencoded'
+          config.payload       = payload
+        end
+
+        request.post
+      end
+
+      # Revoke channel access token
+      #
+      # @return [Net::HTTPResponse]
+      def revoke_channel_token(access_token)
+        payload = URI.encode_www_form(access_token: access_token)
+
+        request = Request.new do |config|
+          config.httpclient    = httpclient
+          config.endpoint      = endpoint
+          config.endpoint_path = '/oauth/revoke'
+          config.content_type  = 'application/x-www-form-urlencoded'
+          config.payload       = payload
+        end
+
+        request.post
       end
 
       # Push messages to line server and to user.
@@ -68,7 +107,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def push_message(user_id, messages)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         messages = [messages] if messages.is_a?(Hash)
 
@@ -91,7 +130,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def reply_message(token, messages)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         messages = [messages] if messages.is_a?(Hash)
 
@@ -114,7 +153,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def multicast(to, messages)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         to = [to] if to.is_a?(String)
         messages = [messages] if messages.is_a?(Hash)
@@ -137,7 +176,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def broadcast(messages)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         messages = [messages] if messages.is_a?(Hash)
 
@@ -153,7 +192,7 @@ module Line
       end
 
       def leave_group(group_id)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -166,7 +205,7 @@ module Line
       end
 
       def leave_room(room_id)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -473,7 +512,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def get(endpoint_path)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -491,7 +530,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def post(endpoint_path, payload = nil)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -510,7 +549,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def delete(endpoint_path)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -576,6 +615,18 @@ module Line
         b.each_byte { |byte| res |= byte ^ l.shift }
         res == 0
       end
+
+      def channel_token_required
+        raise ArgumentError, '`channel_token` is not configured' unless channel_token
+      end
+
+      def channel_id_required
+        raise ArgumentError, '`channel_id` is not configured' unless channel_id
+      end
+
+      def channel_secret_required
+        raise ArgumentError, '`channel_secret` is not configured' unless channel_secret
+      end
     end
   end
 end

data/lib/line/bot/request.rb

@@ -22,6 +22,8 @@ module Line
     class Request
       attr_accessor :endpoint, :endpoint_path, :credentials, :to, :reply_token, :messages, :httpclient, :payload, :file
 
+      attr_writer :content_type
+
       # Initializes a new Request
       #
       # @return [Line::Bot::Request]
@@ -44,27 +46,22 @@ module Line
 
       # @return [Hash]
       def header
-        content_type =
-          if file.is_a? File
-            case file.path
-            when /\.png\z/i then 'image/png'
-            when /\.jpe?g\z/i then 'image/jpeg'
-            else
-              raise ArgumentError.new("invalid file extension: #{file.path}")
-            end
-          else
-            'application/json; charset=UTF-8'
-          end
-
         header = {
           'Content-Type' => content_type,
           'User-Agent' => "LINE-BotSDK-Ruby/#{Line::Bot::API::VERSION}",
         }
-        hash = credentials.inject({}) { |h, (k, v)| h[k] = v.to_s; h }
+        hash = (credentials || {}).inject({}) { |h, (k, v)| h[k] = v.to_s; h }
 
         header.merge(hash)
       end
 
+      # @return [String]
+      def content_type
+        return @content_type if @content_type
+
+        guess_content_type
+      end
+
       # Get content of specified URL.
       #
       # @return [Net::HTTPResponse]
@@ -99,6 +96,22 @@ module Line
       def assert_for_deleting_message
         raise ArgumentError, 'Wrong argument type `endpoint_path`' unless endpoint_path.is_a?(String)
       end
+
+      private
+
+      # @return [String]
+      def guess_content_type
+        if file.is_a? File
+          case file.path
+          when /\.png\z/i then 'image/png'
+          when /\.jpe?g\z/i then 'image/jpeg'
+          else
+            raise ArgumentError.new("invalid file extension: #{file.path}")
+          end
+        else
+          'application/json; charset=UTF-8'
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: line-bot-api
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - LINE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -120,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: SDK of the LINE Messaging API