reddit_api 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95496fe9b310bbefc4284972a1b0640eb3483ee4
-  data.tar.gz: 273ec25b43b9750515e8c196541e4c4f159b0293
+  metadata.gz: ecb8bef6c6fda639741f35cab9bcbf3905e36a3e
+  data.tar.gz: cd5383ebe99e47b2da9e60dff4e11abdf7aa2a82
 SHA512:
-  metadata.gz: 130b83adc2be324210b121a77303e8f0e8d108f55af5540f3d5120467af4f01fdf1cb8333ecd7e7bab7a671feca5862e4284199a17bd2a7e90d001fe605243fd
-  data.tar.gz: 6d4128d86d1a19b83b733e7ef4faf83beef9fb88de866d3de1e6870a6123524057438cd2ed2fee084813f742477af41adde6553f91d3cefceca752840e6feb20
+  metadata.gz: b1c8a44241094bc9bd01cb42a4f3b436218f6d8c2533021443e3494f0390925e04e79d7e474b5d6a1e6a404e83b8d885f5db3597b8d563f8bce15ab4965c8398
+  data.tar.gz: dee4025ee3b6d84ee86e1032a9e2274edf9fbb83e7f44ae8a6f8fe8e4c67b2dcff6e8de872f9c9346c120d379d0b9af043b2dde8c690823108b88d5a206a6428

data/lib/reddit_api/client.rb

@@ -12,9 +12,9 @@ module RedditApi
     end
 
     SLEEP_TIME = self.sleep_time
-    MAX_FAILURES = 5
+    DEFAULT_MAX_FAILURES = 2
 
-    attr_reader :failures
+    attr_reader :failures, :max_failures
 
     def initialize(args = {})
       @client = args.fetch(:client, HTTParty)
@@ -22,10 +22,11 @@ module RedditApi
       @parser = args.fetch(:parser, RedditApi::ResponseParser)
       @null_response_factory = RedditApi:: NullResponse
       @failures = args.fetch(:failures, 0)
+      @max_failures = args.fetch(:max_fail, DEFAULT_MAX_FAILURES)
     end
 
     def get(query)
-      while query.capture_count < query.count && failures < MAX_FAILURES
+      while query.capture_count < query.count && failures < max_failures
         response = send_request(query)
         response = parser.parse_response(response, query.count)
         update_progress(query, response)

data/lib/reddit_api/comments.rb

@@ -2,28 +2,28 @@
 module RedditApi
   class Comments
 
-    MAX_FAILURES = 5
+    DEFAULT_MAX_MISSES = 2
+
+    attr_reader :misses
 
     def initialize(args = {})
       @client = args.fetch(:client, RedditApi::Client.new)
       @comment_factory = RedditApi::Comment
       @query_factory =  RedditApi::Query
       @offset = nil
-      @failures = 0
+      @max_misses = args.fetch(:max_miss, DEFAULT_MAX_MISSES)
+      @misses = args.fetch(:misses, 0)
+      @last_count = 0
     end
 
     def most_recent_subreddits(user, count)
-      self.failures = 0
       subreddits = {}
-      loops = 0
-      while subreddits.length < count &&
-          failures < MAX_FAILURES &&
-          loops < MAX_FAILURES
+      while subreddits.length < count && misses < max_misses
         comments = most_recent_comments(user, 100, offset)
-        update_progress(comments)
         collect_subreddits(comments, count, subreddits)
-        loops += 1
+        update_progress(comments, subreddits.length)
       end
+      reset_misses
       subreddits.keys
     end
 
@@ -33,10 +33,11 @@ module RedditApi
     end
 
     protected
-    attr_accessor :failures
-    attr_writer :offset, :failures
+    attr_writer :offset, :misses
+    attr_accessor  :last_count
     private
-    attr_reader :client, :comment_factory, :offset, :query_factory
+    attr_reader :client, :comment_factory, :offset, :query_factory,
+                :max_misses
 
     def most_recent_comment_data(username, count, offset)
       return [] if username == "[deleted]"
@@ -53,14 +54,19 @@ module RedditApi
                         offset: offset)
     end
 
-    def update_progress(comments)
-      if comments.empty?
-        self.failures += 1
+    def update_progress(comments, new_count)
+      if comments.empty? || last_count >= new_count
+        self.misses += 1
       else
         self.offset = comments.last.reddit_id
+        self.last_count += new_count
       end
     end
 
+    def reset_misses
+      self.misses = 0
+    end
+
     def build_all_comments(comments_data)
       comments_data.map! do |comment_data|
         build_comment(comment_data)
@@ -80,3 +86,4 @@ module RedditApi
 
   end
 end
+

data/lib/reddit_api/users.rb

@@ -2,31 +2,33 @@
 module RedditApi
   class Users
 
+    DEFAULT_MAX_MISSES = 2
+
     attr_reader :misses
 
     def initialize(args = {})
       @post_api = RedditApi::Posts.new
       @user_factory = RedditApi::User
       @misses = args.fetch(:misses, 0)
+      @max_misses = args.fetch(:max_miss, DEFAULT_MAX_MISSES)
       @last_count = 0
     end
 
-    MAX_MISSES = 5
-
     def top_posters(subreddit, count)
       users = {}
-      while users.length < count && misses < MAX_MISSES
+      while users.length < count && misses < max_misses
         posts = post_api.top(subreddit, count)
         collect_users(posts, count, users)
         update_misses(users.length)
       end
+      reset_misses
       users.values
     end
 
     protected
     attr_writer :misses, :last_count
     private
-    attr_reader :post_api, :user_factory, :last_count
+    attr_reader :post_api, :user_factory, :last_count, :max_misses
 
     def collect_users(posts, count, users)
       usernames = get_usernames(posts, count, users)
@@ -66,13 +68,16 @@ module RedditApi
       end
     end
 
-    def update_misses(length)
-      if (length - last_count).zero?
+    def update_misses(new_count)
+      if (new_count - last_count).zero?
         self.misses += 1
-        self.last_count = length
       end
     end
 
+    def reset_misses
+      self.misses = 0
+    end
+
   end
 end
 

data/lib/reddit_api/version.rb

@@ -1,3 +1,3 @@
 module RedditApi
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reddit_api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Anthony Fuentes