line-social 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bddb24a7a0f87bbfb1c0da8cace65bc2fbeff831aeeed14302b36475d7b740ac
-  data.tar.gz: 97cc163c482394a8dfb20742dcf712c289637f50e9c4a3489f03cf699c9da485
+  metadata.gz: 90050c8733508e2a727c8ee60b45cd7692f6a1e06e8659676f676a0308d22097
+  data.tar.gz: 6f27f570586db27ff6c7aa9f87269ae498ecbb29c4b27ab0ed21e0ff62f5595f
 SHA512:
-  metadata.gz: d3a14f639e1731790ebcc7943132575e202aea638c57d938264bf364eb2191e0a35538963e994719909fe0ec230ccc932764eb345fa876059ab7574881ef9b66
-  data.tar.gz: 7e9aaf92b9c30dcb75a041f176f52a6b6083f9980b00d212e07fd8364ca3e05a3a56ea8f9a6cd1e07479ad9b9bdf69072501fb5ca8cd5375016176d25c1d465e
+  metadata.gz: 39d6b3be949dc4e79a9eff9ebc129c1b3078dab85c9de30845fa108c3b373a2c9d051bc81e9893c07c2c524c29dbd58cc53cb96f4c9df7b786823288596cb055
+  data.tar.gz: c01a91cb3b706d5fabe75bf919c4de5505aad78a5f3156a06befb54465279e4dd52ef30ef57039b6f3f9fb25db4f2e484071bfc396c7bac2c13653d8162a44cd

data/lib/line/social/error.rb

@@ -1,6 +1,10 @@
 module Line
   module Social
     class Error < StandardError; end
-    class NotImplementedError < Error; end
+    class BadRequestError < Error; end
+    class UnauthorizedError < Error; end
+    class ForbiddenError < Error; end
+    class TooManyRequestsError < Error; end
+    class InternalServerError < Error; end
   end
 end

data/lib/line/social/request/base.rb

@@ -2,12 +2,43 @@ module Line
   module Social
     module Request
       class Base
-        def http_client
-          Faraday.new do |connection|
+        def http_client(method, &block)
+          client = Faraday.new do |connection|
             connection.response :json, content_type: /\bjson$/
+            connection.response :raise_error
             connection.adapter Faraday.default_adapter
           end
+
+          client.run_request(method, nil, nil, nil, &block)
+        rescue Faraday::Error::ClientError => e
+          error_message = JSON.parse(e.response[:body])["message"]
+
+          case e.response[:status]
+          when 400
+            raise Line::Social::BadRequestError.new(error_message)
+          when 401
+            raise Line::Social::UnauthorizedError.new(error_message)
+          when 403
+            raise Line::Social::ForbiddenError.new(error_message)
+          when 429
+            raise Line::Social::TooManyRequestsError.new(error_message)
+          when 500
+            raise Line::Social::InternalServerError.new(error_message)
+          end
         end
+
+        # Will be uncommented below after releasing Faraday 1.0
+        # rescue Faraday::BadRequestError => e
+        #   raise Line::Social::BadRequestError.new(error_message)
+        # rescue Faraday::UnauthorizedError => e
+        #   raise Line::Social::UnauthorizedError.new(error_message)
+        # rescue Faraday::ForbiddenError => e
+        #   raise Line::Social::ForbiddenError.new(error_message)
+        # rescue Faraday::ClientError => e
+        #   raise Line::Social::TooManyRequestsError.new(error_message)
+        # rescue Faraday::ServerError => e
+        #   raise Line::Social::InternalServerError.new(error_message)
+        # end
       end
     end
   end

data/lib/line/social/request/friendship.rb

@@ -5,18 +5,9 @@ module Line
         API_URI = URI.parse("https://api.line.me/friendship/v1")
 
         def get(access_token)
-          response = http_client.get do |request|
+          response = http_client(:get) do |request|
             request.url "#{API_URI}/status"
-            request.headers["Authorization"] =  "Bearer #{access_token}"
-          end
-
-          if response.body["error"]
-            raise Line::Social::Error.new(response.body["error_description"])
-          end
-
-          # Case of "{"message"=>"There is no login bot linked to this channel."}"
-          if response.body["message"]
-            raise Line::Social::Error.new(response.body["message"])
+            request.headers["Authorization"] = "Bearer #{access_token}"
           end
 
           Line::Social::Friendship.new(response.body)

data/lib/line/social/request/oauth.rb

@@ -10,7 +10,7 @@ module Line
         end
 
         def issue(code:, redirect_uri:)
-          response = http_client.post do |request|
+          response = http_client(:post) do |request|
             request.url "#{API_URI}/token"
             request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
             request.body = URI.encode_www_form(
@@ -22,25 +22,20 @@ module Line
             )
           end
 
-          if response.body["error"]
-            raise Line::Social::Error.new(response.body["error_description"])
-          end
-
           Line::Social::Oauth.new(response.body.merge(client_id: @client_id, client_secret: @client_secret))
         end
 
         def verify(access_token)
-          response = http_client.get("#{API_URI}/verify", access_token: access_token)
-
-          if response.body["error"]
-            raise Line::Social::Error.new(response.body["error_description"])
+          response = http_client(:get) do |request|
+            request.url "#{API_URI}/verify"
+            request.params["access_token"] = access_token
           end
 
           Line::Social::Oauth.new(response.body.merge(client_id: @client_id, client_secret: @client_secret))
         end
 
         def refresh(refresh_token)
-          response = http_client.post do |request|
+          response = http_client(:post) do |request|
             request.url "#{API_URI}/token"
             request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
             request.body = URI.encode_www_form(
@@ -51,15 +46,11 @@ module Line
             )
           end
 
-          if response.body["error"]
-            raise Line::Social::Error.new(response.body["error_description"])
-          end
-
           Line::Social::Oauth.new(response.body.merge(client_id: @client_id, client_secret: @client_secret))
         end
 
         def revoke(access_token)
-          response = http_client.post do |request|
+          response = http_client(:post) do |request|
             request.url "#{API_URI}/revoke"
             request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
             request.body = URI.encode_www_form(

data/lib/line/social/request/profile.rb

@@ -5,15 +5,11 @@ module Line
         API_URI = URI.parse("https://api.line.me/v2")
 
         def get(access_token)
-          response = http_client.get do |request|
+          response = http_client(:get) do |request|
             request.url "#{API_URI}/profile"
             request.headers["Authorization"] =  "Bearer #{access_token}"
           end
 
-          if response.body["error"]
-            raise Line::Social::Error.new(response.body["error_description"])
-          end
-
           Line::Social::Profile.new(response.body)
         end
       end

data/lib/line/social/version.rb

@@ -1,5 +1,5 @@
 module Line
   module Social
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: line-social
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - camelmasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-13 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday