redd 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea1e887784c57e6c3bef623557618c0b2cf85b6f
-  data.tar.gz: a0c3e6e653857d9f10d5915d433866b166d436da
+  metadata.gz: 4800088050748f4a32d520ba72815bab9e2d8f1b
+  data.tar.gz: 55e9d64b88930bbf42480efa232f7fd65d585f79
 SHA512:
-  metadata.gz: 7cd3dc27fe73b93382f5a2cb651d391fc6dd6fc43e2257871419c77703d1b070c7fd7e561e29724f54c7736d7340860866ee0b05b0c10f39f666cb32a7ed2f3e
-  data.tar.gz: 9ae7e3b594a3f4db301623737e63f9771a71f3c9663ccd2a9ccbc9e1965f95a2dcf0c5c5d989432ac7614284b08d74f4ea74cb96068db39a0d28f45161be4915
+  metadata.gz: e3b67ad7805af912e63c42754312a3cf7f1d9a7cfcc6199d74077b182ce2b9d750052773535b99e3752b422f741d445cc696d212fbdd7b39f66730102877d421
+  data.tar.gz: 0b100bc3f6986435e10160c14c72e3cf8b0df8c8c8222a2c24902ee3a97ec90d4c050532a4cb19c3b8c69b03dfbfbe2c7ebf0a3ebf5e323a7dd47ec23ac80ab7

data/lib/redd/client/oauth2.rb

@@ -22,13 +22,9 @@ module Redd
       # @return [String] The exact redirect_uri of the oauth application.
       attr_reader :redirect_uri
 
-      # @!attribute [rw] access_token
-      # @return [String] The access token used to make requests.
-      attr_accessor :access_token
-
-      # @!attribute [rw] refresh_token
-      # @return [String] The token used to refresh the access token.
-      attr_accessor :refresh_token
+      # @!attribute [rw] access
+      # @return [String] The access info used to make requests.
+      attr_accessor :access
 
       def initialize(client_id, secret, redirect_uri, options = {})
         @client_id = client_id
@@ -42,7 +38,7 @@ module Redd
 
       private
 
-      def connection(access_token = @access_token)
+      def connection(access_token = @access.access_token)
         @connection ||= Faraday.new(url: api_endpoint) do |faraday|
           faraday.use Faraday::Request::UrlEncoded
           faraday.use Redd::Response::RaiseError

data/lib/redd/client/oauth2/authorization.rb

@@ -1,3 +1,5 @@
+require "redd/oauth2_access"
+
 module Redd
   module Client
     class OAuth2
@@ -17,26 +19,29 @@ module Redd
           "#{path}?#{string_query}"
         end
 
-        def request_access_token(code, set_token = true)
+        def request_access_token(code, set_access = true)
           response = auth_connection.post "/api/v1/access_token",
             grant_type: "authorization_code", code: code,
             redirect_uri: @redirect_uri
 
-          body = response.body
-          @access_token = body[:access_token] if set_token
-          @refresh_token = body[:refresh_token] if body[:refresh_token]
-          body
+          access = Redd::OAuth2Access.new(response.body)
+          @access = access if set_access
+          access
         end
 
-        def refresh_access_token(
-          refresh_token = @refresh_token, set_token = true
-        )
+        def refresh_access_token(access = nil, set_access = true)
+          refresh_token = extract_attribute(access, :refresh_token)
           response = auth_connection.post "/api/v1/access_token",
             grant_type: "refresh_token", refresh_token: refresh_token
 
-          body = response.body
-          @access_token = body[:access_token] if set_token
-          body
+          case access
+          when Redd::OAuth2Access
+            access.refresh(response.body)
+          when ::String
+            new_access = Redd::OAuth2Access.new(response.body)
+            @access = new_access if set_access
+            new_access
+          end
         end
       end
     end

data/lib/redd/oauth2_access.rb

@@ -0,0 +1,47 @@
+require "multi_json"
+
+module Redd
+  class OAuth2Access
+    attr_reader :access_token
+
+    attr_reader :refresh_token
+
+    attr_reader :scope
+
+    attr_reader :duration
+
+    attr_reader :expires_at
+
+    def initialize(response)
+      @access_token = response[:access_token]
+      @refresh_token = response[:refresh_token]
+      @scope = response[:scope].split(",").map { |s| s.to_sym }
+      @duration = @refresh_token ? :permanent : :temporary
+      @expires_at = Time.now + response[:expires_in]
+    end
+
+    def refresh(response)
+      @access_token = response[:access_token]
+      @expires_at = Time.now + response[:expires_in]
+      self
+    end
+
+    def expired?
+      Time.now > @expires_at
+    end
+
+    def to_json
+      MultiJson.dump(
+        access_token: @access_token,
+        refresh_token: @refresh_token,
+        scope: @scope.join(","),
+        expires_in: (@expires_at - Time.now).to_i
+      )
+    end
+
+    def self.from_json(json)
+      hash = MultiJson.load(json, symbolize_keys: true)
+      new(hash)
+    end
+  end
+end

data/lib/redd/version.rb

@@ -1,5 +1,5 @@
 # The main Redd module.
 module Redd
   # The semantic version number for Redd.
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Avinash Dwarapu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,6 +197,7 @@ files:
 - lib/redd/client/unauthenticated/utilities.rb
 - lib/redd/client/unauthenticated/wiki.rb
 - lib/redd/error.rb
+- lib/redd/oauth2_access.rb
 - lib/redd/object/comment.rb
 - lib/redd/object/listing.rb
 - lib/redd/object/more_comments.rb