usaidwat 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea17e3c87e6fd43b7db8331da055a68c107c031
-  data.tar.gz: 9a542511c2add4dc3ab9096f3d1ce438f0898cae
+  metadata.gz: 109f7714eb054decf6d7c307f071c5590af3a0e1
+  data.tar.gz: dd67a99e77fee4b8c931d0c0e37090be2e165711
 SHA512:
-  metadata.gz: 523c1c2fd50fc83f9c1c9c6f5e9fea234b8ed585c454e28d7f9982696a23b9f94cb1e8daa015b5ce9bcae0208df8620c8a9b98c72984150e70caf85b0e495332
-  data.tar.gz: fdd7d85341325af2a2e17c9e91a3225278a2b3d4717c599e6af7fe8bd87748bb678b3ea280189cdc4fe74eef3332c96d2825cccc011749e58dc04cc6553f9c3d
+  metadata.gz: 8b415cfb6cb5b8be767bcf0bed60f72448681512356ad3964310cb95e2d88d2169da679f0d5fcc79ae0d9ee1e86d5601701cfb7712a028102d68c506c6dbed09
+  data.tar.gz: 74378fa1d498786439eb61cc9100bb5f8552761ab14fcc9e0c9eefe02baac235017ee902c432bd831bdde60fe5449032c1d00cf60677377d8ecabe0162788140

data/features/log.feature

@@ -154,7 +154,7 @@ Feature: Browse comments
       """
       Games
       http://www.reddit.com/r/Games/comments/13xc2o/z/c784qj8
-      The True Story of Battlefield 3, the Battlefield Franchise, Its Community, &
+      The True Story of Battlefield 3, the Battlefield Franchise, Its Community, & EA/
       over 2 years ago • +2
 
       That's exactly how I feel. There are times when I have a ton of fun playing BF3…but it always feels like it has so much more potential to be an awesome game.
@@ -194,7 +194,7 @@ Feature: Browse comments
       """
       Games
       http://www.reddit.com/r/Games/comments/13xc2o/z/c784qj8
-      The True Story of Battlefield 3, the Battlefield Franchise, Its Community, &
+      The True Story of Battlefield 3, the Battlefield Franchise, Its Community, & EA/
       over 2 years ago • +2
 
       That's exactly how I feel. There are times when I have a ton of fun playing BF3…but it always feels like it has so much more potential to be an awesome game.
@@ -234,7 +234,7 @@ Feature: Browse comments
       """
       Games
       http://www.reddit.com/r/Games/comments/13xc2o/z/c784qj8
-      The True Story of Battlefield 3, the Battlefield Franchise, Its Community, &
+      The True Story of Battlefield 3, the Battlefield Franchise, Its Community, & EA/
       over 2 years ago • +2
 
       That's exactly how I feel. There are times when I have a ton of fun playing BF3…but it always feels like it has so much more potential to be an awesome game.

data/features/posts.feature

@@ -14,132 +14,154 @@ Feature: Show posts
       https://www.reddit.com/r/short/comments/3pj7rx
       Science Says Being Short Makes You Depressed
       about 4 weeks ago
+      http://www.vice.com/read/it-sucks-to-be-a-short-guy-511
 
 
       Games
       https://www.reddit.com/r/Games/comments/3ovldc
       The Xbox One Is Garbage And The Future Is Bullshit
       about 1 month ago
+      http://adequateman.deadspin.com/the-xbox-one-is-garbage-and-the-future-is-bullshit-1736054579
 
 
       technology
       https://www.reddit.com/r/technology/comments/3o0vrh
       Mozilla lays out a proposed set of rules for content blockers
       about 1 month ago
+      https://blog.mozilla.org/blog/2015/10/07/proposed-principles-for-content-blocking/
 
 
       apple
       https://www.reddit.com/r/apple/comments/3o0vp9
       Mozilla lays out a set of proposed rules for content blocking
       about 1 month ago
+      https://blog.mozilla.org/blog/2015/10/07/proposed-principles-for-content-blocking/
 
 
       vim
       https://www.reddit.com/r/vim/comments/3m83kp
       Vim setup for Markdown
       about 2 months ago
+      http://www.swamphogg.com/2015/vim-setup/
 
 
       django
       https://www.reddit.com/r/django/comments/35rzlx
       Deploy Django projects using git push
       about 6 months ago
+      http://blog.mathieu-leplatre.info/deploy-django-projects-using-git-push.html
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/35rtkx
       The Future of Web Design is Hidden in the History of Architecture
       about 6 months ago
+      https://medium.com/@sall/the-future-of-web-design-is-hidden-in-the-history-of-architecture-1cc93ea854d0
 
 
       swift
       https://www.reddit.com/r/swift/comments/33kjrn
       Does Swift make native app development easier?
       about 7 months ago
+      http://monkey-robot.com/2015/04/swift-makes-programming-easy/?utm_source=reddit&utm_medium=social&utm_campaign=Post%3A%2022%20Apr%202015
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/32y92q
       Microservices in Clojure
       about 7 months ago
+      https://speakerdeck.com/kachayev/microservices-in-clojure
 
 
       movies
       https://www.reddit.com/r/movies/comments/2vt5h0
       Interstellar's true black hole would have been too confusing for audiences
       about 9 months ago
+      http://www.newscientist.com/article/dn26966-interstellars-true-black-hole-too-confusing.html#.VN3dJ_msXPo
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/2vo5zs
       Major security alert as 40,000 MongoDB databases left unsecured on the internet
       about 9 months ago
+      http://news.hitb.org/content/major-security-alert-40000-mongodb-databases-left-unsecured-internet
 
 
       vim
       https://www.reddit.com/r/vim/comments/2tvq8u
       Why does my shell prompt disappear when I install and use vim 7.4 (on CentOS 6)?
       about 10 months ago
+      http://stackoverflow.com/q/28179589/28804
 
 
       swift
       https://www.reddit.com/r/swift/comments/2t55vj
       Swift for CLI tools
       about 10 months ago
+      https://speakerdeck.com/supermarin/swift-for-cli-tools
 
 
       Games
       https://www.reddit.com/r/Games/comments/2expgr
       Chief Executive of Rovio, Maker of Angry Birds Game, to Step Down
       about a year ago
+      http://www.nytimes.com/2014/08/30/technology/mikael-hed-chief-executive-of-angry-birds-maker-to-step-down.html
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/2ejsyv
       You have ruined HTML
       about a year ago
+      http://blog.dantup.com/2014/08/you-have-ruined-html/
 
 
       swift
       https://www.reddit.com/r/swift/comments/2au1ki
       A few thoughts on Swift
       about a year ago
+      http://monkey-robot.com/2014/07/thoughts-on-swift/?utm_source=reddit&utm_medium=social&utm_campaign=Post%3A%2015%20July%202014
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/29og3m
       Sick of Ruby, dynamic typing, side effects, and basically object-oriented progra
       about a year ago
+      https://blog.abevoelker.com/sick-of-ruby-dynamic-typing-side-effects-object-oriented-programming/
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/28ziwz
       Vim for people who think things like Vim are weird and hard
       about a year ago
+      http://csswizardry.com/2014/06/vim-for-people-who-think-things-like-vim-are-weird-and-hard/
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/27h6za
       The emperor’s new clothes were built with Node.js
       about a year ago
+      http://notes.ericjiang.com/posts/751
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/26hm0m
       Clojure, or how to put the spark back into your relationship with programming
       about a year ago
+      http://monkey-robot.com/2014/05/clojure-a-retrospective/?utm_source=reddit&utm_medium=social&utm_campaign=Post%3A%2025%20May%202014
 
 
       Clojure
       https://www.reddit.com/r/Clojure/comments/26hlxb
       Clojure: A Retrospective
       about a year ago
+      http://monkey-robot.com/2014/05/clojure-a-retrospective/?utm_source=reddit&utm_medium=social&utm_campaign=Post%3A%2025%20May%202014
 
 
       programming
       https://www.reddit.com/r/programming/comments/26hlvt
       Fresh perspectives: Learning new languages after you know (quite) a few
       about a year ago
+      http://monkey-robot.com/2014/05/clojure-a-retrospective/?utm_source=reddit&utm_medium=social&utm_campaign=Post%3A%2025%20May%202014
 
 
       webdev
@@ -152,12 +174,14 @@ Feature: Show posts
       https://www.reddit.com/r/programming/comments/26562t
       Erlang and code style: Musings on mostly defensive programming styles
       about a year ago
+      https://medium.com/p/b5936dceb5e4
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/25p2d8
       Facebook: MVC Does Not Scale, Use Flux Instead
       about a year ago
+      http://www.infoq.com/news/2014/05/facebook-mvc-flux
       """
 
   Scenario: List posts when user has no submissions
@@ -179,48 +203,56 @@ Feature: Show posts
       https://www.reddit.com/r/webdev/comments/35rtkx
       The Future of Web Design is Hidden in the History of Architecture
       about 6 months ago
+      https://medium.com/@sall/the-future-of-web-design-is-hidden-in-the-history-of-architecture-1cc93ea854d0
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/32y92q
       Microservices in Clojure
       about 7 months ago
+      https://speakerdeck.com/kachayev/microservices-in-clojure
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/2vo5zs
       Major security alert as 40,000 MongoDB databases left unsecured on the internet
       about 9 months ago
+      http://news.hitb.org/content/major-security-alert-40000-mongodb-databases-left-unsecured-internet
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/2ejsyv
       You have ruined HTML
       about a year ago
+      http://blog.dantup.com/2014/08/you-have-ruined-html/
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/29og3m
       Sick of Ruby, dynamic typing, side effects, and basically object-oriented progra
       about a year ago
+      https://blog.abevoelker.com/sick-of-ruby-dynamic-typing-side-effects-object-oriented-programming/
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/28ziwz
       Vim for people who think things like Vim are weird and hard
       about a year ago
+      http://csswizardry.com/2014/06/vim-for-people-who-think-things-like-vim-are-weird-and-hard/
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/27h6za
       The emperor’s new clothes were built with Node.js
       about a year ago
+      http://notes.ericjiang.com/posts/751
 
 
       webdev
       https://www.reddit.com/r/webdev/comments/26hm0m
       Clojure, or how to put the spark back into your relationship with programming
       about a year ago
+      http://monkey-robot.com/2014/05/clojure-a-retrospective/?utm_source=reddit&utm_medium=social&utm_campaign=Post%3A%2025%20May%202014
 
 
       webdev
@@ -233,6 +265,7 @@ Feature: Show posts
       https://www.reddit.com/r/webdev/comments/25p2d8
       Facebook: MVC Does Not Scale, Use Flux Instead
       about a year ago
+      http://www.infoq.com/news/2014/05/facebook-mvc-flux
       """
 
   Scenario: Filter posts by subreddit when user has no submissions to that subreddit

data/lib/usaidwat/application.rb

@@ -81,7 +81,7 @@ module USaidWat
           c.alias :l
           c.option 'date', '--date FORMAT', 'Show dates in "absolute" or "relative" format'
           c.option 'grep', '--grep STRING', 'Show only comments matching STRING'
-          c.option 'limit', '-n LIMIT', 'Only show n comments'
+          c.option 'limit', '--limit LIMIT', '-n LIMIT', 'Only show n comments'
           c.option 'oneline', '--oneline', 'Output log in a more compact form'
           c.option 'raw', '--raw', 'Print raw comment bodies'
 

data/lib/usaidwat/ext/string.rb

@@ -16,4 +16,8 @@ class String
   def highlight(pattern)
     gsub(/#{pattern}/i) { |m| Rainbow(m).red }
   end
+
+  def transform_html_entities
+    gsub(/&gt;/, '>').gsub(/&lt;/, '<').gsub(/&amp;/, '&')
+  end
 end

data/lib/usaidwat/formatter.rb

@@ -48,8 +48,9 @@ module USaidWat
         out.write("\n\n\n") unless @count == 0
         out.write("#{post.subreddit}\n".color(:green))
         out.write("#{post_link(post)}\n".color(:yellow))
-        out.write("#{post.title.strip.truncate(cols)}\n".color(:magenta))
+        out.write("#{post.title.strip.transform_html_entities.truncate(cols)}\n".color(:magenta))
         out.write("#{post_date(post)}".color(:blue))
+        out.write("\n#{post.url}") unless post.url.end_with?(post.permalink)
         @count += 1
         out.rewind
         out.read
@@ -73,7 +74,7 @@ module USaidWat
         out.write("\n\n") unless @count == 0
         out.write("#{comment.subreddit}\n".color(:green))
         out.write("#{comment_link(comment)}\n".color(:yellow))
-        out.write("#{comment.link_title.strip.truncate(cols)}\n".color(:magenta))
+        out.write("#{comment.link_title.strip.transform_html_entities.truncate(cols)}\n".color(:magenta))
         out.write("#{comment_date(comment)}".color(:blue))
         out.write(" \u2022 ".color(:cyan))
         out.write(sprintf("%+d\n", comment_karma(comment)).color(:blue))
@@ -128,7 +129,7 @@ module USaidWat
         out = StringIO.new
         subreddit = comment.subreddit
         cols -= subreddit.length + 1
-        title = comment.link_title.strip.truncate(cols)
+        title = comment.link_title.strip.transform_html_entities.truncate(cols)
         key = "#{subreddit} #{title}"
         if !seen?(key)
           out.write("#{subreddit}".color(:green))

data/lib/usaidwat/service.rb

@@ -17,7 +17,7 @@ module USaidWat
     end
 
     class MockSubmission
-      attr_reader :subreddit, :title, :created_utc, :permalink
+      attr_reader :subreddit, :title, :created_utc, :permalink, :url
 
       def initialize(dict)
         data = dict['data']
@@ -25,6 +25,7 @@ module USaidWat
         @title = data['title']
         @created_utc = data['created_utc']
         @permalink = data['permalink']
+        @url = data['url']
       end
     end
 

data/lib/usaidwat/version.rb

@@ -1,3 +1,3 @@
 module USaidWat
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/usaidwat/formatter_spec.rb

@@ -103,9 +103,30 @@ module USaidWat
         it "should return a string containing the formatted post" do
           post = double("post")
           expect(post).to receive(:subreddit).and_return("Games")
-          expect(post).to receive(:permalink).and_return("/r/Games/comments/3ovldc/the_xbox_one_is_garbage_and_the_future_is_bullshit/")
+          expect(post).to receive(:permalink).twice.and_return("/r/Games/comments/3ovldc/the_xbox_one_is_garbage_and_the_future_is_bullshit/")
           expect(post).to receive(:title).and_return("The Xbox One Is Garbage And The Future Is Bullshit")
           expect(post).to receive(:created_utc).and_return(1444928064)
+          expect(post).to receive(:url).twice.and_return("http://adequateman.deadspin.com/the-xbox-one-is-garbage-and-the-future-is-bullshit-1736054579")
+          expected = <<-EXPECTED
+Games
+https://www.reddit.com/r/Games/comments/3ovldc
+The Xbox One Is Garbage And The Future Is Bullshit
+about 1 month ago
+http://adequateman.deadspin.com/the-xbox-one-is-garbage-and-the-future-is-bullshit-1736054579
+EXPECTED
+          expected = expected.strip
+          actual = formatter.format(post).delete_ansi_color_codes
+          expect(actual).to eq(expected)
+        end
+
+        it "should not include the URL if it is the same as the permalink" do
+          permalink = "/r/Games/comments/3ovldc/the_xbox_one_is_garbage_and_the_future_is_bullshit/"
+          post = double("post")
+          expect(post).to receive(:subreddit).and_return("Games")
+          expect(post).to receive(:permalink).twice.and_return(permalink)
+          expect(post).to receive(:title).and_return("The Xbox One Is Garbage And The Future Is Bullshit")
+          expect(post).to receive(:created_utc).and_return(1444928064)
+          expect(post).to receive(:url).and_return("https://www.reddit.com#{permalink}")
           expected = <<-EXPECTED
 Games
 https://www.reddit.com/r/Games/comments/3ovldc
@@ -120,14 +141,16 @@ EXPECTED
         it "should print two spaces between posts" do
           post1 = double("first post")
           expect(post1).to receive(:subreddit).and_return("Games")
-          expect(post1).to receive(:permalink).and_return("/r/Games/comments/3ovldc/the_xbox_one_is_garbage_and_the_future_is_bullshit/")
+          expect(post1).to receive(:permalink).twice.and_return("/r/Games/comments/3ovldc/the_xbox_one_is_garbage_and_the_future_is_bullshit/")
           expect(post1).to receive(:title).and_return("The Xbox One Is Garbage And The Future Is Bullshit")
           expect(post1).to receive(:created_utc).and_return(1444928064)
+          expect(post1).to receive(:url).twice.and_return("http://adequateman.deadspin.com/the-xbox-one-is-garbage-and-the-future-is-bullshit-1736054579")
           post2 = double("second post")
           expect(post2).to receive(:subreddit).and_return("technology")
-          expect(post2).to receive(:permalink).and_return("/r/technology/comments/3o0vrh/mozilla_lays_out_a_proposed_set_of_rules_for/")
+          expect(post2).to receive(:permalink).twice.and_return("/r/technology/comments/3o0vrh/mozilla_lays_out_a_proposed_set_of_rules_for/")
           expect(post2).to receive(:title).and_return("Mozilla lays out a proposed set of rules for content blockers")
           expect(post2).to receive(:created_utc).and_return(1444340278)
+          expect(post2).to receive(:url).twice.and_return("https://blog.mozilla.org/blog/2015/10/07/proposed-principles-for-content-blocking/")
           s = formatter.format(post1)
           s = formatter.format(post2)
           lines = s.split("\n")
@@ -140,14 +163,16 @@ EXPECTED
         it "should truncate titles to 80 characters" do
           post = double("post")
           expect(post).to receive(:subreddit).and_return("webdev")
-          expect(post).to receive(:permalink).and_return("/r/webdev/comments/29og3m/sick_of_ruby_dynamic_typing_side_effects_and/")
+          expect(post).to receive(:permalink).twice.and_return("/r/webdev/comments/29og3m/sick_of_ruby_dynamic_typing_side_effects_and/")
           expect(post).to receive(:title).and_return("Sick of Ruby, dynamic typing, side effects, and basically object-oriented programming")
           expect(post).to receive(:created_utc).and_return(1404331670)
+          expect(post).to receive(:url).twice.and_return("https://blog.abevoelker.com/sick-of-ruby-dynamic-typing-side-effects-object-oriented-programming/")
           expected = <<-EXPECTED
 webdev
 https://www.reddit.com/r/webdev/comments/29og3m
 Sick of Ruby, dynamic typing, side effects, and basically object-oriented progra
 about a year ago
+https://blog.abevoelker.com/sick-of-ruby-dynamic-typing-side-effects-object-oriented-programming/
 EXPECTED
           expected = expected.strip
           actual = formatter.format(post).delete_ansi_color_codes
@@ -231,6 +256,21 @@ EXPECTED
           lines = s.split("\n")
           expect(lines[-1]).to eq("It has two lines.")
         end
+
+        it "should format HTML entities in post titles" do
+          comment = double("first comment")
+          expect(comment).to receive(:subreddit).twice.and_return("guitars")
+          expect(comment).to receive(:link_id).and_return("t3_13f783")
+          expect(comment).to receive(:id).and_return("c73qhxi")
+          expect(comment).to receive(:created_utc).and_return(1433378314.0)
+          expect(comment).to receive(:ups).and_return(12)
+          expect(comment).to receive(:downs).and_return(1)
+          expect(comment).to receive(:link_title).and_return("[GEAR] My 06 Fender EJ Strat, an R&amp;D prototype sold at NAMM")
+          expect(comment).to receive(:body).and_return("Lorem ipsum")
+          s = formatter.format(comment).delete_ansi_color_codes
+          lines = s.split("\n")
+          expect(lines[2]).to eq("[GEAR] My 06 Fender EJ Strat, an R&D prototype sold at NAMM")
+        end
       end
     end
 
@@ -255,6 +295,15 @@ EXPECTED
           expect(actual).to eq(expected)
         end
 
+        it "should format HTML entities in titles" do
+          comment = double("comment")
+          expect(comment).to receive(:subreddit).and_return("guitars")
+          expect(comment).to receive(:link_title).and_return("[GEAR] My 06 Fender EJ Strat, an R&amp;D prototype sold at NAMM")
+          expected = "guitars [GEAR] My 06 Fender EJ Strat, an R&D prototype sold at NAMM\n"
+          actual = formatter.format(comment).delete_ansi_color_codes
+          expect(actual).to eq(expected)
+        end
+
         it "should return an empty string if a comment has already been printed" do
           comment1 = double("comment")
           comment2 = double("comment")

data/spec/usaidwat/string_spec.rb

@@ -19,6 +19,23 @@ module USaidWat
         end
       end
 
+      describe "#transform_html_entities" do
+        it "transforms & to &" do
+          s = "this & that"
+          expect(s.transform_html_entities).to eq("this & that")
+        end
+
+        it "transform &lt; to <" do
+          s = "chocolate &lt; vanilla"
+          expect(s.transform_html_entities).to eq("chocolate < vanilla")
+        end
+
+        it "transforms &gt; to >" do
+          s = "cats &gt; dogs"
+          expect(s.transform_html_entities).to eq("cats > dogs")
+        end
+      end
+
       describe "#pluralize" do
         it "should not append an 's' to a singular noun" do
           s = "dog"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: downterm
@@ -226,9 +226,9 @@ homepage: https://github.com/mdippery/usaidwat
 licenses:
 - MIT
 metadata:
-  build_date: 2016-01-06 19:17:01 PST
-  commit: v1.4.0
-  commit_hash: 7ce44f2d344c06795cac025f343bd8d23f7faa95
+  build_date: 2016-02-17 21:16:59 PST
+  commit: v1.4.1
+  commit_hash: 0dc8b829187f42a68619a70fbca57b2130f8099f
 post_install_message: 
 rdoc_options: []
 require_paths: