mitchellh-rubyuw 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/myuw/errors.rb

@@ -0,0 +1,18 @@
+# General purpose errors used within MyUW
+
+class MyUW
+  class NotLoggedInError < StandardError; end
+  
+  # A generic error to capture strange invalid HTML
+  # results. These errors can typically be used to 
+  # find edge cases of HTML (such as maintenance
+  # pages and so on) in MyUW
+  class InvalidPageError < StandardError
+    attr_reader :page
+    
+    def initialize(page, msg=nil)
+      @page = page
+      super(msg)
+    end
+  end
+end

data/lib/myuw/session.rb

@@ -28,7 +28,7 @@ class MyUW
       # Make sure that email and password are filled out or this is
       # useless
       if @email.nil? || @password.nil?
-        raise("Email and password weren't specified for MyUW session")
+        raise ArgumentError.new("Email and password weren't specified for MyUW session")
       end
       
       # Log out first
@@ -37,7 +37,7 @@ class MyUW
       # Go to the MyUW page and get to the login form
       login_page = get_login_page
       login_form = login_page.form_with(:name => 'query')
-      raise("Login form was not found on the MyUW page") if login_form.nil?
+      raise InvalidPageError.new(login_page, "Login form was not found on the MyUW page") if login_form.nil?
       login_form.user = @email
       login_form.pass = @password
       relay_page = login_form.submit()
@@ -67,7 +67,7 @@ class MyUW
       
       # Click the login button to get to the forum
       entry_button = home.search("//input[@type='submit' and @value='Log in with your UW NetID']")
-      raise("Failed to find the log in button") if entry_button.empty?
+      raise InvalidPageError.new(home, "Failed to find the log in button") if entry_button.empty?
       
       home
     end

data/lib/myuw/sln.rb

@@ -29,9 +29,9 @@ class MyUW
     
     # Fetches the information for the given SLN. 
     def fetch_data
-      raise("SLN not set.") if @sln.nil?
-      raise("Term not set.") if @term.nil?
-      raise("User must be logged in to fetch SLN data") unless @myuw.logged_in?
+      raise ArgumentError.new("SLN not set.") if @sln.nil?
+      raise ArgumentError.new("Term not set.") if @term.nil?
+      raise NotLoggedInError.new("User must be logged in to fetch SLN data") unless @myuw.logged_in?
       
       # Request the actual page
       page = get_sln_page
@@ -61,9 +61,9 @@ class MyUW
     def get_sln_page
       page = @myuw.browser.get("https://sdb.admin.washington.edu/timeschd/uwnetid/sln.asp?QTRYR=#{@term}&SLN=#{@sln}")
       if page.uri.to_s == "http://www.washington.edu/students/timeschd/badrequest.html"
-        raise("Attempted to fetch SLN data too soon.")
+        raise RequestSLNTooSoonError.new("Attempted to fetch SLN data too soon.")
       elsif page.body.to_s =~ /SLN: #{@sln} does not exist./
-        raise("SLN does not exist.")
+        raise InvalidSLNError.new("SLN does not exist.")
       end
       
       page
@@ -112,4 +112,9 @@ class MyUW
       @data[:notes] = info_nodes[0].inner_text.strip
     end
   end
+  
+  #
+  # Exceptions
+  class InvalidSLNError < StandardError; end
+  class RequestSLNTooSoonError < StandardError; end  
 end

data/lib/myuw.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rubygems'
 require 'mechanize'
 
+require 'myuw/errors'
 require 'myuw/session'
 require 'myuw/sln'
 

data/rubyuw.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyuw}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/myuw.rb",
+     "lib/myuw/errors.rb",
      "lib/myuw/session.rb",
      "lib/myuw/sln.rb",
      "rubyuw.gemspec",

data/test/live/sln_test.rb

@@ -48,7 +48,7 @@ class LiveSLNTest < Test::Unit::TestCase
       
       @sln.sln = @sln.sln # Force reload
       
-      assert_raise RuntimeError do
+      assert_raise MyUW::RequestSLNTooSoonError do
         @sln.course
       end
     end
@@ -56,7 +56,7 @@ class LiveSLNTest < Test::Unit::TestCase
     should "raise an error for an invalid SLN/quarter" do
       @sln.sln = 91919 # Tested to not exist
       
-      assert_raise RuntimeError do
+      assert_raise MyUW::InvalidSLNError do
         @sln.course
       end
     end

data/test/mocked/fixture_pages/sln_does_not_exist.html

@@ -52,7 +52,7 @@
 </tr>
 </table>
 <H1>Current Section Status - Autumn Quarter 2009</H1>
-<B>SLN: 91919 does not exist.</B><BR><BR>
+<B>SLN: 123456 does not exist.</B><BR><BR>
 
 <P></P>
 <table border='0' cellpadding='0' cellspacing='0' align='center' width='100%'>

data/test/mocked/session_test.rb

@@ -20,7 +20,7 @@ class SessionTest < Test::Unit::TestCase
     should "raise an exception if no email/password are set" do
       @session.email = @session.password = nil
 
-      assert_raise RuntimeError do
+      assert_raise ArgumentError do
         @session.login
       end
     end
@@ -28,7 +28,7 @@ class SessionTest < Test::Unit::TestCase
     should "raise an exception if the login form is not found" do
       stub_get_login_page(@myuw, "no_form_login")
       
-      assert_raise RuntimeError do
+      assert_raise MyUW::InvalidPageError do
         @session.login
       end
     end
@@ -57,7 +57,7 @@ class SessionTest < Test::Unit::TestCase
       fixture_page = @browser.get(path_to_html("no_login_button"))
       @browser.expects(:get).with("http://myuw.washington.edu").once.returns(fixture_page)
       
-      assert_raise RuntimeError do
+      assert_raise MyUW::InvalidPageError do
         @session.logged_in?
       end
     end

data/test/mocked/sln_test.rb

@@ -17,30 +17,47 @@ class MockedSlnTest < Test::Unit::TestCase
       assert_equal sln_obj.term, "AUT+2009"
     end
     
-    should "raise a RuntimeError if there is no SLN set" do
+    should "raise a NotLoggedInError if not logged in and requesting an SLN" do
+      @myuw.stubs(:logged_in?).returns(false)
+      
+      assert_raise MyUW::NotLoggedInError do
+        @sln.course
+      end
+    end
+    
+    should "raise a ArgumentError if there is no SLN set" do
       @sln.sln = nil
       assert @sln.term # Sanity
       
-      assert_raise RuntimeError do
+      assert_raise ArgumentError do
         @sln.course
       end
     end
     
-    should "raise a RuntimeError if there is no term set" do
+    should "raise a ArgumentError if there is no term set" do
       @sln.term = nil
       assert @sln.sln
       
-      assert_raise RuntimeError do
+      assert_raise ArgumentError do
         @sln.course
       end
     end
     
-    should "raise a RuntimeError if an SLN is requested again too soon" do
+    should "raise a InvalidSLNError if an invalid SLN is requested" do
+      fixture_page = @browser.get(path_to_html("sln_does_not_exist"))
+      @browser.expects(:get).returns(fixture_page)
+      
+      assert_raise MyUW::InvalidSLNError do
+        @sln.get_sln_page
+      end
+    end    
+    
+    should "raise a RequestSLNTooSoonError if an SLN is requested again too soon" do
       fixture_page = @browser.get(path_to_html("bad_request"))
       fixture_page.uri = "http://www.washington.edu/students/timeschd/badrequest.html"
       @browser.expects(:get).with("https://sdb.admin.washington.edu/timeschd/uwnetid/sln.asp?QTRYR=#{@sln.term}&SLN=#{@sln.sln}").returns(fixture_page)
     
-      assert_raise RuntimeError do
+      assert_raise MyUW::RequestSLNTooSoonError do
         @sln.get_sln_page
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mitchellh-rubyuw
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -36,6 +36,7 @@ files:
 - Rakefile
 - VERSION
 - lib/myuw.rb
+- lib/myuw/errors.rb
 - lib/myuw/session.rb
 - lib/myuw/sln.rb
 - rubyuw.gemspec