line-social 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91e85b87dad2aaf8a6b7a9e505f0c37b0d57da0320925e712f7b851927e6ffc
-  data.tar.gz: 0fd98b2c8db6fb01607d596f0d012d603f6b84c11472e16a3100f30e224b3606
+  metadata.gz: 3eaba402a6d0d78f613732d830365688b85c4fc797356dd5e4593800c60b01e8
+  data.tar.gz: cc59e86f156510264ec6e8ac474b25b08440472f4b97d5faf24ccb89c54c9ef4
 SHA512:
-  metadata.gz: d8afd55db524361be8bc119ce9ec4fa25f95a48eced91bc830ac4cf1e0aa54e0ad6c9497d73b55d3640b43c8d0bdd512b788d119f20e6317259d7e70cf446d41
-  data.tar.gz: bc3d50eae682d0826f9bcda49d28e4dd381ea96e85cdb84ace75db5d5f91ec8316e452a7028dd51c6bdab93eca5fc40859b143d630aa4d89a9684501d3a84df0
+  metadata.gz: 5df52de38e01b72bafbb15b04772dd5e5bdf0f59cb266fa4f55eaf595ab847b63abaf6dc3162d666e510ee820dfc6dd1ddc5b56ee4b7c374ecc335a578ea2eb8
+  data.tar.gz: 027e28e2e1f78a19a35467230787c385e7f0e16239ab993c1433611d4e420526deeb1af85e6c5aecff1ca11aacdc53048afaa7eff72cbcd0fc4829ee2eeff4a1

data/lib/line/social/client.rb

@@ -10,22 +10,11 @@ module Line
       end
 
       def oauth
-        Request::Oauth.new(self)
+        Request::Oauth.new(@access_token)
       end
 
       def profile
-        Request::Profile.new(self)
-      end
-
-      def request_path
-        Client::API_URI.path
-      end
-
-      def request
-        @request ||= Faraday.new(url: "#{API_URI.scheme}://#{API_URI.host}") do |connection|
-          connection.response :json, content_type: /\bjson$/
-          connection.adapter Faraday.default_adapter
-        end
+        Request::Profile.new(@access_token)
       end
     end
   end

data/lib/line/social/profile.rb

@@ -5,8 +5,8 @@ module Line
 
       attribute :userId, String
       attribute :displayName, String
-      attribute :pictureUrl, String
-      attribute :statusMessage, String
+      attribute :pictureUrl
+      attribute :statusMessage
     end
   end
 end

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

@@ -0,0 +1,14 @@
+module Line
+  module Social
+    module Request
+      class Base
+        def request
+          Faraday.new(url: url) do |connection|
+            connection.response :json, content_type: /\bjson$/
+            connection.adapter Faraday.default_adapter
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,14 +1,20 @@
 module Line
   module Social
     module Request
-      class Friendship
-        def initialize(client)
-          @client = client
+      class Friendship < Base
+        def initialize(access_token)
+          @access_token = access_token
         end
 
         def get
           raise Line::Social::NotImplementedError
         end
+
+        private
+
+        def url
+          "#{API_URI.scheme}://#{API_URI.host}"
+        end
       end
     end
   end

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

@@ -1,9 +1,11 @@
 module Line
   module Social
     module Request
-      class Oauth
-        def initialize(client)
-          @client = client
+      class Oauth < Base
+        API_URI = URI.parse("https://api.line.me/oauth2/v2.1")
+
+        def initialize(access_token)
+          @access_token = access_token
         end
 
         def issue
@@ -11,7 +13,7 @@ module Line
         end
 
         def verify
-          response = @client.request.get("#{@client.request_path}/verify", access_token: @client.access_token)
+          response = request.get("#{API_URI.path}/verify", access_token: @access_token)
 
           if response.body["error"]
             raise Line::Social::Error.new(response.body["error_description"])
@@ -27,6 +29,12 @@ module Line
         def revoke
           raise Line::Social::NotImplementedError
         end
+
+        private
+
+        def url
+          "#{API_URI.scheme}://#{API_URI.host}"
+        end
       end
     end
   end

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

@@ -1,14 +1,16 @@
 module Line
   module Social
     module Request
-      class Profile
-        def initialize(client)
-          @client = client
+      class Profile < Base
+        API_URI = URI.parse("https://api.line.me/v2")
+
+        def initialize(access_token)
+          @access_token = access_token
         end
 
         def get
-          response = @client.request.get do |request|
-            request.url "#{@client.request_path}/profile"
+          response = request.get do |request|
+            request.url "#{API_URI.path}/profile"
             request.headers["Authorization"] =  "Bearer #{@access_token}"
           end
 
@@ -18,6 +20,12 @@ module Line
             Line::Social::Profile.new(response.body)
           end
         end
+
+        private
+
+        def url
+          "#{API_URI.scheme}://#{API_URI.host}"
+        end
       end
     end
   end

data/lib/line/social/version.rb

@@ -1,5 +1,5 @@
 module Line
   module Social
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/line/social.rb

@@ -4,6 +4,7 @@ require "virtus"
 
 require "line/social/version"
 require "line/social/client"
+require "line/social/request/base"
 require "line/social/request/oauth"
 require "line/social/request/profile"
 require "line/social/request/friendship"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: line-social
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - camelmasa
@@ -116,6 +116,7 @@ files:
 - lib/line/social/error.rb
 - lib/line/social/oauth.rb
 - lib/line/social/profile.rb
+- lib/line/social/request/base.rb
 - lib/line/social/request/friendship.rb
 - lib/line/social/request/oauth.rb
 - lib/line/social/request/profile.rb