usaidwat 1.4.5 → 1.5.0

data/lib/usaidwat/formatter/comment.rb

@@ -0,0 +1,92 @@
+module USaidWat
+  module CLI
+    class CommentFormatter < BaseFormatter
+      def format(comment)
+        cols = tty.width
+        out = StringIO.new
+        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.unescape_html.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))
+        out.write("\n")
+        out.write("#{comment_body(comment)}\n")
+        @count += 1
+        out.rewind
+        out.read
+      end
+
+      private
+
+      def markdown
+        @markdown ||= Redcarpet::Markdown.new(Downterm::Render::Terminal, :autolink => true,
+                                                                          :strikethrough => true,
+                                                                          :superscript => true)
+      end
+
+      def comment_body(comment)
+        body = comment.body.strip.unescape_html
+        body = markdown.render(body) unless raw?
+        if pattern?
+          body.highlight(pattern)
+        else
+          body
+        end
+      end
+
+      def comment_link(comment)
+        link = comment.link_id.split("_")[-1]
+        "http://www.reddit.com/r/#{comment.subreddit}/comments/#{link}/z/#{comment.id}"
+      end
+
+      def comment_date(comment)
+        d = comment.created_utc.localtime
+        if relative_dates?
+          d.ago
+        else
+          d_part = d.strftime("%a, %-d %b %Y")
+          t_part = d.strftime("%l:%M %p").strip
+          "#{d_part}, #{t_part}"
+        end
+      end
+
+      def comment_karma(comment)
+        comment.ups - comment.downs
+      end
+    end
+
+    class CompactCommentFormatter < BaseFormatter
+      def format(comment)
+        cols = tty.width
+        out = StringIO.new
+        subreddit = comment.subreddit
+        cols -= subreddit.length + 1
+        title = comment.link_title.strip.unescape_html.truncate(cols)
+        key = "#{subreddit} #{title}"
+        if !seen?(key)
+          out.write("#{subreddit}".color(:green))
+          out.write(" #{title}\n")
+        end
+        mark_seen(key)
+        out.rewind
+        out.read
+      end
+
+      private
+
+      def comments
+        @comments ||= Set.new
+      end
+
+      def mark_seen(comment)
+        comments << comment
+      end
+
+      def seen?(comment)
+        comments.include?(comment)
+      end
+    end
+  end
+end

data/lib/usaidwat/formatter/count.rb

@@ -0,0 +1,20 @@
+module USaidWat
+  module CLI
+    class TallyFormatter
+      include TTYFormatter
+
+      def format(partition_data)
+        out = StringIO.new
+        longest_subreddit = partition_data.longest
+        subreddits = partition_data.counts
+        subreddits.each do |subreddit_count|
+          subreddit, tally = subreddit_count
+          line = sprintf("%-*s  %3d\n", longest_subreddit, subreddit, tally)
+          out.write(line)
+        end
+        out.rewind
+        out.read
+      end
+    end
+  end
+end

data/lib/usaidwat/formatter/post.rb

@@ -0,0 +1,43 @@
+module USaidWat
+  module CLI
+    class PostFormatter < BaseFormatter
+      def format(post)
+        cols = tty.width
+        out = StringIO.new
+        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.unescape_html.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
+      end
+
+      private
+
+      def post_link(post)
+        "https://www.reddit.com#{post.permalink.split('/')[0..-2].join('/')}"
+      end
+
+      def post_date(post)
+        post.created_utc.ago
+      end
+    end
+
+    class CompactPostFormatter < BaseFormatter
+      def format(post)
+        cols = tty.width
+        out = StringIO.new
+        subreddit = post.subreddit
+        cols -= subreddit.length + 1
+        title = post.title.strip.unescape_html.truncate(cols)
+        out.write(subreddit.color(:green))
+        out.write(" #{title}\n")
+        out.rewind
+        out.read
+      end
+    end
+  end
+end

data/lib/usaidwat/formatter/timeline.rb

@@ -0,0 +1,32 @@
+module USaidWat
+  module CLI
+    class TimelineFormatter
+      include TTYFormatter
+
+      def format(comment_data)
+        out = StringIO.new
+        out.write(' ')
+        (0..23).each { |h| out.write(sprintf '%3s', h) }
+        out.write("\n")
+
+        comment_data.each_with_index do |day, i|
+          out.write(day_map(i))
+          day.each do |hour|
+            mark = hour > 0 ? '*' : ' '
+            out.write(sprintf "%3s", mark)
+          end
+          out.write("\n")
+        end
+
+        out.rewind
+        out.read
+      end
+
+      private
+
+      def day_map(i)
+        return %W{S M T W T F S}[i]
+      end
+    end
+  end
+end

data/lib/usaidwat/service.rb

@@ -1,66 +1,50 @@
+require 'requests'
+
 module USaidWat
   module Service
-    class MockComment
-      attr_reader :subreddit, :body, :id, :link_id, :created_utc, :link_title, :ups, :downs
-
-      def initialize(dict)
-        data = dict['data']
-        @subreddit = data['subreddit']
-        @body = data['body']
-        @id = data['id']
-        @link_id = data['link_id']
-        @created_utc = data['created_utc']
-        @link_title = data['link_title']
-        @ups = data['ups']
-        @downs = data['downs']
-      end
-    end
-
-    class MockSubmission
-      attr_reader :subreddit, :title, :created_utc, :permalink, :url
-
-      def initialize(dict)
-        data = dict['data']
-        @subreddit = data['subreddit']
-        @title = data['title']
-        @created_utc = data['created_utc']
-        @permalink = data['permalink']
-        @url = data['url']
+    class RedditService
+      def user(username)
+        data = %w{about comments submitted}.reduce({}) { |memo, obj| memo.update(obj.to_sym =>  get_page(username, obj)) }
+        USaidWat::Thing::User.new(username, data[:about], data[:comments], data[:submitted])
       end
-    end
 
-    class MockUser
-      def initialize(username)
-        @username = username
-      end
+      private
 
-      def about
-        load_data("user_#{@username}.json")['data']
+      def get_page(username, page)
+        url = "https://www.reddit.com/user/#{username}/#{page}.json"
+        url += '?limit=100' if ['comments', 'submitted'].include?(page)
+        get(url)
       end
 
-      def comments(n)
-        json = load_data("#{@username}.json")
-        json['data']['children'].map { |d| MockComment.new(d) }
+      def get(uri)
+        hdrs = {'User-Agent' => "usaidwat v#{USaidWat::VERSION}"}
+        Requests.request('GET', uri, :headers => hdrs).json
+      rescue Timeout::Error
+        :server_error
+      rescue Requests::Error => e
+        case e.response.code.to_i
+        when 404 then :no_such_user
+        when 500 then :server_error
+        else          :nil
+        end
       end
+    end
 
-      def posts
-        json = load_data("submissions_#{@username}.json")
-        json['data']['children'].map { |d| MockSubmission.new(d) }
+    class MockService
+      def user(username)
+        USaidWat::Thing::User.new(username,
+                                  load_data("user_#{username}.json"),
+                                  load_data("#{username}.json"),
+                                  load_data("submissions_#{username}.json"))
       end
 
       private
 
       def load_data(data_file)
         path = File.join(File.dirname(__FILE__), "..", "..", "features", "fixtures", data_file)
-        raise USaidWat::Client::NoSuchUserError, @username unless File.exists?(path)
+        return :no_such_user unless File.exists?(path)
         JSON.parse(IO.read(path))
       end
     end
-
-    class MockService
-      def user(username)
-        MockUser.new(username)
-      end
-    end
   end
 end

data/lib/usaidwat/thing.rb

@@ -0,0 +1,85 @@
+module USaidWat
+  module Thing
+    module Timestampable
+      def created_utc
+        Time.at(@created_utc)
+      end
+    end
+
+    module HashBackedIvars
+      def method_missing(symbol, *args, &block)
+        res = @data[symbol.to_s]
+        return res unless res.nil?
+        super
+      end
+    end
+
+    class User
+      def initialize(username, user_data, comment_data, post_data)
+        @username = username
+        @user_data = user_data
+        @comment_data = comment_data
+        @post_data = post_data
+      end
+
+      def about
+        raise USaidWat::Client::NoSuchUserError, @username if @user_data == :no_such_user
+        raise USaidWat::Client::ReachabilityError if @user_data == :server_error
+        @about ||= About.new(@user_data)
+      end
+
+      def comments(n)
+        comment_data['children'].map { |d| Comment.new(d) }
+      end
+
+      def posts
+        post_data['children'].map { |d| Submission.new(d) }
+      end
+
+      def method_missing(symbol, *args, &block)
+        if symbol.to_s =~ /_data$/
+          begin
+            res = instance_variable_get("@#{symbol}")
+            raise USaidWat::Client::NoSuchUserError, @username if res == :no_such_user
+            raise USaidWat::Client::ReachabilityError if res == :server_error
+            res['data']
+          rescue NameError
+            super
+          end
+        else
+          super
+        end
+      end
+    end
+
+    class About
+      include Timestampable
+      include HashBackedIvars
+
+      def initialize(dict)
+        @data = dict['data']
+        @created_utc = @data['created_utc']
+      end
+    end
+
+    class Comment
+      include Timestampable
+      include HashBackedIvars
+
+      def initialize(dict)
+        @data = dict['data']
+        @created_utc = @data['created_utc']
+      end
+    end
+
+    class Submission
+      include Timestampable
+      include HashBackedIvars
+
+      def initialize(dict)
+        @data = dict['data']
+        @created_utc = @data['created_utc']
+      end
+    end
+  end
+end

data/lib/usaidwat/version.rb

@@ -1,3 +1,8 @@
 module USaidWat
-  VERSION = "1.4.5"
+  VERSION = "1.5.0"
+
+  def self.commit_hash
+    spec = Gem.loaded_specs['usaidwat']
+    spec.metadata['commit_hash'][0...7]
+  end
 end

data/spec/usaidwat/client_spec.rb

@@ -23,11 +23,11 @@ module USaidWat
           WebMock.disable_net_connect!
           WebMock.reset!
           root = File.expand_path("../../../features/fixtures", __FILE__)
-          stub_request(:get, "https://www.reddit.com/user/mipadi/comments.json?after=&limit=100").
+          stub_request(:get, "https://www.reddit.com/user/mipadi/comments.json?limit=100").
             to_return(:body => IO.read(File.join(root, "mipadi.json")))
           stub_request(:get, "https://www.reddit.com/user/mipadi/about.json").
             to_return(:body => IO.read(File.join(root, "user_mipadi.json")))
-          stub_request(:get, "https://www.reddit.com/user/mipadi/submitted.json?after=&limit=25").
+          stub_request(:get, "https://www.reddit.com/user/mipadi/submitted.json?limit=100").
             to_return(:body => IO.read(File.join(root, "submissions_mipadi.json")))
 
           Timecop.freeze(Time.new(2015, 9, 15, 11, 14, 30, "-07:00"))
@@ -81,11 +81,11 @@ module USaidWat
           WebMock.disable_net_connect!
           WebMock.reset!
           root = File.expand_path("../../../features/fixtures", __FILE__)
-          stub_request(:get, "https://www.reddit.com/user/testuser/comments.json?after=&limit=100").
+          stub_request(:get, "https://www.reddit.com/user/testuser/comments.json?limit=100").
             to_return(:status => 404, :body => IO.read(File.join(root, "testuser.json")))
           stub_request(:get, "https://www.reddit.com/user/testuser/about.json").
             to_return(:status => 404, :body => IO.read(File.join(root, "user_testuser.json")))
-          stub_request(:get, "https://www.reddit.com/user/testuser/submitted.json?after=&limit=25").
+          stub_request(:get, "https://www.reddit.com/user/testuser/submitted.json?limit=100").
             to_return(:status => 404, :body => IO.read(File.join(root, "submissions_testuser.json")))
         end
 
@@ -130,9 +130,9 @@ module USaidWat
         before(:each) do
           WebMock.disable_net_connect!
           WebMock.reset!
-          stub_request(:get, "https://www.reddit.com/user/mipadi/comments.json?after=&limit=100").to_timeout
+          stub_request(:get, "https://www.reddit.com/user/mipadi/comments.json?limit=100").to_timeout
           stub_request(:get, "https://www.reddit.com/user/mipadi/about.json").to_timeout
-          stub_request(:get, "https://www.reddit.com/user/mipadi/submitted.json?after=&limit=25").to_timeout
+          stub_request(:get, "https://www.reddit.com/user/mipadi/submitted.json?limit=100").to_timeout
         end
 
         describe "#posts" do
@@ -170,11 +170,11 @@ module USaidWat
         before(:each) do
           WebMock.disable_net_connect!
           WebMock.reset!
-          stub_request(:get, "https://www.reddit.com/user/mipadi/comments.json?after=&limit=100").
+          stub_request(:get, "https://www.reddit.com/user/mipadi/comments.json?limit=100").
             to_return(:status => 500)
           stub_request(:get, "https://www.reddit.com/user/mipadi/about.json").
             to_return(:status => 500)
-          stub_request(:get, "https://www.reddit.com/user/mipadi/submitted.json?after=&limit=25").
+          stub_request(:get, "https://www.reddit.com/user/mipadi/submitted.json?limit=100").
             to_return(:status => 500)
         end
 

data/spec/usaidwat/formatter_spec.rb

@@ -105,7 +105,7 @@ module USaidWat
           expect(post).to receive(:subreddit).and_return("Games")
           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(:created_utc).and_return(Time.at(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
@@ -125,7 +125,7 @@ EXPECTED
           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(:created_utc).and_return(Time.at(1444928064))
           expect(post).to receive(:url).and_return("https://www.reddit.com#{permalink}")
           expected = <<-EXPECTED
 Games
@@ -143,13 +143,13 @@ EXPECTED
           expect(post1).to receive(:subreddit).and_return("Games")
           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(:created_utc).and_return(Time.at(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).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(:created_utc).and_return(Time.at(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)
@@ -165,7 +165,7 @@ EXPECTED
           expect(post).to receive(:subreddit).and_return("webdev")
           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(:created_utc).and_return(Time.at(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
@@ -199,7 +199,7 @@ EXPECTED
           expect(comment).to receive(:link_id).and_return("t3_13f783")
           expect(comment).to receive(:id).and_return("c73qhxi")
           expect(comment).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
-          expect(comment).to receive(:created_utc).and_return(1433378314.0)
+          expect(comment).to receive(:created_utc).and_return(Time.at(1433378314.0))
           expect(comment).to receive(:ups).and_return(12)
           expect(comment).to receive(:downs).and_return(1)
           expect(comment).to receive(:body).and_return("Welcome to the wonderful world of Python drama!")
@@ -220,7 +220,7 @@ EXPECTED
           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(:created_utc).and_return(1433378314.0)
+          expect(comment1).to receive(:created_utc).and_return(Time.at(1433378314.0))
           expect(comment1).to receive(:ups).and_return(12)
           expect(comment1).to receive(:downs).and_return(1)
           expect(comment1).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
@@ -229,7 +229,7 @@ EXPECTED
           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(:created_utc).and_return(1433378314.0)
+          expect(comment2).to receive(:created_utc).and_return(Time.at(1433378314.0))
           expect(comment2).to receive(:ups).and_return(12)
           expect(comment2).to receive(:downs).and_return(1)
           expect(comment2).to receive(:link_title).and_return("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
@@ -247,7 +247,7 @@ EXPECTED
           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(:created_utc).and_return(1433378314.0)
+          expect(comment).to receive(:created_utc).and_return(Time.at(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("Why Brit Ruby 2013 was cancelled and why this is not ok - Gist")
@@ -262,7 +262,7 @@ EXPECTED
           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(:created_utc).and_return(Time.at(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")
@@ -356,5 +356,33 @@ EOS
         end
       end
     end
+
+    describe TimelineFormatter do
+      let (:data) { [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+                     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 1, 11, 0, 2, 1, 4, 0, 0, 0, 0, 0, 0],
+                     [0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0],
+                     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 2, 7, 4, 1, 6, 1, 2, 2, 0, 0, 0, 0, 1],
+                     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 5, 5, 0, 0, 0, 3, 2, 0, 0, 1, 0, 0, 0],
+                     [0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 2, 0, 0, 0, 0, 0, 0, 2, 0, 3, 0, 0, 0, 0],
+                     [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]] }
+      let (:formatter) { TimelineFormatter.new }
+
+      describe '#format' do
+        it 'should format a timeline' do
+          expected = <<EOS
+   0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
+S                                                                        
+M                                *  *  *  *     *  *  *                  
+T                             *           *                    *         
+W                                *  *  *  *  *  *  *  *  *              *
+T                                *  *  *           *  *        *         
+F                             *  *                    *     *            
+S                                                                        
+EOS
+          actual = formatter.format(data)
+          expect(actual).to eq(expected)
+        end
+      end
+    end
   end
 end