rubyuw 0.99.5 → 0.99.6

data/VERSION

@@ -1 +1 @@
-0.99.5
+0.99.6

data/lib/rubyuw/curriculum.rb

@@ -121,7 +121,7 @@ module RubyUW
         
         # Ugly regex to match the <pre> text to extract the proper information for the
         # course.
-        raise Errors::CourseListingMatchError.new(pre_text) unless pre_text =~ /^((IS\s+)|(Restr\s+))?>?([0-9]+)\s([A-Z]{1,2})\s(.+?)\s(.+)/i #\s(([A-Z]+)\s(.+?))\s(([A-Z]+)\s([0-9]+))/i
+        raise Errors::CourseListingMatchError.new(pre_text) unless pre_text =~ /^((IS\s+)|(Restr\s+))?>?([0-9]+)\s([A-Z0-9]{1,2})\s(.+?)\s(.+)/i #\s(([A-Z]+)\s(.+?))\s(([A-Z]+)\s([0-9]+))/i
 
         {
           :sln => $4.to_s,

data/rubyuw.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyuw}
-  s.version = "0.99.5"
+  s.version = "0.99.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto"]
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
      "test/mocked/errors_test.rb",
      "test/mocked/fixture_pages/bad_request.html",
      "test/mocked/fixture_pages/curric_courses.html",
+     "test/mocked/fixture_pages/curric_edge_win2010_engl.html",
      "test/mocked/fixture_pages/curric_no_courses.html",
      "test/mocked/fixture_pages/curric_no_curric_found.html",
      "test/mocked/fixture_pages/logged_in_relay.html",

data/test/mocked/curriculum_test.rb

@@ -260,5 +260,36 @@ class CurriculumTest < Test::Unit::TestCase
         }
       end
     end
+    
+    # Basically the "edge cases" are added to whenever a CourseListingMatchError is
+    # experienced in the real world
+    context "extracting a course listing edge cases" do
+      context "WIN2010 13066" do
+        setup do
+          @page = RubyUW::Base.connection.get(path_to_html("curric_edge_win2010_engl"))
+          
+          @listing = {
+            :sln => "13066",
+            :section => "A2"
+          }
+        end
+        
+        should "properly parse the entire curriculum" do
+          assert_nothing_raised {
+            RubyUW::Curriculum.extract_courses(@page)
+          }
+        end
+        
+        should "properly parse the edge listing" do
+          related = RubyUW::Curriculum.extract_courses(@page)
+          sln_obj = related.values.flatten.detect { |course| course[:sln] == @listing[:sln] }
+
+          assert sln_obj
+          @listing.each do |k,v|
+            assert_equal v, sln_obj[k]
+          end
+        end
+      end
+    end
   end
 end