redd 0.7.8 → 0.7.9

data/lib/redd/clients/base/submit.rb

@@ -1,19 +1,19 @@
-module Redd
-  module Clients
-    class Base
-      # Methods that require the "submit" scope
-      module Submit
-        # Add a comment to a link, reply to a comment or reply to a message.
-        # Bit of an all-purpose method, this one.
-        # @param thing [Objects::Submission, Objects::Comment,
-        #   Objects::PrivateMessage] A thing to add a comment to.
-        # @param text [String] The text to comment.
-        # @return [Objects::Comment, Objects::PrivateMessage] The reply.
-        def add_comment(thing, text)
-          response = post("/api/comment", text: text, thing_id: thing.fullname)
-          object_from_body(response.body[:json][:data][:things][0])
-        end
-      end
-    end
-  end
-end
+module Redd
+  module Clients
+    class Base
+      # Methods that require the "submit" scope
+      module Submit
+        # Add a comment to a link, reply to a comment or reply to a message.
+        # Bit of an all-purpose method, this one.
+        # @param thing [Objects::Submission, Objects::Comment,
+        #   Objects::PrivateMessage] A thing to add a comment to.
+        # @param text [String] The text to comment.
+        # @return [Objects::Comment, Objects::PrivateMessage] The reply.
+        def add_comment(thing, text)
+          response = post("/api/comment", text: text, thing_id: thing.fullname)
+          object_from_body(response.body[:json][:data][:things][0])
+        end
+      end
+    end
+  end
+end

data/lib/redd/clients/base/utilities.rb

@@ -1,104 +1,104 @@
-require_relative "../../objects/base"
-require_relative "../../objects/thing"
-require_relative "../../objects/listing"
-require_relative "../../objects/wiki_page"
-require_relative "../../objects/labeled_multi"
-require_relative "../../objects/more_comments"
-require_relative "../../objects/comment"
-require_relative "../../objects/user"
-require_relative "../../objects/submission"
-require_relative "../../objects/private_message"
-require_relative "../../objects/subreddit"
-
-module Redd
-  module Clients
-    class Base
-      # Internal methods that make life easier.
-      # @todo Move this out to Redd::Utils?
-      module Utilities
-        # The kind strings and the objects that should be used for them.
-        OBJECT_KINDS = {
-          "Listing"      => Objects::Listing,
-          "wikipage"     => Objects::WikiPage,
-          "LabeledMulti" => Objects::LabeledMulti,
-          "more"         => Objects::MoreComments,
-          "t1"           => Objects::Comment,
-          "t2"           => Objects::User,
-          "t3"           => Objects::Submission,
-          "t4"           => Objects::PrivateMessage,
-          "t5"           => Objects::Subreddit
-        }
-
-        # Request and create an object from the response.
-        # @param [Symbol] meth The method to use.
-        # @param [String] path The path to visit.
-        # @param [Hash] params The data to send with the request.
-        # @return [Objects::Base] The object returned from the request.
-        def request_object(meth, path, params = {})
-          body = send(meth, path, params).body
-          object_from_body(body)
-        end
-
-        # Create an object instance with the correct attributes when given a
-        # body.
-        #
-        # @param [Hash] body A JSON hash.
-        # @return [Objects::Thing, Objects::Listing]
-        def object_from_body(body)
-          return nil unless body.is_a?(Hash)
-          object = object_from_kind(body[:kind])
-          flat = flatten_body(body)
-          object.new(self, flat)
-        end
-
-        # @param [Objects::Submission, Objects::Comment] base The start of the
-        #   comment tree.
-        # @author Bryce Boe (@bboe) in Python
-        # @return [Array<Objects::Comment, Objects::MoreComments>] A linear
-        #   array of the submission's comments or the comments' replies.
-        def flat_comments(base)
-          meth = (base.is_a?(Objects::Submission) ? :comments : :replies)
-          stack = base.send(meth).dup
-          flattened = []
-
-          until stack.empty?
-            comment = stack.shift
-            if comment.is_a?(Objects::Comment)
-              replies = comment.replies
-              stack = replies + stack if replies
-            end
-            flattened << comment
-          end
-
-          flattened
-        end
-
-        # Get a given property of a given object.
-        # @param [Objects::Base, String] object The object with the property.
-        # @param [Symbol] property The property to get.
-        def property(object, property)
-          object.respond_to?(property) ? object.send(property) : object.to_s
-        end
-
-        private
-
-        # Take a multilevel body ({kind: "tx", data: {...}}) and flatten it
-        # into something like {kind: "tx", ...}
-        # @param [Hash] body The response body.
-        # @return [Hash] The flattened hash.
-        def flatten_body(body)
-          data = body[:data] || body
-          data[:kind] = body[:kind]
-          data
-        end
-
-        # @param [String] kind A kind in the format /t[1-5]/.
-        # @return [Objects::Base, Objects::Listing] The appropriate object for
-        #   a given kind.
-        def object_from_kind(kind)
-          OBJECT_KINDS.fetch(kind, Objects::Base)
-        end
-      end
-    end
-  end
-end
+require_relative "../../objects/base"
+require_relative "../../objects/thing"
+require_relative "../../objects/listing"
+require_relative "../../objects/wiki_page"
+require_relative "../../objects/labeled_multi"
+require_relative "../../objects/more_comments"
+require_relative "../../objects/comment"
+require_relative "../../objects/user"
+require_relative "../../objects/submission"
+require_relative "../../objects/private_message"
+require_relative "../../objects/subreddit"
+
+module Redd
+  module Clients
+    class Base
+      # Internal methods that make life easier.
+      # @todo Move this out to Redd::Utils?
+      module Utilities
+        # The kind strings and the objects that should be used for them.
+        OBJECT_KINDS = {
+          "Listing"      => Objects::Listing,
+          "wikipage"     => Objects::WikiPage,
+          "LabeledMulti" => Objects::LabeledMulti,
+          "more"         => Objects::MoreComments,
+          "t1"           => Objects::Comment,
+          "t2"           => Objects::User,
+          "t3"           => Objects::Submission,
+          "t4"           => Objects::PrivateMessage,
+          "t5"           => Objects::Subreddit
+        }
+
+        # Request and create an object from the response.
+        # @param [Symbol] meth The method to use.
+        # @param [String] path The path to visit.
+        # @param [Hash] params The data to send with the request.
+        # @return [Objects::Base] The object returned from the request.
+        def request_object(meth, path, params = {})
+          body = send(meth, path, params).body
+          object_from_body(body)
+        end
+
+        # Create an object instance with the correct attributes when given a
+        # body.
+        #
+        # @param [Hash] body A JSON hash.
+        # @return [Objects::Thing, Objects::Listing]
+        def object_from_body(body)
+          return nil unless body.is_a?(Hash)
+          object = object_from_kind(body[:kind])
+          flat = flatten_body(body)
+          object.new(self, flat)
+        end
+
+        # @param [Objects::Submission, Objects::Comment] base The start of the
+        #   comment tree.
+        # @author Bryce Boe (@bboe) in Python
+        # @return [Array<Objects::Comment, Objects::MoreComments>] A linear
+        #   array of the submission's comments or the comments' replies.
+        def flat_comments(base)
+          meth = (base.is_a?(Objects::Submission) ? :comments : :replies)
+          stack = base.send(meth).dup
+          flattened = []
+
+          until stack.empty?
+            comment = stack.shift
+            if comment.is_a?(Objects::Comment)
+              replies = comment.replies
+              stack = replies + stack if replies
+            end
+            flattened << comment
+          end
+
+          flattened
+        end
+
+        # Get a given property of a given object.
+        # @param [Objects::Base, String] object The object with the property.
+        # @param [Symbol] property The property to get.
+        def property(object, property)
+          object.respond_to?(property) ? object.send(property) : object.to_s
+        end
+
+        private
+
+        # Take a multilevel body ({kind: "tx", data: {...}}) and flatten it
+        # into something like {kind: "tx", ...}
+        # @param [Hash] body The response body.
+        # @return [Hash] The flattened hash.
+        def flatten_body(body)
+          data = body[:data] || body
+          data[:kind] = body[:kind]
+          data
+        end
+
+        # @param [String] kind A kind in the format /t[1-5]/.
+        # @return [Objects::Base, Objects::Listing] The appropriate object for
+        #   a given kind.
+        def object_from_kind(kind)
+          OBJECT_KINDS.fetch(kind, Objects::Base)
+        end
+      end
+    end
+  end
+end

data/lib/redd/clients/base/wikiread.rb

@@ -1,33 +1,33 @@
-module Redd
-  module Clients
-    class Base
-      # Methods that require the "wikiread" scope.
-      # @note This method is not limited to {Objects::Subreddit} because there
-      #   are also top-level wiki pages.
-      module Wikiread
-        # Get a list of pages in the subreddit wiki.
-        # @param subreddit [Objects::Subreddit, String] The subreddit to
-        #   look in.
-        # @return [Array<String>] An array of wikipage titles.
-        def get_wikipages(subreddit = nil)
-          path = "/wiki/pages.json"
-          name = property(subreddit, :display_name)
-          path.prepend("/r/#{name}") if subreddit
-          get(path).body[:data]
-        end
-
-        # Get a wiki page.
-        # @param page [String] The title of the wiki page.
-        # @param subreddit [Objects::Subreddit, String] The subreddit to
-        #   look in.
-        # @return [Objects::WikiPage] A wiki page.
-        def wikipage(page, subreddit = nil)
-          path = "/wiki/#{page}.json"
-          name = property(subreddit, :display_name)
-          path.prepend("/r/#{name}") if subreddit
-          request_object(:get, path)
-        end
-      end
-    end
-  end
-end
+module Redd
+  module Clients
+    class Base
+      # Methods that require the "wikiread" scope.
+      # @note This method is not limited to {Objects::Subreddit} because there
+      #   are also top-level wiki pages.
+      module Wikiread
+        # Get a list of pages in the subreddit wiki.
+        # @param subreddit [Objects::Subreddit, String] The subreddit to
+        #   look in.
+        # @return [Array<String>] An array of wikipage titles.
+        def get_wikipages(subreddit = nil)
+          path = "/wiki/pages.json"
+          name = property(subreddit, :display_name)
+          path.prepend("/r/#{name}") if subreddit
+          get(path).body[:data]
+        end
+
+        # Get a wiki page.
+        # @param page [String] The title of the wiki page.
+        # @param subreddit [Objects::Subreddit, String] The subreddit to
+        #   look in.
+        # @return [Objects::WikiPage] A wiki page.
+        def wikipage(page, subreddit = nil)
+          path = "/wiki/#{page}.json"
+          name = property(subreddit, :display_name)
+          path.prepend("/r/#{name}") if subreddit
+          request_object(:get, path)
+        end
+      end
+    end
+  end
+end

data/lib/redd/clients/installed.rb

@@ -1,56 +1,56 @@
-require "cgi"
-require_relative "base"
-
-module Redd
-  module Clients
-    # The client for installed apps that can't keep a secret.
-    # It might even work with Rubymotion (fingers crossed).
-    class Installed < Base
-      # @!attribute [r] client_id
-      attr_reader :client_id
-
-      # @!attribute [r] redirect_uri
-      attr_reader :redirect_uri
-
-      # @param [Hash] options The options to create the client with.
-      # @see Base#initialize
-      # @see Redd.it
-      def initialize(client_id, redirect_uri, **options)
-        @client_id = client_id
-        @redirect_uri = redirect_uri
-        super(**options)
-      end
-
-      # @param [String] state A random string to double-check later.
-      # @param [Array<String>] scope The scope to request access to.
-      # @param [:temporary, :permanent] duration
-      # @return [String] The url to redirect the user to.
-      def auth_url(state, scope = ["identity"], duration = :temporary)
-        query = {
-          response_type: "token",
-          client_id: @client_id,
-          redirect_uri: @redirect_uri,
-          state: state,
-          scope: scope.join(","),
-          duration: duration
-        }
-
-        url = URI.join(auth_endpoint, "/api/v1/authorize")
-        url.query = URI.encode_www_form(query)
-        url.to_s
-      end
-
-      # Authorize using the url fragment.
-      # @param [String] fragment The part of the url after the "#".
-      # @return [Access] The access given by reddit.
-      def authorize!(fragment)
-        parsed = CGI.parse(fragment)
-        @access = Access.new(
-          access_token: parsed[:access_token].first,
-          expires_in: parsed[:expires_in].first,
-          scope: parsed[:scope]
-        )
-      end
-    end
-  end
-end
+require "cgi"
+require_relative "base"
+
+module Redd
+  module Clients
+    # The client for installed apps that can't keep a secret.
+    # It might even work with Rubymotion (fingers crossed).
+    class Installed < Base
+      # @!attribute [r] client_id
+      attr_reader :client_id
+
+      # @!attribute [r] redirect_uri
+      attr_reader :redirect_uri
+
+      # @param [Hash] options The options to create the client with.
+      # @see Base#initialize
+      # @see Redd.it
+      def initialize(client_id, redirect_uri, **options)
+        @client_id = client_id
+        @redirect_uri = redirect_uri
+        super(**options)
+      end
+
+      # @param [String] state A random string to double-check later.
+      # @param [Array<String>] scope The scope to request access to.
+      # @param [:temporary, :permanent] duration
+      # @return [String] The url to redirect the user to.
+      def auth_url(state, scope = ["identity"], duration = :temporary)
+        query = {
+          response_type: "token",
+          client_id: @client_id,
+          redirect_uri: @redirect_uri,
+          state: state,
+          scope: scope.join(","),
+          duration: duration
+        }
+
+        url = URI.join(auth_endpoint, "/api/v1/authorize")
+        url.query = URI.encode_www_form(query)
+        url.to_s
+      end
+
+      # Authorize using the url fragment.
+      # @param [String] fragment The part of the url after the "#".
+      # @return [Access] The access given by reddit.
+      def authorize!(fragment)
+        parsed = CGI.parse(fragment)
+        @access = Access.new(
+          access_token: parsed[:access_token].first,
+          expires_in: parsed[:expires_in].first,
+          scope: parsed[:scope]
+        )
+      end
+    end
+  end
+end

data/lib/redd/clients/script.rb

@@ -1,41 +1,41 @@
-require_relative "base"
-
-module Redd
-  module Clients
-    # The client for an account you own (e.g. bots).
-    class Script < Base
-      # @!attribute [r] client_id
-      attr_reader :client_id
-
-      # @!attribute [r] username
-      attr_reader :username
-
-      # @param [Hash] options The options to create the client with.
-      # @see Base#initialize
-      # @see Redd.it
-      def initialize(client_id, secret, username, password, **options)
-        @client_id = client_id
-        @secret = secret
-        @username = username
-        @password = password
-        super(**options)
-      end
-
-      # Authorize using the given data.
-      # @return [Access] The access given by reddit.
-      def authorize!
-        response = auth_connection.post(
-          "/api/v1/access_token",
-          grant_type: "password",
-          username: @username,
-          password: @password
-        )
-
-        @access = Access.new(response.body)
-      end
-
-      alias_method :refresh_access!, :authorize!
-
-    end
-  end
-end
+require_relative "base"
+
+module Redd
+  module Clients
+    # The client for an account you own (e.g. bots).
+    class Script < Base
+      # @!attribute [r] client_id
+      attr_reader :client_id
+
+      # @!attribute [r] username
+      attr_reader :username
+
+      # @param [Hash] options The options to create the client with.
+      # @see Base#initialize
+      # @see Redd.it
+      def initialize(client_id, secret, username, password, **options)
+        @client_id = client_id
+        @secret = secret
+        @username = username
+        @password = password
+        super(**options)
+      end
+
+      # Authorize using the given data.
+      # @return [Access] The access given by reddit.
+      def authorize!
+        response = auth_connection.post(
+          "/api/v1/access_token",
+          grant_type: "password",
+          username: @username,
+          password: @password
+        )
+
+        @access = Access.new(response.body)
+      end
+
+      alias_method :refresh_access!, :authorize!
+
+    end
+  end
+end