redd 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbf5efd8e87b68f78da263ecb19dd9ee403eb06c
-  data.tar.gz: ee5a23284444562f4eb2160e700793e3af3b6f33
+  metadata.gz: cac2352c74273319e7d9d2459a05469a03e19725
+  data.tar.gz: 610eede3dc4cd4c0adc0edcb7a0a647f8531a4d6
 SHA512:
-  metadata.gz: bf79a0705655e2b559984a1cdcc0ef59bdbf78aa46515b14dc2a3aee06090e7d4193993e68264ed6e8994f9fded9dc7ce72814da4a86beca17509e356733a1f8
-  data.tar.gz: 9eb1cf158dc96a0258315072b25c7c456ee3f36e241db6b31f0de8f67b03a6aa534915fd3619f662fd604e1959d01ef741a8736ee1a2f56d9aaf7b66758a9fc1
+  metadata.gz: 147e0bc9cba206f042cce9f7c580e8ffe88fbef02a841c8ec25e8e0cc2507d6e5e59a3a30e8e5947fc6cdc58b332fe28dab37748d3e9684f90bdd983918c7caa
+  data.tar.gz: 0cabe42cbca0d9eb9b2c321ee836e2bedd5f5c47d808c1108875efa3229b5df19ab0fa2dda296f0dbb011abf134e00444877b54d0cd1b253d90dfb94ecd84325

data/lib/redd.rb

@@ -3,12 +3,13 @@ require "redd/client/authenticated"
 require "redd/client/oauth2"
 
 module Redd
-  def self.client(username = nil, password = nil)
-    client = Redd::Client::Unauthenticated.new
-    if username.nil? || password.nil?
-      client
+  def self.client(username = nil, password = nil, redirect_uri = nil, options = {})
+    if redirect_uri
+      Redd::Client::OAuth2.new(username, password, redirect_uri, options)
+    elsif username && password
+      Redd::Client::Authenticated.new_from_credentials(username, password, options)
     else
-      client.login(username, password)
+      Redd::Client::Unauthenticated.new
     end
   end
 end

data/lib/redd/client/authenticated.rb

@@ -41,6 +41,10 @@ module Redd
       # @return [String] The returned modhash used when making requests.
       attr_reader :modhash
 
+      def new_from_credentials(username, password, options = {})
+        Redd::Client::Unauthenticated.new.login(username, password, options)
+      end
+
       # Set up an authenticated connection to reddit.
       #
       # @param [String] cookie The cookie to use when sending a request.

data/lib/redd/oauth2_access.rb

@@ -17,7 +17,12 @@ module Redd
       @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]
+      @expires_at =
+        if response[:expires_at]
+          Time.at(response[:expires_at])
+        else	            
+          Time.now + response[:expires_in]
+        end
     end
 
     def refresh(response)
@@ -35,7 +40,7 @@ module Redd
         access_token: @access_token,
         refresh_token: @refresh_token,
         scope: @scope.join(","),
-        expires_in: (@expires_at - Time.now).to_i
+        expires_at: @expires_at.to_i
       )
     end
 

data/lib/redd/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redd
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Avinash Dwarapu