rst 0.2.0 → 0.2.1

data/lib/rst.rb

@@ -3,9 +3,8 @@ require "rst/cli"
 require "rst/status"
 require "rst/client"
 require "rst/user"
+require "rst/user_presenter"
 
 module Rst
-
-
-
+  class InvalidUser < StandardError; end
 end

data/lib/rst/cli.rb

@@ -31,7 +31,7 @@ module Rst
       if users.empty?
         ["No users that match."]
       else
-        users
+        users.map{|u| Rst::UserPresenter.new(u) }
       end
     end
 

data/lib/rst/user.rb

@@ -2,31 +2,19 @@ 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
+    def initialize(params)
+      @username    = cleanup_whitespace(params.fetch(:username))
+      if @username == ""
+        raise Rst::InvalidUser.new("A non-blank username is required.")
       end
-    end
 
-    def display_description
-      if @description.nil? || @description == ""
-        "No bio"
-      else
-        @description
+      @path        = cleanup_whitespace(params.fetch(:path))
+      if @path == ""
+        raise Rst::InvalidUser.new("A non-blank user path is required.")
       end
+
+      @full_name   = cleanup_whitespace(params.fetch(:full_name, ""))
+      @description = cleanup_whitespace(params.fetch(:description, ""))
     end
 
     def self.parse(li)
@@ -34,7 +22,7 @@ module Rst
         :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"]
+        :path        => li.xpath(".//a[contains(@rel, 'user')]/@href").text
       )
     end
 

data/lib/rst/user_presenter.rb

@@ -0,0 +1,27 @@
+module Rst
+  class UserPresenter
+    def initialize(user)
+      @user = user
+    end
+
+    def to_s
+      "#{@user.username} (#{full_name}): #{description}"
+    end
+
+    def full_name
+      if @user.full_name == ""
+        "No full name"
+      else
+        @user.full_name
+      end
+    end
+
+    def description
+      if @user.description == ""
+        "No bio"
+      else
+        @user.description
+      end
+    end
+  end
+end

data/lib/rst/version.rb

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

data/rst.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Rst::VERSION
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('aruba', '~> 0.4.11')
-  gem.add_development_dependency('minitest', '~> 2.12.1')
+  gem.add_development_dependency('minitest', '~> 3.2.0')
   gem.add_development_dependency('mocha', '~> 0.11.3')
   gem.add_development_dependency('rake','~> 0.9.2')
   gem.add_development_dependency('vcr', '~> 2.1.1')

data/spec/user_spec.rb

@@ -0,0 +1,125 @@
+require 'minitest/autorun'
+require 'rst'
+
+describe "user" do
+  describe "Rst::User.new" do
+    it "requires a non-blank username" do
+      lambda { Rst::User.new(:path => "foo") }.must_raise(KeyError)
+      lambda { Rst::User.new(:path => "foo", :username => "") }.must_raise(
+        Rst::InvalidUser
+      )
+    end
+
+    it "requires a non-blank path" do
+      lambda { Rst::User.new(:username => "foo") }.must_raise(KeyError)
+      lambda { Rst::User.new(:username => "foo", :path => "") }.must_raise(
+        Rst::InvalidUser
+      )
+    end
+
+    it "does not require a full_name" do
+      Rst::User.new(
+        :username => "foo",
+        :path     => "bar"
+      ).full_name.must_equal("")
+
+      Rst::User.new(
+        :username  => "foo",
+        :path      => "bar",
+        :full_name => ""
+      ).full_name.must_equal("")
+    end
+
+    it "does not require a description" do
+      Rst::User.new(
+        :username => "foo",
+        :path     => "bar"
+      ).description.must_equal("")
+
+      Rst::User.new(
+        :username    => "foo",
+        :path        => "bar",
+        :description => ""
+      ).description.must_equal("")
+    end
+  end
+
+  describe "Rst::User.parse" do
+    it "can parse a status from an li that conforms to the ALPS spec" do
+      li = Nokogiri::HTML.parse(
+        <<-HERE
+        <li class='even user'>
+          <div class='info'>
+            <a href='/users/Carols10cents' rel='user messages'>
+              <span class='user-name'>
+                Carol Nichols
+              </span>
+              (<span class="user-text">Carols10cents</span>)
+            </a>
+            <div class='bio'>
+              <span class='description'>
+                 I love Ruby
+              </span>
+            </div>
+          </div>
+        </li>
+        HERE
+      )
+      user = Rst::User.parse(li)
+      user.username.must_equal("Carols10cents")
+      user.path.must_equal("/users/Carols10cents")
+      user.full_name.must_equal("Carol Nichols")
+      user.description.must_equal("I love Ruby")
+    end
+
+    it "does not raise an error if optional elements are not present" do
+      li = Nokogiri::HTML.parse(
+        <<-HERE
+        <li class='even user'>
+          <div class='info'>
+            <a href='/users/Carols10cents' rel='user messages'>
+              <span class="user-text">Carols10cents</span>
+            </a>
+          </div>
+        </li>
+        HERE
+      )
+      user = Rst::User.parse(li)
+      user.username.must_equal("Carols10cents")
+      user.path.must_equal("/users/Carols10cents")
+      user.full_name.must_equal("")
+      user.description.must_equal("")
+    end
+
+    it "raises an error if the required user link is not present" do
+      li = Nokogiri::HTML.parse(
+        <<-HERE
+        <li class='even user'>
+          <div class='info'>
+            <a href='/users/Carols10cents' rel='messages'>
+              <span class="user-text">Carols10cents</span>
+            </a>
+          </div>
+        </li>
+        HERE
+      )
+
+      lambda { user = Rst::User.parse(li) }.must_raise(Rst::InvalidUser)
+    end
+
+    it "raises an error if the required username is not present" do
+      li = Nokogiri::HTML.parse(
+        <<-HERE
+        <li class='even user'>
+          <div class='info'>
+            <a href='/users/Carols10cents' rel='user messages'>
+              <span>Carols10cents</span>
+            </a>
+          </div>
+        </li>
+        HERE
+      )
+      lambda { user = Rst::User.parse(li) }.must_raise(Rst::InvalidUser)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rst
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,7 @@ files:
 - lib/rst/client.rb
 - lib/rst/status.rb
 - lib/rst/user.rb
+- lib/rst/user_presenter.rb
 - lib/rst/version.rb
 - rst.gemspec
 - spec/cli_spec.rb
@@ -177,6 +178,7 @@ files:
 - spec/data/vcr_cassettes/successful_messages_user.yml
 - spec/data/vcr_cassettes/users_search_with_results.yml
 - spec/status_spec.rb
+- spec/user_spec.rb
 - spec/vcr_setup.rb
 homepage: https://github.com/clnclarinet/rst
 licenses: []
@@ -192,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3724563502227882874
+      hash: 3488589923041494923
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3724563502227882874
+      hash: 3488589923041494923
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -224,4 +226,5 @@ test_files:
 - spec/data/vcr_cassettes/successful_messages_user.yml
 - spec/data/vcr_cassettes/users_search_with_results.yml
 - spec/status_spec.rb
+- spec/user_spec.rb
 - spec/vcr_setup.rb