usaidwat 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f557c3aa3e4261f4f2c28783728e17c5043fdca
-  data.tar.gz: 9fa6307833d5f28c44425e9cd2469b46a67229d4
+  metadata.gz: 40cfe670a21fe2f65549c77c5ac84f06e1114b2b
+  data.tar.gz: ffe351f3831ca31ad960b148c630ca442c1b9ea7
 SHA512:
-  metadata.gz: bcda2502165ff5d8c73dbfa11ae4c593856c874514b88ae36c6c651bd568a8e1afcaabc746f7e74639f060a7b3f66bb840484a7544f71ae57a021dac8d4f4126
-  data.tar.gz: 4d2f7b4c5e44fd2025de35c64c6d68dd3fe40b8a22fe23a9a15bcb234442a1f672424630594dc15173997e417b243b80796b3461eea97c0caceb0134644fff2c
+  metadata.gz: 68be66ec279c06be4c8c56a009eb2ae4bc1b3f8aa2e0c12d84f83d5e81198f7468bc350f403dd3eedfca119c98255ec6e4637df68b7d3b9495822231c95a72cb
+  data.tar.gz: b5636dd3f2d95e734c3684054fa0919e750696d366a792be832778c0a42833e920c96a3512b4fb97fbfa070491c6b9f346055282b2b3a9d092ef1e476806cce7

data/.gitignore

@@ -1,4 +1,5 @@
 .bundle/
 Gemfile.lock
 pkg/
+tmp/
 *.gem

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Michael Dippery
+Copyright (c) 2012-2015 Michael Dippery
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -54,7 +54,4 @@ All the comments for the given subreddit will be printed.
 
 h2(#testing). Testing
 
-Test suites can be run with RSpec and Cucumber. Note that there is one tiny wrinkle: a testing server that mimics the Reddit web service must be run before running Cucumber tests:
-
-bc. $ ruby features/server/reddit.rb
-$ cucumber
+Test suites can be run with RSpec and Cucumber.

data/Rakefile

@@ -5,10 +5,3 @@ task :clean do
   rm_rf "pkg", :verbose => true
   rm Dir.glob("*.gem"), :verbose => true
 end
-
-namespace :test do
-  desc "Run the fake web service"
-  task :server do
-    system "bundle exec ruby features/server/reddit.rb"
-  end
-end

data/features/browse.feature

@@ -26,6 +26,14 @@ Feature: Browse comments
 
       The Judgment of Solomon Accords.
       """
+
+  Scenario: List all comments for a user that does not exist
+    Given the Reddit service does not have a user "palorchild"
+    When I run `usaidwat palorchild`
+    Then it should fail with:
+      """
+      No such user: palorchild
+      """
   
   Scenario: List all comments when user has no comments
     Given the Reddit service returns comments for the user "blank"
@@ -86,6 +94,29 @@ Feature: Browse comments
       You didn't slow down for very long though, did you?
       """
   
+  Scenario: List comments for a particular subreddit specified with the wrong case
+    Given the Reddit service returns comments for the user "mipadi"
+    When I run `usaidwat mipadi askreddit | head -n 16`
+    Then it should pass with:
+      """
+      AskReddit
+      http://www.reddit.com/r/AskReddit/comments/141kt9/z/c795rwz
+
+      I think it depends on where you go and what you study, but yes, I think they do teach you to think critically, especially in humanities courses and seminars. Maybe it's just because I went to a small, private liberal arts college rather than a huge school, but critical thinking was definitely a part of my education.
+
+
+      AskReddit
+      http://www.reddit.com/r/AskReddit/comments/140t5c/z/c795nw3
+
+      You're from New Jersey? Which exit?
+
+
+      AskReddit
+      http://www.reddit.com/r/AskReddit/comments/140h3z/z/c795muo
+
+      You didn't slow down for very long though, did you?
+      """
+
   Scenario: List comments for a subreddit with no comments
     Given the Reddit service returns comments for the user "mipadi"
     When I run `usaidwat mipadi nsfw`

data/features/fixtures/palorchild.json

@@ -0,0 +1 @@
+{"error": 404}

data/features/step_definitions/reddit_steps.rb

@@ -1,3 +1,7 @@
 Given /^the Reddit service returns comments for the user "(.*?)"$/ do |user|
   set_env 'USAIDWAT_ENV', 'cucumber'
 end
+
+Given /^the Reddit service does not have a user "(.*?)"$/ do |user|
+  set_env 'USAIDWAT_ENV', 'cucumber'
+end

data/lib/usaidwat/application.rb

@@ -14,10 +14,15 @@ module USaidWat
     def run(argv)
       trap("INT") { puts; exit 0 }
       opts, args = handle_arguments(argv)
-      @redditor = @client.new(args.first)
-      return tally_comments if opts[:tally]
-      return list_comments_for_subreddit(args[1]) if args.length == 2
-      return list_all_comments
+      username = args.first
+      @redditor = @client.new(username)
+      begin
+        return tally_comments if opts[:tally]
+        return list_comments_for_subreddit(args[1]) if args.length == 2
+        return list_all_comments
+      rescue USaidWat::Client::NoSuchUserError
+        quit "No such user: #{username}", 3
+      end
     end
 
     def usage(code=0)
@@ -43,8 +48,9 @@ module USaidWat
 
     def list_comments_for_subreddit(subreddit)
       comments = @redditor.comments
-      comments = comments.reject { |c| c.subreddit != subreddit }
-      quit "No comments by #{@redditor.username} for #{subreddit}." if comments.empty?
+      comments = comments.group_by { |c| c.subreddit.downcase }
+      comments = comments[subreddit.downcase]
+      quit "No comments by #{@redditor.username} for #{subreddit}." if comments.nil?
       formatter = USaidWat::CLI::CommentFormatter.new
       comments.each { |c| print formatter.format(c) }
     end

data/lib/usaidwat/client.rb

@@ -5,6 +5,8 @@ module USaidWat
   module Client
     class ReachabilityError < RuntimeError; end
 
+    class NoSuchUserError < StandardError; end
+
     class BaseRedditor
       attr_reader :username
 
@@ -14,6 +16,8 @@ module USaidWat
 
       def comments
         @service.user(username).comments(100)
+      rescue NoMethodError
+        raise NoSuchUserError, username
       rescue TypeError
         raise ReachabilityError, "Reddit unreachable"
       end

data/lib/usaidwat/ext/string.rb

@@ -0,0 +1,5 @@
+class String
+  def convert_entities
+    self.gsub(/&gt;/, '>').gsub(/&lt;/, '<')
+  end
+end

data/lib/usaidwat/formatter.rb

@@ -1,7 +1,8 @@
 require 'stringio'
-require 'rainbow'
+require 'rainbow/ext/string'
+require 'usaidwat/ext/string'
 
-Sickill::Rainbow.enabled = true unless ENV['USAIDWAT_ENV'] == 'cucumber'
+Rainbow.enabled = true unless ENV['USAIDWAT_ENV'] == 'cucumber'
 
 module USaidWat
   module CLI
@@ -16,7 +17,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.strip}\n")
+        out.write("#{comment.body.strip.convert_entities}\n")
         @count += 1
         out.rewind
         out.read

data/lib/usaidwat/service.rb

@@ -19,9 +19,13 @@ module USaidWat
 
       def comments(n)
         path = File.join(File.dirname(__FILE__), "..", "..", "features", "fixtures", "#{@username}.json")
-        json = IO.read(path)
-        json = JSON.parse(json)
-        json['data']['children'].map { |d| MockComment.new(d) }
+        if File.exists?(path)
+          json = IO.read(path)
+          json = JSON.parse(json)
+          json['data']['children'].map { |d| MockComment.new(d) }
+        else
+          raise USaidWat::Client::NoSuchUserError, @username
+        end
       end
     end
 

data/lib/usaidwat/version.rb

@@ -1,3 +1,3 @@
 module USaidWat
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/usaidwat/client_spec.rb

@@ -7,13 +7,13 @@ module USaidWat
       
       describe "#username" do
         it "returns the Redditor's username" do
-          redditor.username.should == "mipadi"
+          expect(redditor.username).to eq("mipadi")
         end
       end
       
       describe "#to_s" do
         it "returns a string representing the Redditor" do
-          "#{redditor}".should == "mipadi"
+          expect("#{redditor}").to eq("mipadi")
         end
       end
       
@@ -28,7 +28,23 @@ module USaidWat
       
         describe "#comments" do
           it "retrieves 100 comments" do
-            redditor.comments.count.should == 100
+            expect(redditor.comments.count).to eq(100)
+          end
+        end
+      end
+
+      context "when a Reddit user does not exist" 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/palorchild/comments.json?after=&limit=100").
+            to_return(:status => 404, :body => IO.read(File.join(root, "palorchild.json")))
+        end
+
+        describe "#comments" do
+          it "raises an exception if the user does not exist" do
+            expect { Redditor.new("palorchild").comments }.to raise_error(NoSuchUserError, /palorchild/)
           end
         end
       end

data/spec/usaidwat/formatter_spec.rb

@@ -8,10 +8,10 @@ module USaidWat
       describe "#format" do
         it "should return a string containing the formatted comment" do
           comment = double("comment")
-          comment.should_receive(:subreddit).twice.and_return("programming")
-          comment.should_receive(:link_id).and_return("t3_13f783")
-          comment.should_receive(:id).and_return("c73qhxi")
-          comment.should_receive(:body).and_return("Welcome to the wonderful world of Python drama!")
+          expect(comment).to receive(:subreddit).twice.and_return("programming")
+          expect(comment).to receive(:link_id).and_return("t3_13f783")
+          expect(comment).to receive(:id).and_return("c73qhxi")
+          expect(comment).to receive(:body).and_return("Welcome to the wonderful world of Python drama!")
           expected = <<-EXPECTED
 programming
 http://www.reddit.com/r/programming/comments/13f783/z/c73qhxi
@@ -19,37 +19,37 @@ http://www.reddit.com/r/programming/comments/13f783/z/c73qhxi
 Welcome to the wonderful world of Python drama!
 EXPECTED
           actual = formatter.format(comment).delete_ansi_color_codes
-          actual.should == expected
+          expect(actual).to eq(expected)
         end
         
         it "should print two spaces between comments" do
           comment1 = double("first comment")
-          comment1.should_receive(:subreddit).twice.and_return("programming")
-          comment1.should_receive(:link_id).and_return("t3_13f783")
-          comment1.should_receive(:id).and_return("c73qhxi")
-          comment1.should_receive(:body).and_return("Welcome to the wonderful world of Python drama!")
+          expect(comment1).to receive(:subreddit).twice.and_return("programming")
+          expect(comment1).to receive(:link_id).and_return("t3_13f783")
+          expect(comment1).to receive(:id).and_return("c73qhxi")
+          expect(comment1).to receive(:body).and_return("Welcome to the wonderful world of Python drama!")
           comment2 = double("second comment")
-          comment2.should_receive(:subreddit).twice.and_return("programming")
-          comment2.should_receive(:link_id).and_return("t3_13f783")
-          comment2.should_receive(:id).and_return("c73qhxi")
-          comment2.should_receive(:body).and_return("Welcome to the wonderful world of Python drama!")
+          expect(comment2).to receive(:subreddit).twice.and_return("programming")
+          expect(comment2).to receive(:link_id).and_return("t3_13f783")
+          expect(comment2).to receive(:id).and_return("c73qhxi")
+          expect(comment2).to receive(:body).and_return("Welcome to the wonderful world of Python drama!")
           s = formatter.format(comment1)
           s = formatter.format(comment2)
           lines = s.split("\n")
-          lines[0].should == ''
-          lines[1].should == ''
-          lines[2].should_not == ""
+          expect(lines[0]).to eq('')
+          expect(lines[1]).to eq('')
+          expect(lines[2]).not_to eq('')
         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")
+          expect(comment).to receive(:subreddit).twice.and_return("test")
+          expect(comment).to receive(:link_id).and_return("t3_13f783")
+          expect(comment).to receive(:id).and_return("c73qhxi")
+          expect(comment).to 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."
+          expect(lines[-1]).to eq("It has two lines.")
         end
       end
     end

data/spec/usaidwat/service_spec.rb

@@ -7,7 +7,7 @@ module USaidWat
 
       describe "#user" do
         it "returns a mock user" do
-          service.user("mipadi").should respond_to(:comments)
+          expect(service.user("mipadi")).to respond_to(:comments)
         end
       end
     end
@@ -17,11 +17,11 @@ module USaidWat
 
       describe "#comments" do
         it "should return an array of comments" do
-          user.comments(100).should respond_to(:count)
-          user.comments(100).should respond_to(:reject)
-          user.comments(100).should respond_to(:empty?)
-          user.comments(100).should respond_to(:each)
-          user.comments(100).count.should == 100
+          expect(user.comments(100)).to respond_to(:count)
+          expect(user.comments(100)).to respond_to(:reject)
+          expect(user.comments(100)).to respond_to(:empty?)
+          expect(user.comments(100)).to respond_to(:each)
+          expect(user.comments(100).count).to eq(100)
         end
       end
     end
@@ -31,25 +31,25 @@ module USaidWat
 
       describe "#subreddit" do
         it "should return a string denoting what subreddit it belongs to" do
-          comment.subreddit.should == "wikipedia"
+          expect(comment.subreddit).to eq("wikipedia")
         end
       end
 
       describe "#body" do
         it "should return the comment's body" do
-          comment.body.should == "Yep. My first experience with a Heisenbug occurred in a C++ program, and disappeared when I tried to print a variable with printf (only to reappear when that call was removed)."
+          expect(comment.body).to eq("Yep. My first experience with a Heisenbug occurred in a C++ program, and disappeared when I tried to print a variable with printf (only to reappear when that call was removed).")
         end
       end
 
       describe "#id" do
         it "should return an ID" do
-          comment.id.should == "c79peed"
+          expect(comment.id).to eq("c79peed")
         end
       end
 
       describe "#link_id" do
         it "should return a link ID" do
-          comment.link_id.should == "t3_142t4w"
+          expect(comment.link_id).to eq("t3_142t4w")
         end
       end
     end

data/spec/usaidwat/string_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+module USaidWat
+  module Ext
+    describe String do
+      describe "#convert_entities" do
+        it "converts > to >" do
+          s = "-> look at this!"
+          expected = "-> look at this!"
+          actual = s.convert_entities
+          expect(actual).to eq(expected)
+        end
+
+        it "converts &lt; to <" do
+          s = "left &lt;&lt; shift!"
+          expected = "left << shift!"
+          actual = s.convert_entities
+          expect(actual).to eq(expected)
+        end
+
+        it "converts both &gt; and &lt; to <" do
+          s = "look -&gt; this string has both &lt;- awesome, huh?"
+          expected = "look -> this string has both <- awesome, huh?"
+          actual = s.convert_entities
+          expect(actual).to eq(expected)
+        end
+      end
+    end
+  end
+end

data/usaidwat.gemspec

@@ -6,6 +6,7 @@ require 'usaidwat/version'
 Gem::Specification.new do |gem|
   gem.name          = "usaidwat"
   gem.version       = USaidWat::VERSION
+  gem.licenses      = ["MIT"]
   gem.authors       = ["Michael Dippery"]
   gem.email         = ["michael@monkey-robot.com"]
   gem.homepage      = "https://github.com/mdippery/usaidwat"
@@ -18,10 +19,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency('snooby', '~> 0.1.5')
-  gem.add_dependency('rainbow', '~> 1.1.4')
+  gem.add_dependency('rainbow', '~> 2.0', '>= 2.0.0')
 
-  gem.add_development_dependency('rspec', '~> 2.12.0')
-  gem.add_development_dependency('cucumber', '~> 1.2.1')
-  gem.add_development_dependency('aruba', '~> 0.5.1')
-  gem.add_development_dependency('webmock', '~> 1.9.0')
+  gem.add_development_dependency('rspec', '~> 3.2', '>= 3.2.0')
+  gem.add_development_dependency('cucumber', '~> 2.0', '>= 2.0.0')
+  gem.add_development_dependency('aruba', '~> 0.6.2')
+  gem.add_development_dependency('webmock', '~> 1.21', '>= 1.21.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snooby
@@ -30,70 +30,94 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.21'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.21'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.21.0
 description: View a user's last 100 Reddit comments, organized by subreddit.
 email:
 - michael@monkey-robot.com
@@ -111,12 +135,14 @@ files:
 - features/browse.feature
 - features/fixtures/blank.json
 - features/fixtures/mipadi.json
+- features/fixtures/palorchild.json
 - features/help.feature
 - features/step_definitions/reddit_steps.rb
 - features/support/aruba.rb
 - lib/usaidwat.rb
 - lib/usaidwat/application.rb
 - lib/usaidwat/client.rb
+- lib/usaidwat/ext/string.rb
 - lib/usaidwat/formatter.rb
 - lib/usaidwat/service.rb
 - lib/usaidwat/version.rb
@@ -124,9 +150,11 @@ files:
 - spec/usaidwat/client_spec.rb
 - spec/usaidwat/formatter_spec.rb
 - spec/usaidwat/service_spec.rb
+- spec/usaidwat/string_spec.rb
 - usaidwat.gemspec
 homepage: https://github.com/mdippery/usaidwat
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -144,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Answers the age-old question, "Where does a Redditor comment the most?"
@@ -152,6 +180,7 @@ test_files:
 - features/browse.feature
 - features/fixtures/blank.json
 - features/fixtures/mipadi.json
+- features/fixtures/palorchild.json
 - features/help.feature
 - features/step_definitions/reddit_steps.rb
 - features/support/aruba.rb
@@ -159,3 +188,4 @@ test_files:
 - spec/usaidwat/client_spec.rb
 - spec/usaidwat/formatter_spec.rb
 - spec/usaidwat/service_spec.rb
+- spec/usaidwat/string_spec.rb