ruby_reddit_api 0.2.0 → 0.2.1

data/README

@@ -1,4 +1,4 @@
-Ruby Reddit Client v0.2.0
+Ruby Reddit Client v0.2.1
 ==================
 Tested with ruby 1.9.2
 

data/features/step_definitions/submission_steps.rb

@@ -53,11 +53,6 @@ Then /^I should be able to downvote it$/ do
   @submission.downvote.should be true
 end
 
-Then /^I should be able to see the comments$/ do
-  comments = @submission.comments
-  comments.size.should > 0
-end
-
 Then /^I should not be able to save the submission$/ do
   @submission.save.should be false
 end
@@ -115,3 +110,8 @@ end
 Then /^I should be able to indistinguish the submission$/ do
   @submission.indistinguish
 end
+
+Then /^I should be able to see the comments$/ do
+  comments = @submission.comments
+  comments.size.should > 0
+end

data/features/step_definitions/user_steps.rb

@@ -1,6 +1,8 @@
 Before do
   load_server_config
+  Reddit::Base.base_uri @address
   Reddit::Api.base_uri @address
+  Reddit::Thing.base_uri @address
   Reddit::Submission.base_uri @address
   Reddit::Comment.base_uri @address
   Reddit::User.base_uri @address

data/lib/ruby_reddit_api.rb

@@ -5,13 +5,14 @@ end
 
 require "httparty"
 require "json"
-require "reddit/version"
-require "reddit/base"
-require "reddit/json_listing"
-require "reddit/api"
-require "reddit/user"
-require "reddit/vote"
-require "reddit/submission"
-require "reddit/comment"
-require "reddit/message"
+require "ruby_reddit_api/version"
+require "ruby_reddit_api/json_listing"
+require "ruby_reddit_api/base"
+require "ruby_reddit_api/thing"
+require "ruby_reddit_api/api"
+require "ruby_reddit_api/user"
+require "ruby_reddit_api/vote"
+require "ruby_reddit_api/submission"
+require "ruby_reddit_api/comment"
+require "ruby_reddit_api/message"
 

data/lib/ruby_reddit_api/base.rb

@@ -103,7 +103,7 @@ module Reddit
 
     def capture_user_id
       return true if user_id
-      this_user = read("/user/#{user}/about.json", :handler => "User")
+      this_user = read("/user/#{user}/about.json", :handler => "User")[0]
       Reddit::Base.instance_variable_set("@user_id", this_user.id)
     end
 

data/lib/ruby_reddit_api/comment.rb

@@ -3,7 +3,7 @@ module Reddit
   class Comment < Thing
 
     include JsonListing
-    attr_reader :body, :subreddit_id, :name, :created, :downs, :author, :created_utc, :body_html, :link_id, :parent_id, :likes, :replies, :subreddit, :ups, :debug, :kind
+    attr_reader :body, :subreddit_id, :name, :created, :downs, :author, :created_utc, :body_html, :link_id, :parent_id, :likes, :num_comments, :subreddit, :ups, :debug, :kind
     def initialize(json)
       parse(json)
       @debug = StringIO.new
@@ -18,6 +18,17 @@ module Reddit
       body
     end
 
+    # Fetch comments
+    # @return [Array<Reddit::Comment>]
+    def comments
+      opts = {:handler => "Comment",
+              :verb => "post",
+              :body =>
+                {:link_id => id, :depth => 10, :r => subreddit, :uh => modhash, :renderstyle => "json", :pv_hex => "", :id => id}
+              }
+      return read("/api/morechildren", opts )
+    end
+
     # Modify a comment
     # @return [true,false]
     def edit(newtext)

data/lib/ruby_reddit_api/json_listing.rb

@@ -20,7 +20,7 @@ module Reddit
           data     = json["data"]
           Reddit::Base.instance_variable_set("@modhash", data["modhash"]) # Needed for api calls
 
-          children = data["children"]
+          children = data["children"] || [{"data" => data, "kind" => json["kind"] }]
           children.each do |message|
             kind     = message["kind"]
             message["data"]["kind"] = kind

data/lib/ruby_reddit_api/submission.rb

@@ -55,21 +55,10 @@ module Reddit
     # Fetch submission comments
     # @todo Move to 'Thing' class
     # @return [Array<Reddit::Comment>]
-    def comments(more=false)
-      #TODO Get morechildren to work correctly
-      if more && last_comment_id
-        opts = {:handler => "Comment",
-                :verb => "post",
-                :body =>
-                  {:link_id => last_comment_id, :depth => 0, :r => subreddit, :uh => modhash, :renderstyle => "json", :pv_hex => "", :id => id}
-                }
-        return read("/api/morechildren", opts )
-
-      else
-        _comments = read( permalink + ".json", {:handler => "Comment", :query => {:limit => 50}} )
-        @last_comment_id = _comments.last.id if _comments && _comments.any?
-        return _comments
-      end
+    def comments
+      _comments = read( permalink + ".json", {:handler => "Comment", :query => {:limit => 250}} )
+      @last_comment_id = _comments.last.id if _comments && _comments.any?
+      return _comments
     end
 
     protected

data/lib/ruby_reddit_api/thing.rb

@@ -17,7 +17,7 @@ module Reddit
     # The author of the entity. The data is lazy-loaded and cached on the object
     # @return [Reddit::User]
     def author
-      @author_data ||= read("/user/#{@author}/about.json", :handler => "User")
+      @author_data ||= read("/user/#{@author}/about.json", :handler => "User")[0]
     end
 
     # Upvote thing

data/lib/ruby_reddit_api/user.rb

@@ -1,7 +1,7 @@
 module Reddit
   # @author James Cook
   class User < Api
-    include JSONListing
+    include JsonListing
     attr_reader :name, :debug, :created, :created_utc, :link_karma, :comment_karma, :is_mod, :has_mod_mail, :kind
     def initialize(json)
       @debug = StringIO.new

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - James Cook