redd 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d85e07d35f21832e40d2a17c6063d758b2051171
-  data.tar.gz: d91adb52b18dd74a382369e5ff57384f27bc9cae
+  metadata.gz: cabe1bab129d4622fc26a19bea40fcbf27a676f4
+  data.tar.gz: 00a8d3c241c58c0ed449a1002e5e4ae3fb936093
 SHA512:
-  metadata.gz: b1330d62998349feaa50b8a9266ba295145dfe0d633b290f77ecf72a5eadaba36733467d2e9c5138bc89fa9f7043b6616d28408384ce67832ca43db3500750d2
-  data.tar.gz: 64b1c5d48b6e8c34e4fa6eb0b28465766240955966d4ef5e4235276dce8d791f0a78cbc83109b8565e4a430e082394ee83902063e2ebb3a895af8489348e78db
+  metadata.gz: 1275d0cba8f74d11d17b0bdb2644cfb4fcfa982fcc8597e665c505bcfc2252f990a6ecdbdc26d4f4671aef012353997428fac1845319b0ecc703bf673e364354
+  data.tar.gz: 5f21e8de382d108263b1fda22fd833e5862d0d214c9e54ab64f0b153a560185685326688571304120aeeb2e0484ca8627ce3d8505d219789dc0de6c7943827a5

data/lib/redd/client/authenticated.rb

@@ -41,14 +41,6 @@ module Redd
       # @return [String] The returned modhash used when making requests.
       attr_reader :modhash
 
-      # @!attribute [rw] auth_endpoint
-      # @return [String] The site to connect to authenticate with.
-      attr_accessor :auth_endpoint
-
-      def self.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.
@@ -66,8 +58,7 @@ module Redd
 
         @rate_limit = options[:rate_limit] || Redd::RateLimit.new
         @user_agent = options[:user_agent] || "Redd/Ruby, v#{Redd::VERSION}"
-        @api_endpoint = options[:api_endpoint] || "http://www.reddit.com/"
-        @auth_endpoint = options[:auth_endpoint] || "https://ssl.reddit.com/"
+        @api_endpoint = options[:api_endpoint] || "https://www.reddit.com/"
       end
 
       private

data/lib/redd/client/authenticated/account.rb

@@ -3,10 +3,7 @@ module Redd
     class Authenticated
       module Account
         def me
-          meth = :get
-          path = "/api/me.json"
-
-          object_from_response(meth, path)
+          object_from_response :get, "/api/me.json"
         end
       end
     end

data/lib/redd/client/oauth2.rb

@@ -4,6 +4,68 @@ module Redd
   module Client
     # The client to connect using OAuth2.
     class OAuth2 < Redd::Client::Authenticated
+      require "redd/client/oauth2/authorization"
+      require "redd/client/oauth2/identity"
+
+      include Redd::Client::OAuth2::Authorization
+      include Redd::Client::OAuth2::Identity
+
+      # @!attribute [r] api_endpoint
+      # @return [String] The site to make oauth requests with.
+      attr_accessor :api_endpoint
+
+      # @!attribute [r] auth_endpoint
+      # @return [String] The site to connect to authenticate with.
+      attr_accessor :auth_endpoint
+
+      # @!attribute [r] client_id
+      # @return [String] The client_id of the oauth application.
+      attr_reader :client_id
+
+      # @!attribute [r] redirect_uri
+      # @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
+
+      def initialize(client_id, secret, redirect_uri, options = {})
+        @client_id = client_id
+        @secret = secret
+        @redirect_uri = redirect_uri
+
+        @rate_limit = options[:rate_limit] || Redd::RateLimit.new(1)
+        @api_endpoint = options[:api_endpoint] || "https://oauth.reddit.com/"
+        @auth_endpoint = options[:auth_endpoint] || "https://ssl.reddit.com/"
+      end
+
+      private
+
+      def connection(access_token = @access_token)
+        @connection ||= Faraday.new(url: api_endpoint) do |faraday|
+          faraday.use Faraday::Request::UrlEncoded
+          faraday.use Redd::Response::RaiseError
+          faraday.use Redd::Response::ParseJson
+          faraday.adapter Faraday.default_adapter
+
+          faraday.headers["Authorization"] = "bearer #{access_token}"
+        end
+      end
+
+      def auth_connection
+        @auth_connection ||= Faraday.new(url: auth_endpoint) do |faraday|
+          faraday.use Faraday::Request::UrlEncoded
+          faraday.use Redd::Response::ParseJson
+          faraday.basic_auth(@client_id, @secret)
+          faraday.adapter Faraday.default_adapter
+        end
+      end
+
+      # @return [Hash] The headers that are sent with every request.
+      def headers
+        @headers ||= {}
+      end
     end
   end
 end

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

@@ -0,0 +1,31 @@
+module Redd
+  module Client
+    class OAuth2
+      module Authorization
+        def auth_url(scope = ["identity"], duration = "temporary", state = "x")
+          path = "https://ssl.reddit.com/api/v1/authorize"
+          query = {
+            client_id: @client_id,
+            redirect_uri: @redirect_uri,
+            response_type: "code",
+            state: state,
+            scope: scope.join(","),
+            duration: duration
+          }
+          string_query = query.map { |key, value| "#{key}=#{value}" }.join("&")
+
+          "#{path}?#{string_query}"
+        end
+
+        def request_access_token(code, set_token = true)
+          response = auth_connection.post "/api/v1/access_token",
+            grant_type: "authorization_code", code: code,
+            redirect_uri: @redirect_uri
+
+          @access_token = response.body[:access_token] if set_token
+          response.body
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Redd
+  module Client
+    class OAuth2
+      module Identity
+        def me
+          response = get "/api/v1/me.json"
+          object_from_body kind: "t2", data: response
+        end
+      end
+    end
+  end
+end

data/lib/redd/client/unauthenticated.rb

@@ -52,7 +52,7 @@ module Redd
       def initialize(options = {})
         @rate_limit = options[:rate_limit] || Redd::RateLimit.new
         @user_agent = options[:user_agent] || "Redd/Ruby, v#{Redd::VERSION}"
-        @api_endpoint = options[:api_endpoint] || "http://www.reddit.com/"
+        @api_endpoint = options[:api_endpoint] || "https://www.reddit.com/"
       end
 
       private

data/lib/redd/error.rb

@@ -20,41 +20,41 @@ module Redd
         when 200
           case body
           when /WRONG_PASSWORD/i
-            InvalidCredentials
+            Redd::Error::InvalidCredentials
           when /BAD_CAPTCHA/i
-            InvalidCaptcha
+            Redd::Error::InvalidCaptcha
           when /RATELIMIT/i
-            RateLimited
+            Redd::Error::RateLimited
           when /BAD_CSS_NAME/i
-            InvalidClassName
+            Redd::Error::InvalidClassName
           when /TOO_OLD/i
-            Archived
+            Redd::Error::Archived
           when /TOO_MUCH_FLAIR_CSS/i
-            TooManyClassNames
+            Redd::Error::TooManyClassNames
           when /USER_REQUIRED/i
-            AuthenticationRequired
+            Redd::Error::AuthenticationRequired
           end
         when 400
-          BadRequest
+          Redd::Error::BadRequest
         when 403
           case body
           when /USER_REQUIRED/i
-            AuthenticationRequired
+            Redd::Error::AuthenticationRequired
           else
-            PermissionDenied
+            Redd::Error::PermissionDenied
           end
         when 404
-          NotFound
+          Redd::Error::NotFound
         when 409
-          Conflict
+          Redd::Error::Conflict
         when 500
-          InternalServerError
+          Redd::Error::InternalServerError
         when 502
-          BadGateway
+          Redd::Error::BadGateway
         when 503
-          ServiceUnavailable
+          Redd::Error::ServiceUnavailable
         when 504
-          TimedOut
+          Redd::Error::TimedOut
         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.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redd
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Avinash Dwarapu
@@ -184,6 +184,8 @@ files:
 - lib/redd/client/authenticated/users.rb
 - lib/redd/client/authenticated/wiki.rb
 - lib/redd/client/oauth2.rb
+- lib/redd/client/oauth2/authorization.rb
+- lib/redd/client/oauth2/identity.rb
 - lib/redd/client/unauthenticated.rb
 - lib/redd/client/unauthenticated/account.rb
 - lib/redd/client/unauthenticated/captcha.rb