usaidwat 0.0.10 → 0.1.1

data/spec/usaidwat/formatter_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module USaidWat
+  module CLI
+    describe CommentFormatter do
+      let(:formatter) { CommentFormatter.new }
+      
+      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!")
+          expected = <<-EXPECTED
+programming
+http://www.reddit.com/r/programming/comments/13f783/z/c73qhxi
+
+Welcome to the wonderful world of Python drama!
+EXPECTED
+          actual = formatter.format(comment)
+          actual.should == expected
+        end
+        
+        it "should print a horizontal rule for subsequent comments" do
+          expected = "-" * 80
+          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!")
+          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!")
+          s = formatter.format(comment1)
+          s = formatter.format(comment2)
+          actual = s.split("\n")[0]
+          actual.should == expected
+        end
+      end
+    end
+  end
+end

data/usaidwat.gemspec

@@ -1,24 +1,27 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "usaidwat/version"
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'usaidwat/version'
 
-Gem::Specification.new do |s|
-  s.name        = "usaidwat"
-  s.version     = USaidWat::VERSION
-  s.authors     = ["Michael Dippery"]
-  s.email       = ["michael@monkey-robot.com"]
-  s.homepage    = "https://github.com/mdippery/usaidwat"
-  s.summary     = %q{Answers the age-old question, "Where does a Redditor comment the most?"}
-  s.description = %q{View a user's last 100 Reddit comments, organized by subreddit.}
+Gem::Specification.new do |gem|
+  gem.name          = "usaidwat"
+  gem.version       = USaidWat::VERSION
+  gem.authors       = ["Michael Dippery"]
+  gem.email         = ["michael@monkey-robot.com"]
+  gem.homepage      = "https://github.com/mdippery/usaidwat"
+  gem.description   = %q{View a user's last 100 Reddit comments, organized by subreddit.}
+  gem.summary       = %q{Answers the age-old question, "Where does a Redditor comment the most?"}
 
-  s.rubyforge_project = "usaidwat"
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  
-  s.add_runtime_dependency 'json', '>= 1.6.5'
-  s.add_runtime_dependency 'rainbow', '>= 1.1.4'
-  s.add_development_dependency 'rspec', '~> 2.8.0'
+  gem.add_dependency('snooby')
+
+  gem.add_development_dependency('rspec')
+  gem.add_development_dependency('cucumber')
+  gem.add_development_dependency('aruba')
+  gem.add_development_dependency('webmock')
+  gem.add_development_dependency('sinatra')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usaidwat
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: snooby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,39 +26,87 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
 description: View a user's last 100 Reddit comments, organized by subreddit.
 email:
 - michael@monkey-robot.com
@@ -69,14 +117,24 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- README.textile
+- LICENSE.txt
+- README.md
 - Rakefile
 - bin/usaidwat
+- features/browse.feature
+- features/fixtures/comments.json
+- features/help.feature
+- features/server/reddit.rb
+- features/step_definitions/reddit_steps.rb
+- features/support/aruba.rb
 - lib/usaidwat.rb
-- lib/usaidwat/reddit.rb
-- lib/usaidwat/utils.rb
+- lib/usaidwat/application.rb
+- lib/usaidwat/client.rb
+- lib/usaidwat/formatter.rb
 - lib/usaidwat/version.rb
-- spec/utils_spec.rb
+- spec/spec_helper.rb
+- spec/usaidwat/client_spec.rb
+- spec/usaidwat/formatter_spec.rb
 - usaidwat.gemspec
 homepage: https://github.com/mdippery/usaidwat
 licenses: []
@@ -97,10 +155,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: usaidwat
+rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Answers the age-old question, "Where does a Redditor comment the most?"
 test_files:
-- spec/utils_spec.rb
+- features/browse.feature
+- features/fixtures/comments.json
+- features/help.feature
+- features/server/reddit.rb
+- features/step_definitions/reddit_steps.rb
+- features/support/aruba.rb
+- spec/spec_helper.rb
+- spec/usaidwat/client_spec.rb
+- spec/usaidwat/formatter_spec.rb

data/README.textile

@@ -1,51 +0,0 @@
-h1(#usaidwat). usaidwat
-
-Are you a Redditor? Do you use Ruby? Do you want to view the subreddits in which a particular user commonly posts? If you answered "yes" to all three of these questions, then *usaidwat* is the gem for you!
-
-h2(#install). Installation
-
-*usaidwat* can be installed via RubyGems:
-
-bc. $ gem install usaidwat
-
-h2(#usage). Usage
-
-A @usaidwat@ binary is installed with the gem. @usaidwat@ will analyze a user's last 100 comments and provide statistics.
-
-To list a count of subreddits in which a user has posted, simply plug in a username:
-
-bc. # usaidwat jedberg
-
-You will see output like the following:
-
-bc. jedberg
--------
-blog                  26
-funny                 15
-unitedkingdom         12
-Random_Acts_Of_Pizza  11
-AskReddit             7
-entertainment         4
-politics              4
-TheoryOfReddit        3
-Frugal                3
-technology            2
-fffffffuuuuuuuuuuuu   2
-wikipedia             2
-pics                  1
-programming           1
-sex                   1
-space                 1
-movies                1
-geek                  1
-comics                1
-videos                1
-apple                 1
-
-Which indicates that jedberg has commented in @/r/funny@ 15 times (out of his last 100 comments).
-
-To see the comments for a specific subreddit, tack on that subreddit:
-
-bc. $ usaidwat jedberg funny
-
-All the comments for the given subreddit will be printed.

data/lib/usaidwat/reddit.rb

@@ -1,136 +0,0 @@
-require 'fileutils'
-require 'net/http'
-require 'time'
-
-require 'rubygems'
-require 'json'
-
-
-class Hash
-  def to_query
-    data = keys.inject([]) { |parts, key| parts << [URI.encode(key.to_s), URI.encode(self[key].to_s)] }
-    data.map{ |t| t.join '=' }.join '&'
-  end
-end
-
-module USaidWat
-  class RedditUser
-    COMMENT_COUNT = 100
-    COMMENTS_PER_PAGE = 25
-    CACHE_AGE = 300
-    
-    attr_reader :username
-    
-    def initialize(username)
-      @username = username
-    end
-    
-    def profile_url
-      "http://www.reddit.com/user/#{username}"
-    end
-    
-    def comments_url
-      "#{profile_url}/comments"
-    end
-    
-    def last_update
-      return Time.at 0 unless File.exists? cache_timestamp_file
-      Time.parse File.open(cache_timestamp_file).read.chomp
-    end
-    
-    def update_cache(force=false)
-      FileUtils.mkdir_p cache_dir
-      
-      is_outdated = Time.now - last_update > CACHE_AGE
-      if force or is_outdated
-        FileUtils.rm_rf cache_dir
-        FileUtils.mkdir_p cache_dir
-        
-        comments = Array.new
-        after = nil
-        pages = COMMENT_COUNT / COMMENTS_PER_PAGE
-        pages.times do |i|
-          query = i == 0 ? '' : {:count => COMMENTS_PER_PAGE, :after => after}.to_query
-          url = "#{comments_url}.json?#{query}"
-          resp = Net::HTTP.get_response 'www.reddit.com', url
-          unless resp.code.to_i == 200
-            STDERR.puts "Could not retrieve comments: #{resp.message}"
-            return nil
-          end
-          resp = JSON.parse resp.body
-          if resp.key? 'error'
-            STDERR.puts "Could not retrieve comments: #{resp['error'] || 'Unknown error'}"
-            return nil
-          end
-          comments += resp['data']['children']
-          after = resp['data']['after']
-        end
-        cache_comments comments
-      end
-    end
-    
-    def retrieve_comments
-      update_cache
-      subreddits = Hash.new { |h,k| h[k] = 0 }
-      Dir.chdir(comments_dir) do
-        Dir['*'].each do |sr|
-          next unless File.directory? sr
-          Dir["#{sr}/*"].each { |f| subreddits[sr] += 1 }
-        end
-      end
-      subreddits.sort { |a,b| a[0].downcase <=> b[0].downcase }
-    rescue Errno::ENOENT
-      nil
-    end
-    
-    def comments_for_subreddit(subreddit)
-      update_cache
-      comments = []
-      subreddit_dir = File.join comments_dir, subreddit
-      return nil unless File.exists? subreddit_dir
-      Dir.chdir(subreddit_dir) do
-        Dir['*'].each do |f|
-          path = File.join subreddit_dir, f
-          comment = File.open(path).read.chomp
-          comments << comment
-        end
-      end
-      comments
-    end
-    
-    def to_s
-      "Reddit user: #{username}"
-    end
-    
-    private
-      def cache_dir
-        File.join USaidWat::BASE_CACHE_DIR, username
-      end
-
-      def cache_timestamp_file
-        File.join cache_dir, 'updated'
-      end
-
-      def comments_dir
-        File.join cache_dir, 'comments'
-      end
-      
-      def cache_comments(comments)
-        comments.each do |c|
-          cid = c['data']['id']
-          sr = c['data']['subreddit']
-          body = c['data']['body']
-          parent_cache_dir = subreddit_directory! sr
-          cache_file = File.join parent_cache_dir, cid
-          File.open(cache_file, 'w') { |f| f.write body }
-        end
-        File.open(cache_timestamp_file, 'w') { |f| f.write Time.now }
-      end
-      
-      def subreddit_directory!(subreddit)
-        path = File.join comments_dir, subreddit
-        FileUtils.mkdir_p path
-        path
-      end
-  end
-end

data/lib/usaidwat/utils.rb

@@ -1,31 +0,0 @@
-class Array
-  def longest_subreddit
-    max_by { |s| s.first.length }.first
-  end
-end
-
-# Inspired by: http://nex-3.com/posts/73-git-style-automatic-paging-in-ruby
-def run_pager
-  return if RUBY_PLATFORM =~ /win32/
-  return unless STDOUT.tty?
-  
-  read, write = IO.pipe
-  
-  unless Kernel.fork
-    STDOUT.reopen(write)
-    STDERR.reopen(write) if STDERR.tty?
-    read.close
-    write.close
-    return
-  end
-  
-  STDIN.reopen(read)
-  read.close
-  write.close
-  
-  #ENV['LESS'] = 'FSRX'
-  
-  Kernel.select [STDIN]
-  pager = ENV['PAGER'] || 'less'
-  exec pager rescue exec '/bin/sh', '-c', pager
-end

data/spec/utils_spec.rb

@@ -1,9 +0,0 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'usaidwat/utils'
-
-describe 'USaidWat::Array' do
-  it 'should return the longest string from a list of tuples' do
-    list = [['Short Name', 0], ['Really Long Name', 1], ['Medium Name', 2]]
-    list.longest_subreddit.should == 'Really Long Name'
-  end
-end