reddit_api 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 695f6cabfc01e4d67dd792e8a4310420c384d4cf
-  data.tar.gz: 75f4d2b68c25333749a7693b79513a2cbe2b5bbc
+  metadata.gz: 004a4afe844fc852c876d856654312a3351a1412
+  data.tar.gz: 1343c16d1c128aab75c6415b1352de8fe9073d8e
 SHA512:
-  metadata.gz: a41131435f118405286bad1fc923c0b180dc017716734d3e61664887d9428a0c40195f24cd41a28978b27c50f1a0bae5b49101863f10299d0395e05b4b061604
-  data.tar.gz: 0d394fa9542b1bd14f5921391915c91fa53f73b51d2ae762ea5ea1ba3c74cdea3e607e12cc48e97f60c5514f5be0e10863ad6425f274344c9e6d44aca7329a05
+  metadata.gz: a64b90257ca848a0fdf03171cb0d798bb6d6600a64d079c0550b2a455f1c713c966440c1ca0ad29e3345fee7e5466896190117008e97ab4770b47ec0ca38b98f
+  data.tar.gz: 6efb3c4f163a9fcd554de328df64274ad8c95d989ddb6b3f9a6c218724ca51f5a261acd9683e338a5282cac39e89e2cea2b4b27cc14388b1296faf63be8112ef

data/lib/reddit_api/client.rb

@@ -25,9 +25,9 @@ module RedditApi
       @last_record = nil
     end
 
-    def get(endpoint, count, resource_type)
+    def get(endpoint, count, resource_type, offset = nil)
       if count > 1
-        get_many(endpoint, count, resource_type)
+        get_many(endpoint, count, resource_type, offset)
       else
         get_one(endpoint, count, resource_type)
       end
@@ -39,20 +39,20 @@ module RedditApi
     attr_reader :client, :base_url, :null_response_factory, :last_record,
                 :requestor
 
-    def get_many(endpoint, count, resource_type)
+    def get_many(endpoint, count, resource_type, offset)
       sleep(SLEEP_TIME)
       records = {}
-      loop do
-        new_records = request_records(endpoint, resource_type, count)
+      self.last_record = offset
+      while !break_get?(records, count)
+        new_records = request_records(endpoint, count, resource_type)
         collect_records(new_records, records, count)
-        break if break_get?(records, count)
       end
       self.last_record = nil
       records.keys
     end
 
     def get_one(endpoint, count, resource_type)
-      request_records(endpoint, resource_type, count)
+      request_records(endpoint, count, resource_type)
     end
 
     def collect_records(new_records, collected_records, count)
@@ -62,7 +62,7 @@ module RedditApi
       end
     end
 
-    def request_records(endpoint, resource_type, count)
+    def request_records(endpoint, count, resource_type)
       response = send_request(endpoint, resource_type)
       parse_response(response, count)
     end

data/lib/reddit_api/comments.rb

@@ -2,32 +2,36 @@
 module RedditApi
   class Comments
 
-    def initialize
-      @client = RedditApi::Client.new
+    def initialize(args = {})
+      @client = args.fetch(:client, RedditApi::Client.new)
       @comment_factory = RedditApi::Comment
+      @offset = nil
     end
 
     def most_recent_subreddits(user, count)
       subreddits = {}
       while subreddits.length < count
-        comments = most_recent_comments(user)
+        comments = most_recent_comments(user, 100, offset)
+        self.offset = comments.last.reddit_id
         collect_subreddits(comments, count, subreddits)
       end
       subreddits.keys
     end
 
-    def most_recent_comments(user, count = 100)
-      comments_data = most_recent_comment_data(user.username, count)
+    def most_recent_comments(user, count = 100, offset = nil)
+      comments_data = most_recent_comment_data(user.username, count, offset)
       build_all_comments(comments_data)
     end
 
+    protected
+    attr_writer :offset
     private
-    attr_reader :client, :comment_factory
+    attr_reader :client, :comment_factory, :offset
 
-    def most_recent_comment_data(username, count)
+    def most_recent_comment_data(username, count, offset)
       return [] if username == "[deleted]"
       endpoint = "user/#{username}/comments.json"
-      client.get(endpoint, count, :comment)
+      client.get(endpoint, count, :comment, offset)
     end
 
     def build_all_comments(comments_data)

data/lib/reddit_api/requestor.rb

@@ -49,10 +49,18 @@ module RedditApi
 
     def build_after(resource_type, record)
       prefix = TYPE_PREFIXES[resource_type]
-      last_resource_id = record["data"]["id"]
+      last_resource_id = record_id(record)
       "#{prefix}_#{last_resource_id}"
     end
 
+    def record_id(record)
+      if record.is_a?(Hash)
+        record["data"]["id"]
+      else
+        record
+      end
+    end
+
     def generate_access_token
       url = "https://www.reddit.com/api/v1/access_token"
       basic_auth = { username: id,

data/lib/reddit_api/version.rb

@@ -1,3 +1,3 @@
 module RedditApi
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

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