usaidwat 0.1.2 → 0.1.3

data/features/fixtures/blank.json

@@ -0,0 +1 @@
+{"kind": "Listing", "data": {"modhash": "", "children": [], "after": null, "before": null}}

data/features/server/reddit.rb

@@ -2,8 +2,10 @@ require 'sinatra/base'
 
 class Reddit < Sinatra::Base
   get '/user/*/comments.json' do
+    user = params[:splat].first
+    puts user
     root = File.expand_path('../../', __FILE__)
-    json = File.read(File.join(root, 'fixtures', 'comments.json'))
+    json = File.read(File.join(root, 'fixtures', "#{user}.json"))
     content_type :json
     json
   end

data/lib/usaidwat/application.rb

@@ -24,7 +24,13 @@ module USaidWat
       exit 0
     end
     
+    def quit(message, code=0)
+      puts message
+      exit code
+    end
+    
     def list_all_comments
+      quit "#{@redditor.username} has no comments." if @redditor.comments.empty?
       formatter = USaidWat::CLI::CommentFormatter.new
       @redditor.comments.each { |c| print formatter.format(c) }
     end
@@ -32,16 +38,13 @@ module USaidWat
     def list_comments_for_subreddit(subreddit)
       comments = @redditor.comments
       comments = comments.reject { |c| c.subreddit != subreddit }
-      if comments.length == 0
-        puts "No comments by #{@redditor.username} for #{subreddit}."
-        exit 0
-      else
-        formatter = USaidWat::CLI::CommentFormatter.new
-        comments.each { |c| print formatter.format(c) }
-      end
+      quit "No comments by #{@redditor.username} for #{subreddit}." if comments.empty?
+      formatter = USaidWat::CLI::CommentFormatter.new
+      comments.each { |c| print formatter.format(c) }
     end
     
     def tally_comments
+      quit "#{@redditor.username} has no comments." if @redditor.comments.empty?
       # Unfortunately Snooby cannot return comments for a specific
       # user in a specific subreddit, so for now we have to sort them
       # ourself.

data/lib/usaidwat/client.rb

@@ -19,6 +19,10 @@ module USaidWat
         raise ReachabilityError, "Reddit unreachable"
       end
       
+      def to_s
+        "#{username}"
+      end
+      
       private
         def enable_test_urls
           Snooby::Paths.each { |k,v| Snooby::Paths[k] = v.sub(%r{http://www.reddit.com}, "http://localhost:4567") }

data/lib/usaidwat/formatter.rb

@@ -16,7 +16,7 @@ module USaidWat
         out.write("#{comment.subreddit}\n".color(:green))
         out.write("#{comment_link(comment)}\n".color(:yellow))
         out.write("\n")
-        out.write("#{comment.body}\n")
+        out.write("#{comment.body.strip}\n")
         @count += 1
         out.rewind
         out.read

data/lib/usaidwat/version.rb

@@ -1,3 +1,3 @@
 module USaidWat
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/usaidwat/client_spec.rb

@@ -11,13 +11,19 @@ module USaidWat
         end
       end
       
+      describe "#to_s" do
+        it "returns a string representing the Redditor" do
+          "#{redditor}".should == "mipadi"
+        end
+      end
+      
       context "when Reddit is up" do
         before(:each) do
           WebMock.disable_net_connect!
           WebMock.reset!
           root = File.expand_path("../../../features/fixtures", __FILE__)
           stub_request(:get, "http://www.reddit.com/user/mipadi/comments.json?after=&limit=100").
-            to_return(:body => IO.read(File.join(root, "comments.json")))
+            to_return(:body => IO.read(File.join(root, "mipadi.json")))
         end
       
         describe "#comments" do

data/spec/usaidwat/formatter_spec.rb

@@ -40,6 +40,17 @@ EXPECTED
           lines[1].should == ''
           lines[2].should_not == ""
         end
+        
+        it "should strip leading and trailing whitespace from comments" do
+          comment = double(comment)
+          comment.should_receive(:subreddit).twice.and_return("test")
+          comment.should_receive(:link_id).and_return("t3_13f783")
+          comment.should_receive(:id).and_return("c73qhxi")
+          comment.should_receive(:body).and_return("This is a comment.\n\nIt has two lines.\n\n\n")
+          s = formatter.format(comment)
+          lines = s.split("\n")
+          lines[-1].should == "It has two lines."
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snooby
@@ -138,7 +138,8 @@ files:
 - Rakefile
 - bin/usaidwat
 - features/browse.feature
-- features/fixtures/comments.json
+- features/fixtures/blank.json
+- features/fixtures/mipadi.json
 - features/help.feature
 - features/server/reddit.rb
 - features/step_definitions/reddit_steps.rb
@@ -172,13 +173,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Answers the age-old question, "Where does a Redditor comment the most?"
 test_files:
 - features/browse.feature
-- features/fixtures/comments.json
+- features/fixtures/blank.json
+- features/fixtures/mipadi.json
 - features/help.feature
 - features/server/reddit.rb
 - features/step_definitions/reddit_steps.rb