redd 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8d7432aa8e8e95a979a1beda6cd0b029968bc47
-  data.tar.gz: a64f085356bee811050a5036567eb48bad118363
+  metadata.gz: ce5057c5421178a5b9ad6a056b2fa33a161413f8
+  data.tar.gz: 11c8973bcb1fbd2786c40e3f929229c944883da0
 SHA512:
-  metadata.gz: 52a9e1c3605c7c9b50fee521a7d792e01c2f9e878ce91ef3e8042da02620eb04dd61576930a0b6b67ecf7c526ae6f7861876c48bc2f27339dabf431af8d30a63
-  data.tar.gz: f284a123a0e135a5647d83ceda77a602f56281d24a62a1355c540ad4c196fcdec3bc33ece6c786b8153fe552aa608e76f35625c0c6f5451ef641e54934d61939
+  metadata.gz: 712701e751a6cc9e5bb552fafc451c22c3cfefd275da19305620e57b306f5645ae087484217f3049256424d3d40c55d786dbeef4f123c358845d24c94b7cec84
+  data.tar.gz: ac462c530eda68e27718333a386625f6b0921a99a0676a49655721b23d6ccddadf75b433a8d329d0e05f19217565d5029f607af6703b580d374323f1b1764d0d

data/lib/redd/auth_strategies/auth_strategy.rb

@@ -54,6 +54,7 @@ module Redd
 
       def request_access(grant_type, options = {})
         response = post('/api/v1/access_token', { grant_type: grant_type }.merge(options))
+        raise AuthenticationError.new(response) if response.body.key?(:error)
         Models::Access.new(self, response.body)
       end
     end

data/lib/redd/error.rb

@@ -22,6 +22,11 @@ module Redd
     end
   end
 
+  # An error returned by AuthStrategy.
+  # @note A common cause of this error is not having a bot account registered as a developer on
+  #   the app.
+  class AuthenticationError < ResponseError; end
+
   # An error with Redd, probably (let me know!)
   class BadRequest < ResponseError; end
 

data/lib/redd/models/comment.rb

@@ -33,10 +33,10 @@ module Redd
 
       def after_initialize
         @attributes[:replies] =
-          if @attributes[:replies] == ''
-            nil
-          else
+          if @attributes[:replies].is_a?(Hash)
             @client.unmarshal(@attributes[:replies])
+          else
+            Models::Listing.new(@client, children: [], after: nil, before: nil)
           end
         @attributes[:author] = User.from_id(@client, @attributes.fetch(:author))
         @attributes[:subreddit] = Subreddit.from_id(@client, @attributes.fetch(:subreddit))

data/lib/redd/models/more_comments.rb

@@ -10,13 +10,11 @@ module Redd
       # @param link [Submission] the submission the object belongs to
       # @param sort [String] the sort order of the submission
       # @return [Listing<Comment, MoreComments>] the expanded children
-      def expand(link:, sort: 'best')
-        @client.model(
-          :get, '/api/morechildren',
-          link_id: link.name,
-          children: get_attribute(:children).join(','),
-          sort: sort
-        )
+      def expand(link:, sort: nil)
+        params = { link_id: link.name, children: get_attribute(:children).join(',') }
+        params[:sort] = sort if sort
+        params[:sort] = link.sort_order if link.sort_order
+        @client.model(:get, '/api/morechildren', params)
       end
 
       # Keep expanding until all top-level MoreComments are converted to comments.
@@ -25,7 +23,7 @@ module Redd
       # @param lookup [Hash] a hash of comments to add future replies to
       # @param depth [Number] the maximum recursion depth
       # @return [Array<Comment, MoreComments>] the expanded comments or self if past depth
-      def recursive_expand(link:, sort: 'best', lookup: {}, depth: 10)
+      def recursive_expand(link:, sort: nil, lookup: {}, depth: 10)
         return [self] if depth == 0
 
         expand(link: link, sort: sort).flat_map do |thing|

data/lib/redd/models/submission.rb

@@ -26,6 +26,19 @@ module Redd
         new(client, name: id)
       end
 
+      # @return [Symbol] the requested sort order
+      def sort_order
+        @sort_order ||= nil
+      end
+
+      # Set the sort order of the comments and reload if necessary.
+      # @param order [:confidence, :top, :controversial, :old, :qa] the sort order
+      def sort_order=(order)
+        @sort_order = order
+        reload if @definitely_fully_loaded
+        order
+      end
+
       # Get all submissions for the same url.
       # @param params [Hash] A list of optional params to send with the request.
       # @option params [String] :after return results after the given fullname
@@ -97,10 +110,14 @@ module Redd
       def default_loader
         # Ensure we have the link's id.
         id = @attributes[:id] ? @attributes[:id] : @attributes.fetch(:name).sub('t3_', '')
-        response = @client.get("/comments/#{id}").body
+        # If a specific sort order was requested, provide it.
+        params = {}
+        params[:sort] = @sort_order if @sort_order
+
         # `response` is a pair (2-element array):
         #   - response[0] is a one-item listing containing the submission
         #   - response[1] is listing of comments
+        response = @client.get("/comments/#{id}", params).body
         response[0][:data][:children][0][:data].merge(comments: @client.unmarshal(response[1]))
       end
 

data/lib/redd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Redd
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redd
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Avinash Dwarapu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http