redd 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6760b565561bde890fe1595ebda87ada31bae326
-  data.tar.gz: 7bccd9ea39fb2fa9d8201648d2c6164cab2791f6
+  metadata.gz: f1c9095dc0fc6208e07728e40a724e40a0c0a24d
+  data.tar.gz: 7a752d0341708cbd837e1ae23e486aaa6c29f468
 SHA512:
-  metadata.gz: 24762a4de14370f0d6cb4b9a79150c8d8db6f86a290d06edb82034e664f2b878cb48c37bf4a046fe5f03b23623bd8c6af2008ca9687154596da56bf34d522072
-  data.tar.gz: ba5116ceaa492bdefb12dcd626597fdf9989b301dcc66154240f844b38163cc944eb682290f0282bd9118785dd7919a1d87c1b343ab5071a3f4edf4e7847cc88
+  metadata.gz: 56bc149cb63a27a6bd6531f85a4ad56491dd888270cc70963d82cfd748445641e9d404bbea4cc0100dd673800d14fec1b5edcd5311e456ddf77854a271436574
+  data.tar.gz: 490cc65032031f6d0ed56b69eeef554773865b5503a47bae20ffea12bd8314b083ffbb43b537e8650a749b241e6f6b58721cb38968dc9b01c6cd3f07dbccbbd3

data/README.md

@@ -15,6 +15,7 @@
   <a href="#getting-started">Getting Started</a> |
   <a href="#oauth2">OAuth2</a> |
   <a href="#extending-redd">Extending Redd</a> |
+  <a href="#contributing">Contributing</a> |
   <a href="#supported-rubies">Supported Rubies</a> |
   <a href="#copyright">Copyright</a>
 </p>
@@ -217,8 +218,8 @@ Extending any ruby library, including redd is incredibly easy. Let's try this ou
    Redd::Object::Comment.include(Gildable)
    ```
 
-#### Contributing
-Please do. If you would like to become a contributor, do ask.
+## Contributing
+[Fork the repository](https://github.com/avidw/redd/fork), [create a pull request](https://github.com/avidw/redd/compare) and [go nuts](https://i.imgur.com/lz7hOlC.jpg).
 
 ## Supported Rubies
 This gem aims to work on the following rubies:

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

@@ -6,13 +6,12 @@ module Redd
         # @option params [String] :id The fullname of a thing.
         # @option params [String] :url The url of a thing. If an id is also
         #   provided, the id will take precedence.
-        # @return [Redd::Object::Submission, Redd::Object::Comment] The object.
+        # @return [Redd::Object::Listing] Listing of the object or objects.
         #
         # @note Reddit does accept a subreddit, but with fullnames and urls, I
         #   assumed that was unnecessary.
         def get_info(params = {})
-          object = object_from_response :get, "/api/info.json", params
-          object.first
+          object_from_response :get, "/api/info.json", params
         end
 
         # Get the comments for a submission.
@@ -36,38 +35,24 @@ module Redd
           object_from_body(replies)
         end
 
-        def replace_morecomments(morecomments, submission = nil)
+        def expand_morecomments(morecomments, submission = nil)
           parent_id = morecomments.parent_id
           link_id =
             if submission
-              submission
+              extract_fullname(submission)
             elsif parent_id.start_with?("t3_")
               parent_id
             elsif parent_id.start_with?("t1_")
               get_info(id: parent_id).first.link_id
             end
 
-          response = post "/api/morechildren",
+          response = post "/api/morechildren.json",
                           api_type: "json",
                           link_id: link_id,
                           children: morecomments.children.join(",")
           comments = response[:json][:data][:things]
 
-          # No idea how to increase the depth of the comments.
-          comments.select! { |comment| comment[:kind] == "t1" }
-
-          comments.map do |comment|
-            object_from_body(
-              kind: comment[:kind],
-              data: {
-                parent_id: comment[:data][:parent],
-                body: comment[:data][:contentText],
-                body_html: comment[:data][:contentHTML],
-                link_id: comment[:data][:link],
-                name: comment[:data][:id]
-              }
-            )
-          end
+          object_from_body(kind: "Listing", data: {children: comments})
         end
       end
     end

data/lib/redd/object/comment.rb

@@ -4,12 +4,14 @@ module Redd
   module Object
     # A comment made on links.
     class Comment < Redd::Thing
+      require "redd/thing/commentable"
       require "redd/thing/editable"
       require "redd/thing/inboxable"
       require "redd/thing/moderatable"
       require "redd/thing/reportable"
       require "redd/thing/voteable"
 
+      include Redd::Thing::Commentable
       include Redd::Thing::Editable
       include Redd::Thing::Inboxable
       include Redd::Thing::Moderatable
@@ -43,14 +45,19 @@ module Redd
 
       alias_method :reports_count, :num_reports
 
-      def replies
-        @replies ||= client.get_replies(self)
+      def comments
+        @comments ||= client.get_replies(self)
       end
+      alias_method :replies, :comments
 
       def subreddit
         @subreddit ||= client.subreddit(@attributes[:subreddit])
       end
 
+      def submission
+        @submission ||= client.get_info(id: link_id).first
+      end
+
       def created
         @created ||= Time.at(@attributes[:created_utc])
       end

data/lib/redd/object/more_comments.rb

@@ -5,6 +5,10 @@ module Redd
       attr_reader :count
       attr_reader :parent_id
       attr_reader :children
+
+      def expand(submission = nil)
+        client.expand_morecomments(self, submission)
+      end
     end
   end
 end

data/lib/redd/object/submission.rb

@@ -4,6 +4,7 @@ module Redd
   module Object
     # A submission made in a subreddit.
     class Submission < Redd::Thing
+      require "redd/thing/commentable"
       require "redd/thing/editable"
       require "redd/thing/hideable"
       require "redd/thing/moderatable"
@@ -11,6 +12,7 @@ module Redd
       require "redd/thing/saveable"
       require "redd/thing/voteable"
 
+      include Redd::Thing::Commentable
       include Redd::Thing::Editable
       include Redd::Thing::Hideable
       include Redd::Thing::Moderatable

data/lib/redd/thing.rb

@@ -21,7 +21,7 @@ module Redd
 
     # @return [String] The fullname of the thing.
     def fullname
-      @fullname ||= (attributes[:name] || "#{kind}_#{id}")
+      @fullname ||= "#{kind}_#{id}"
     end
   end
 end

data/lib/redd/thing/commentable.rb

@@ -0,0 +1,27 @@
+require "redd/thing"
+
+module Redd
+  class Thing
+    # A Redd::Object that can be commented on.
+    # This means that the comments could contain a MoreComments object.
+    module Commentable
+      def expand_morecomments
+        comments.things.map! do |comment|
+          if comment.is_a?(Redd::Object::MoreComments)
+            comment.expand.things
+          else
+            comment
+          end
+        end
+
+        comments.things.flatten!
+      end
+
+      def remove_morecomments
+        while comments.map { |c| c.class }.include? Redd::Object::MoreComments
+          expand_morecomments
+        end
+      end
+    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.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redd
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Avinash Dwarapu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -223,6 +223,7 @@ files:
 - lib/redd/response/parse_json.rb
 - lib/redd/response/raise_error.rb
 - lib/redd/thing.rb
+- lib/redd/thing/commentable.rb
 - lib/redd/thing/editable.rb
 - lib/redd/thing/hideable.rb
 - lib/redd/thing/inboxable.rb