rst 0.1.1 → 0.2.0

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.rvmrc
 .DS_Store
 .yardoc
 coverage

data/README.md

@@ -20,6 +20,8 @@ Current Functionality
 ---------------------
 
 * Read rstat.us world statuses without being logged in.
+* Read a particular user's statuses without being logged in.
+* Search for users whose username contains a pattern.
 
 Future functionality
 --------------------

data/bin/rst

@@ -1,49 +1,41 @@
 #!/usr/bin/env ruby
-# 1.9 adds realpath to resolve symlinks; 1.8 doesn't
-# have this method, so we add it so we get resolved symlinks
-# and compatibility
-unless File.respond_to? :realpath
-  class File #:nodoc:
-    def self.realpath path
-      return realpath(File.readlink(path)) if symlink?(path)
-      path
-    end
-  end
-end
-$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
-
-require 'gli'
 require 'rst'
+require 'optparse'
 
-include GLI
+options = {}
 
-program_desc 'A command line interface for rstat.us'
+rst_parser = OptionParser.new do |opts|
+  opts.banner = "A command line interface for rstat.us.
 
-version Rst::VERSION
+usage: rst [options] command
 
-desc 'Display the version and exit.'
-switch [:v, :version]
+Commands:
+    help [COMMAND]         Get more help for a partiular command.
+    user [USERNAME]        See one particular user's updates.
+    world                  See the latest updates that anyone has made.
+    users-search [PATTERN] Search for usernames that match the pattern.
 
-desc 'Get the latest statuses from the whole rstat.us world'
-command :world do |c|
-  c.action do |global_options, options, args|
-    puts Rst::CLI.world.join("\n\n")
+Options:"
+
+  opts.on("-n NUMBER", "The number of statuses to show") do |n|
+    options[:num] = n.to_i
   end
-end
 
-pre do |global, command, options, args|
-  if global[:v]
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  opts.on_tail("-v", "--version", "Show version") do
     puts "version #{Rst::VERSION}"
-    exit! 0
+    exit
   end
-  true
-end
 
-post do |global, command, options, args|
 end
 
-on_error do |exception|
-  true
+rst_parser.parse!
+if ARGV.empty?
+  puts rst_parser.help
+else
+  Rst::CLI.run(options, ARGV)
 end
-
-exit GLI.run(ARGV)

data/features/help.feature

@@ -22,5 +22,5 @@ Feature: Help text
       |--help|
     And the output should contain:
       """
-      usage: rst [global options] command
+      usage: rst [options] command
       """

data/features/read_one_user.feature

@@ -0,0 +1,14 @@
+Feature: read [username]
+  In order to read one user's updates on rstat.us
+  I want `rst user [username]` to return all updates by just that user
+  So that I can see what they are up to and if I want to follow them or not
+
+  Scenario: read a particular user
+    When I run `rst user carols10cents`
+    Then the exit status should be 0
+    And the output should contain 20 updates
+
+  Scenario: no argument
+    When I run `rst user`
+    Then the exit status should be 1
+    And the output should contain "Username is required."

data/features/step_definitions/rst_steps.rb

@@ -4,7 +4,20 @@ Then /^the output should contain (\d+) updates$/ do |num|
   num = num.to_i
 
   lines = all_output.split("\n")
-  non_blank_lines = lines.select{ |line| line.match(/\S+: \S+/) }
+  update_lines = lines.select{ |line| line.match(/\S+: \S+/) }
 
-  non_blank_lines.size.should == num
+  update_lines.size.should == num
 end
+
+Then /^the output should contain (\d+) users$/ do |num|
+  num = num.to_i
+
+  lines = all_output.split("\n")
+  user_lines = lines.select{ |line| line.match(/\S+ \(.+\): \S+/) }
+
+  user_lines.size.should == num
+end
+
+Then /^the output should be the version$/ do
+  all_output.should match(/^version \d+\.\d+.\d+$/)
+end

data/features/support/env.rb

@@ -8,7 +8,7 @@ Before do
   @puts = true
   @original_rubylib = ENV['RUBYLIB']
   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
-  @aruba_timeout_seconds = 5
+  @aruba_timeout_seconds = 10
 end
 
 After do

data/features/users_search.feature

@@ -0,0 +1,19 @@
+Feature: users-search [pattern]
+  If I don't know someone's username exactly
+  I want to be able to look it up with a pattern
+
+  Scenario: search that returns results
+    When I run `rst users-search carols10cent`
+    Then the exit status should be 0
+    And the output should contain 2 users
+
+  Scenario: search that does not return results
+    When I run `rst users-search carols10centz`
+    Then the exit status should be 0
+    And the output should contain 0 users
+    And the output should contain "No users that match."
+
+  Scenario: no argument
+    When I run `rst users-search`
+    Then the exit status should be 1
+    And the output should contain "Username search pattern is required."

data/features/version.feature

@@ -0,0 +1,9 @@
+Feature: Version
+  In order to know what version of rst I'm using
+  I want rst to print that out
+  So I don't have to look it up in the code
+
+  Scenario: rst --version
+    When I run `rst --version`
+    Then the exit status should be 0
+    And the output should be the version

data/features/world.feature

@@ -6,4 +6,14 @@ Feature: world
   Scenario: default world
     When I run `rst world`
     Then the exit status should be 0
-    And the output should contain 20 updates
+    And the output should contain 20 updates
+
+  Scenario: more updates
+    When I run `rst world -n 35`
+    Then the exit status should be 0
+    And the output should contain 35 updates
+
+  Scenario: fewer updates
+    When I run `rst world -n 5`
+    Then the exit status should be 0
+    And the output should contain 5 updates

data/lib/rst.rb

@@ -2,6 +2,7 @@ require "rst/version"
 require "rst/cli"
 require "rst/status"
 require "rst/client"
+require "rst/user"
 
 module Rst
 

data/lib/rst/cli.rb

@@ -2,16 +2,57 @@ module Rst
   module CLI
     extend self
 
-    def world(num = 20)
+    def run(options, args = [])
+      command      = args[0]
+      rest_of_args = args[1, args.length]
+
+      results      = send(command.gsub(/-/, "_"), options, rest_of_args)
+
+      puts results.join("\n\n")
+    rescue Exception => e
+      puts e.message
+      exit 1
+    end
+
+    def world(params = {}, args = [])
+      statuses(:messages_all, params)
+    end
+
+    def user(params = {}, args = [])
+      username = args[0]
+      raise "Username is required." unless username
+      statuses(:messages_user, params.merge(:username => username))
+    end
+
+    def users_search(params = {}, args = [])
+      search_pattern = args[0]
+      raise "Username search pattern is required." unless search_pattern
+      users = Rst::Client.users_search(:pattern => search_pattern)
+      if users.empty?
+        ["No users that match."]
+      else
+        users
+      end
+    end
+
+    private
+
+    def statuses(which, params = {})
       statuses = []
-      page = 0
+      page     = 0
+      num      = params[:num] || 20
 
       while statuses.size < num do
         page += 1
-        statuses.concat Rst::Client.messages_all(:page => page)
+        messages = Rst::Client.send(which, params.merge(:page => page))
+
+        break if messages.empty?
+
+        statuses.concat messages
       end
 
       statuses.take(num)
     end
+
   end
 end

data/lib/rst/client.rb

@@ -5,29 +5,100 @@ module Rst
   module Client
     extend self
 
-    def base_uri
-      "http://rstat.us"
-    end
-
     def messages_all(params = {:page => 1})
-      root_response = Nokogiri::HTML.parse(
-        Typhoeus::Request.get(base_uri).body
+      messages_all_path = find_a_in(root_response, :rel => "messages-all")
+      messages_all_uri = resolve_relative_uri(
+        :relative => messages_all_path,
+        :base     => base_uri
       )
 
-      link = root_response.xpath(
-        "//a[contains(@rel, 'messages-all')]"
-      ).first
-
-      url = (URI(base_uri) + URI(link["href"])).to_s
+      all_response = get_body(messages_all_uri)
+      current_uri = messages_all_uri
 
-      all_response = Nokogiri::HTML.parse(
-        Typhoeus::Request.get(url).body
-      )
+      (params[:page] - 1).times do
+        next_page_path = find_a_in(all_response, :rel => "next")
+        current_uri = resolve_relative_uri(
+          :relative => next_page_path,
+          :base     => current_uri
+        )
+        all_response = get_body(current_uri)
+      end
 
       messages = all_response.css("div#messages ul.all li").map { |li|
                    Rst::Status.parse(li)
                  }
+    end
+
+    def messages_user(params = {})
+      search_results = users_search(:pattern => params[:username])
+
+      result = search_results.detect { |sr|
+        sr.username.match(/^#{params[:username]}$/i)
+      }
+
+      user_uri = resolve_relative_uri(
+        :relative => result.path,
+        :base     => base_uri
+      )
+
+      user_response = get_body(user_uri)
+
+      message_nodes = user_response.css("div#messages ul.messages-user li")
+      message_nodes.map { |li| Rst::Status.parse(li) }
+    end
+
+    def users_search(params = {})
+      users_search_path = find_a_in(root_response, :rel => "users-search")
+      users_search_uri = resolve_relative_uri(
+        :relative => users_search_path,
+        :base     => base_uri
+      )
+
+      users_search_response = get_body(users_search_uri)
+
+      form = users_search_response.css("form.users-search").first
+      search_uri = resolve_relative_uri(
+        :relative => form["action"],
+        :base     => users_search_uri
+      )
 
+      user_lookup_query = "#{search_uri}?search=#{params[:pattern]}"
+
+      user_lookup_response = get_body(user_lookup_query)
+
+      search_results = user_lookup_response.css("div#users ul.search li.user")
+      search_results.map { |li| Rst::User.parse(li) }
+    end
+
+    private
+
+    def find_a_in(html, params = {})
+      raise "no rel specified" unless params[:rel]
+
+      link = html.xpath(
+        ".//a[contains(@rel, '#{params[:rel]}')]"
+      ).first["href"]
+    end
+
+    def root_response
+      get_body(base_uri)
+    end
+
+    def resolve_relative_uri(params = {})
+      raise "no relative uri specified" unless params[:relative]
+      raise "no base uri specified" unless params[:base]
+
+      (URI(params[:base]) + URI(params[:relative])).to_s
+    end
+
+    def base_uri
+      "http://rstat.us"
+    end
+
+    def get_body(uri)
+      Nokogiri::HTML.parse(
+        Typhoeus::Request.get(uri).body
+      )
     end
 
     def hydra

data/lib/rst/user.rb

@@ -0,0 +1,49 @@
+module Rst
+  class User
+    attr_reader :username, :full_name, :description, :path
+
+    def initialize(params = {})
+      @username    = cleanup_whitespace(params[:username])
+      @full_name   = cleanup_whitespace(params[:full_name])
+      @description = cleanup_whitespace(params[:description])
+      @path        = cleanup_whitespace(params[:path])
+    end
+
+    def to_s
+      "#{@username} (#{display_full_name}): #{display_description}"
+    end
+
+    def display_full_name
+      if @full_name.nil? || @full_name == ""
+        "No full name"
+      else
+        @full_name
+      end
+    end
+
+    def display_description
+      if @description.nil? || @description == ""
+        "No bio"
+      else
+        @description
+      end
+    end
+
+    def self.parse(li)
+      new(
+        :username    => li.css("span.user-text").text,
+        :full_name   => li.css("span.user-name").text,
+        :description => li.css("span.description").text,
+        :path        => li.xpath(".//a[contains(@rel, 'user')]").first["href"]
+      )
+    end
+
+    private
+
+    def cleanup_whitespace(html_text)
+      if html_text
+        html_text.gsub(/\n/, ' ').squeeze(" ").strip
+      end
+    end
+  end
+end

data/lib/rst/version.rb

@@ -1,3 +1,3 @@
 module Rst
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/rst.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake','~> 0.9.2')
   gem.add_development_dependency('vcr', '~> 2.1.1')
 
-  gem.add_dependency('gli', '~> 1.6.0')
   gem.add_dependency('typhoeus', '~> 0.3.3')
   gem.add_dependency('nokogiri', '~> 1.5.2')
 end