redd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 546ebcdeb092101a90012a2f2a3d088cdae13259
-  data.tar.gz: c0a9b544cd6e0786cf99d0d1fea4336929068ea6
+  metadata.gz: 737c5bb6b96b0507169cd88c0d2b6d7117241dc6
+  data.tar.gz: 277672cec830f047ffe1b17082325da5bf88fc46
 SHA512:
-  metadata.gz: 213c006802d87c57bcdd4236f793c7def0eeadb47d5991e3f7d2894dba3824373b9c7c6fe5ba817a65a9e0de54b12b2047c5a0200bc1487cfc11ef13791f9b34
-  data.tar.gz: a6ca604d6a3c55a9dd1dec45edc9537b5a2b5f153447c8d6ce05b49d721f4e12c6204af765cfc8c6d96f4848559757b8a21e38ea7361aef8f5ab5c14831b2ac1
+  metadata.gz: ae62116a74fcb27b218e55024133082861d63ecc5b8cba99b1a46d86d94cdb9350e59104fef2ed2963d13f31d5e7dfcf5a83f4d501adb643bb86e245b37a554b
+  data.tar.gz: 3ae8c2e8870bcdcc0e2b3705073e1b4ae46aacc735ae662d9fedcdd07618351aa53982e911f371b5432e186dadfdab388867f248d798a57a2aa5c5ec11c6a174

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

@@ -2,7 +2,23 @@ module Redd
   module Client
     class Authenticated
       module Flair
-        
+        def get_flair_list(subreddit = nil, params = {})
+          name = extract_attribute(subreddit, :display_name) if subreddit
+
+          path = "/api/flairlist.json"
+          path = path.prepend("/r/#{name}") if name
+
+          get(path, params)[:users]
+        end
+
+        # @see http://ruby-doc.org/core-1.9.3/String.html#method-i-casecmp
+        def get_flair(user, subreddit = nil)
+          username = extract_attribute(user, :name)
+          options = {name: username}
+
+          flair = get_flair_list(subreddit, options).first
+          flair if flair[:user].casecmp(username.downcase) == 0
+        end
       end
     end
   end

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

@@ -2,111 +2,63 @@ module Redd
   module Client
     class Authenticated
       module LinksComments
+        # @todo return the edited object.
         def add_comment(thing, text, return_element = true)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/comment"
-          params = {api_type: "json", text: text, thing_id: fullname}
-
-          # TODO: Return the created object.
-          send(meth, path, params)
+          post "/api/comment", api_type: "json", text: text, thing_id: fullname
         end
 
         alias_method :reply, :add_comment
 
         def delete(thing)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/del"
-          params = {id: fullname}
-
-          send(meth, path, params)
+          post "/api/del", id: fullname
         end
 
+        # @todo return the edited object.
         def edit(thing, text)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/editusertext"
-          params = {api_type: "json", text: text, thing_id: fullname}
-
-          # TODO: Return the edited object.
-          send(meth, path, params)
+          post "/api/editusertext",
+            api_type: "json", text: text, thing_id: fullname
         end
 
         def hide(thing)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/hide"
-          params = {id: fullname}
-
-          send(meth, path, params)
-      end
+          post "/api/hide", id: fullname
+        end
 
         def unhide(thing)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/unhide"
-          params = {id: fullname}
-
-          send(meth, path, params)
+          post "/api/unhide", id: fullname
         end
 
         def mark_as_nsfw(thing)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/marknsfw"
-          params = {id: fullname}
-
-          send(meth, path, params)
+          post "/api/marknsfw", id: fullname
         end
 
         def unmark_as_nsfw(thing)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/unmarknsfw"
-          params = {id: fullname}
-
-          send(meth, path, params)
+          post "/api/unmarknsfw", id: fullname
         end
 
         alias_method :mark_as_safe, :unmark_as_nsfw
 
         def report(thing)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/report"
-          params = {id: fullname}
-
-          send(meth, path, params)
+          post "/api/report", id: fullname
         end
 
         def save(thing, category = nil)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/save"
           params = {id: fullname}
           params << {category: category} if category
-
-          send(meth, path, params)
+          post "/api/save", params
         end
 
         def unsave(thing)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/unsave"
-          params = {id: fullname}
-
-          send(meth, path, params)
+          post "/api/unsave", id: fullname
         end
 
         def upvote(thing)
@@ -125,12 +77,7 @@ module Redd
 
         def vote(thing, direction)
           fullname = extract_fullname(thing)
-
-          meth = :post
-          path = "/api/vote"
-          params = {id: fullname, dir: direction}
-
-          send(meth, path, params)
+          post "/api/vote", id: fullname, dir: direction
         end
       end
     end

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

@@ -2,7 +2,75 @@ module Redd
   module Client
     class Authenticated
       module Moderation
-        
+        def approve(thing)
+          fullname = extract_fullname(thing)
+          post "/api/approve", id: fullname
+        end
+
+        def remove(thing)
+          fullname = extract_fullname(thing)
+          post "/api/remove", id: fullname
+        end
+
+        def distinguish(thing, how = :yes)
+          fullname = extract_fullname(thing)
+          post "/api/distinguish", api_type: "json", id: fullname, how: how
+        end
+
+        def undistinguish(thing)
+          distinguish(thing, :no)
+        end
+
+        def accept_moderator_invite(subreddit)
+          name = extract_attribute(subreddit, :display_name)
+          post, "/r/#{name}/api/accept_moderator_invite", api_type: "json"
+        end
+
+        def leave_contributor_status(subreddit)
+          fullname = extract_fullname(subreddit)
+          post "/api/leavecontributor", id: fullname
+        end
+
+        def leave_moderator_status(subreddit)
+          fullname = extract_fullname(subreddit)
+          post "/api/leavemoderator", id: fullname
+        end
+
+        def ignore_reports(thing)
+          fullname = extract_fullname(subreddit)
+          post "/api/ignore_reports", id: fullname
+        end
+
+        def unignore_reports(thing)
+          fullname = extract_fullname(subreddit)
+          post "/api/unignore_reports", id: fullname
+        end
+
+        def get_reports(*args)
+          get_submissions(:reports, *args)
+        end
+
+        def get_spam(*args)
+          get_submissions(:spam, *args)
+        end
+
+        def get_modqueue(*args)
+          get_submissions(:modqueue, *args)
+        end
+
+        def get_unmoderated(*args)
+          get_submissions(:unmoderated, *args)
+        end
+
+        private
+
+        def get_submissions(type, subreddit = nil, params = {})
+          subreddit_name = extract_attribute(subreddit, :display_name)
+          path = "/about/#{type}.json"
+          path = path.prepend("/r/#{subreddit_name}") if subreddit_name
+
+          object_from_response :get, path, params
+        end
       end
     end
   end

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

@@ -4,35 +4,30 @@ module Redd
       module PrivateMessages
         def block_message(message)
           fullname = extract_fullname(message)
-          send(:post, "/api/block", id: fullname)
+          post "/api/block", id: fullname
         end
 
         def compose_message(to, subject, text, captcha = nil, identifier = nil)
-          meth = :post
-          path = "/api/compose"
           params = {
             api_type: "json", to: to.to_s, subject: subject, text: text
           }
           params << {captcha: captcha, iden: identifier} if captcha
 
-          send(meth, path, params)
+          post "/api/compose", params
         end
 
         def mark_as_read(message)
           fullname = extract_fullname(message)
-          send(:post, "/api/read_message", id: fullname)
+          post "/api/read_message", id: fullname
         end
 
         def mark_as_unread(message)
           fullname = extract_fullname(message)
-          send(:post, "/api/unread_message", id: fullname)
+          post "/api/unread_message", id: fullname
         end
 
         def messages(category = "inbox", params = {})
-          meth = :get
-          path = "/message/#{category}.json"
-
-          object_from_response(meth, path, params)
+          object_from_response :get, "/message/#{category}.json", params
         end
       end
     end

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

@@ -11,26 +11,20 @@ module Redd
         end
 
         def get_subreddits(where = :subscriber, params = {})
-          meth = :get
           path =
             if [:popular, :new].include?(where)
               "/subreddits/#{where}.json"
             elsif [:subscriber, :contributor, :moderator].include?(where)
               "/subreddits/mine/#{where}.json"
             end
-          object_from_response(meth, path, params)
+          object_from_response(:get, path, params)
         end
 
         private
 
         def edit_subscription(action, subreddit)
           fullname = extract_fullname(subreddit)
-
-          meth = :post
-          path = "/api/subscribe"
-          params = {action: action, sr: fullname}
-
-          send(meth, path, params)
+          post "/api/subscribe", action: action, sr: fullname
         end
       end
     end

data/lib/redd/client/unauthenticated.rb

@@ -9,15 +9,21 @@ module Redd
     # The Client used to connect without needing login credentials.
     class Unauthenticated
       require "redd/client/unauthenticated/account"
+      require "redd/client/unauthenticated/captcha"
       require "redd/client/unauthenticated/links_comments"
       require "redd/client/unauthenticated/listing"
+      require "redd/client/unauthenticated/live"
+      require "redd/client/unauthenticated/moderation"
       require "redd/client/unauthenticated/subreddits"
       require "redd/client/unauthenticated/utilities"
       require "redd/client/unauthenticated/wiki"
 
       include Redd::Client::Unauthenticated::Account
+      include Redd::Client::Unauthenticated::Captcha
       include Redd::Client::Unauthenticated::LinksComments
       include Redd::Client::Unauthenticated::Listing
+      include Redd::Client::Unauthenticated::Live
+      include Redd::Client::Unauthenticated::Moderation
       include Redd::Client::Unauthenticated::Subreddits
       include Redd::Client::Unauthenticated::Utilities
       include Redd::Client::Unauthenticated::Wiki
@@ -70,10 +76,10 @@ module Redd
       # @param [#to_sym] method The HTTP verb to use.
       # @param [String] path The path under the api endpoint to request from.
       # @param [Hash] params The additional parameters to send (defualt: {}).
-      # @return [Faraday::Response] A Faraday Response.
+      # @return [String] The response body.
       def request(method, path, params = {})
         rate_limit.after_limit do
-          connection.send(method.to_sym, path, params)
+          connection.send(method.to_sym, path, params).body
         end
       end
 

data/lib/redd/client/unauthenticated/captcha.rb

@@ -0,0 +1,20 @@
+module Redd
+  module Client
+    class Unauthenticated
+      module Captcha
+        def needs_captcha?
+          get "/api/needs_captcha.json"
+        end
+
+        def new_captcha
+          response = get "/api/new_captcha", api_type: "json"
+          response[:json][:data][:iden]
+        end
+
+        def captcha_url(identifier)
+          "http://www.reddit.com/captcha/#{identifier}.png"
+        end
+      end
+    end
+  end
+end

data/lib/redd/client/unauthenticated/links_comments.rb

@@ -5,17 +5,12 @@ module Redd
         # @note Reddit does accept a subreddit, but with fullnames and urls, I
         #   assumed that was unnecessary.
         def get_info(params = {})
-          meth = :get
-          path = "/api/info.json"
-          object_from_response(meth, path, params)
+          object_from_response :get, "/api/info.json"
         end
 
         def get_comments(submission)
           id = extract_id(submission)
-
-          meth = :get
-          path = "/comments/#{id}.json"
-          comments_from_response(meth, path)
+          comments_from_response :get, "/comments/#{id}.json"
         end
 
         def get_replies(comment)
@@ -23,6 +18,26 @@ module Redd
           return [] unless replies.is_a?(Hash) and replies.has_key?(:kind)
           object_from_body(replies)
         end
+
+        # FIX THIS ASAP
+        def replace_morecomments(morecomments)
+          parent_id = morecomments.parent_id
+          link_id = 
+            if parent_id.start_with?("t1_")
+              get_info(id: parent_id).first.link_id
+            elsif parent_id.start_with?("t3_")
+              parent_id
+            end
+
+          meth = :post
+          path = "/api/morechildren"
+          params = {
+            api_type: "json", link_id: link_id,
+            children: morecomments.children.join(",")
+          }
+
+          send(meth, path, params)
+        end
       end
     end
   end

data/lib/redd/client/unauthenticated/listing.rb

@@ -4,10 +4,7 @@ module Redd
       module Listing
         def by_id(*fullnames)
           names = fullnames.join(",")
-
-          meth = :get
-          path = "/by_id/#{names}.json"
-          object_from_response(meth, path)
+          object_from_response :get,  "/by_id/#{names}.json"
         end
 
         def get_hot(*args)
@@ -33,10 +30,12 @@ module Redd
         private
 
         def get_listing(type, subreddit = nil, params = {})
-          meth = :get
+          name = extract_attribute(subreddit, :display_name) if subreddit
+
           path = "/#{type}.json"
-          path = path.prepend("/r/#{subreddit}") if subreddit
-          object_from_response(meth, path, params)
+          path = path.prepend("/r/#{name}") if name
+
+          object_from_response :get, path, params
         end
       end
     end

data/lib/redd/client/unauthenticated/live.rb

@@ -0,0 +1,8 @@
+module Redd
+  module Client
+    class Unauthenticated
+      module Live
+      end
+    end
+  end
+end

data/lib/redd/client/unauthenticated/moderation.rb

@@ -0,0 +1,18 @@
+module Redd
+  module Client
+    class Unauthenticated
+      module Moderation
+        def stylesheet_url(subreddit = nil)
+          path = "/stylesheet"
+          path = path.prepend("/r/#{subreddit}") if subreddit
+
+          get(path).headers[:location]
+        end
+
+        def stylesheet(subreddit = nil)
+          get stylesheet_url(subreddit)
+        end
+      end
+    end
+  end
+end

data/lib/redd/client/unauthenticated/subreddits.rb

@@ -3,23 +3,16 @@ module Redd
     class Unauthenticated
       module Subreddits
         def subreddit(title)
-          meth = :get
-          path = "/r/#{title}/about.json"
-          object_from_response(meth, path)
+          object_from_response :get, "/r/#{title}/about.json"
         end
 
         def get_subreddits(where = :popular, params = {})
-          meth = :get
-          path = "/subreddits/#{where}.json"
-          object_from_response(meth, path, params)
+          object_from_response :get, "/subreddits/#{where}.json", params
         end
 
         def search_subreddits(query, params = {})
-          meth = :get
-          path = "/subreddits/search.json"
           params << {q: query}
-
-          object_from_response(meth, path, params)
+          object_from_response :get, "/subreddits/search.json", params
         end
       end
     end

data/lib/redd/client/unauthenticated/utilities.rb

@@ -1,6 +1,7 @@
 require "redd/thing"
 require "redd/object/listing"
 require "redd/object/comment"
+require "redd/object/more_comments"
 require "redd/object/private_message"
 require "redd/object/submission"
 require "redd/object/subreddit"
@@ -13,22 +14,28 @@ module Redd
         private
 
         def extract_attribute(object, attribute)
-          object.send(attribute) if object.respond_to?(attribute)
+          case object
+          when ::String
+            object
+          else
+          	object.send(attribute)
+          end
         end
 
         def extract_fullname(object)
-          object.is_a?(String) ? object : extract_attribute(object, :fullname)
+          extract_attribute(object, :fullname)
         end
 
         def extract_id(object)
-          object.is_a?(String) ? object : extract_attribute(object, :id)
+          extract_attribute(object, :id)
         end
 
-        # @todo "more"
         def object_from_kind(kind) # rubocop:disable Style/MethodLength
           case kind
           when "Listing"
             Redd::Object::Listing
+          when "more"
+            Redd::Object::MoreComments
           when "t1"
             Redd::Object::Comment
           when "t2"
@@ -63,12 +70,12 @@ module Redd
         end
 
         def comments_from_response(*args)
-          body = request(*args).body[1]
+          body = request(*args)[1]
           object_from_body(body)
         end
 
         def object_from_response(*args)
-          body = request(*args).body
+          body = request(*args)
           object_from_body(body)
         end
       end

data/lib/redd/object/more_comments.rb

@@ -0,0 +1,9 @@
+module Redd
+  module Object
+    class MoreComments < Redd::Base
+      attr_reader :count
+      attr_reader :parent_id
+      attr_reader :children
+    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.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Avinash Dwarapu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,15 +187,18 @@ files:
 - lib/redd/client/oauth2.rb
 - lib/redd/client/unauthenticated.rb
 - lib/redd/client/unauthenticated/account.rb
+- lib/redd/client/unauthenticated/captcha.rb
 - lib/redd/client/unauthenticated/links_comments.rb
 - lib/redd/client/unauthenticated/listing.rb
 - lib/redd/client/unauthenticated/live.rb
+- lib/redd/client/unauthenticated/moderation.rb
 - lib/redd/client/unauthenticated/subreddits.rb
 - lib/redd/client/unauthenticated/utilities.rb
 - lib/redd/client/unauthenticated/wiki.rb
 - lib/redd/error.rb
 - lib/redd/object/comment.rb
 - lib/redd/object/listing.rb
+- lib/redd/object/more_comments.rb
 - lib/redd/object/private_message.rb
 - lib/redd/object/submission.rb
 - lib/redd/object/subreddit.rb