mitchellh-rubyuw 0.7.0 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.2

data/lib/myuw/curriculum_enrollment.rb

@@ -0,0 +1,110 @@
+class MyUW
+  # = Synopsis
+  # Gets information regarding enrollment within a specific
+  # subject.
+  class CurriculumEnrollment
+    attr_reader :term
+    attr_reader :curriculum
+    attr_accessor :myuw
+    attr_reader :data
+    
+    def initialize(myuw)
+      @myuw = myuw
+      @term = nil
+      @data = nil
+      @curriculum = nil
+    end
+    
+    # Custom setter for SLN to reset data
+    def curriculum=(value)
+      @curriculum = value
+      @data = nil
+    end
+    
+    # Custom setter for term to reset data
+    def term=(value)
+      @term = value
+      @data = nil
+    end
+    
+    # Fetches the information for the given SLN. 
+    def fetch_data
+      raise ArgumentError.new("Curriculum not set.") if @curriculum.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_dept_page
+
+      # Get the actual course information
+    end
+
+    # Get data for a specific SLN
+    def data_by_sln(sln, reload = false)
+      fetch_data if @data.nil? || reload
+      @data[sln]
+    end
+    
+    # Gets the SLN info page for the SLN and term, raising
+    # an exception if it is requested too soon
+    def get_dept_page
+      page = @myuw.browser.get("https://sdb.admin.washington.edu/timeschd/uwnetid/tsstat.asp?QTRYR=#{@term}&CURRIC=#{@curriculum}")
+      if page.body.to_s =~ /No sections found for #{@curriculum}./
+        raise InvalidCurriculumError.new("Curriculum does not exist.")
+      end
+      
+      page
+    end
+    
+    # Gets and stores all course data
+    def get_all_courses_data(page)
+      nodes = page.search('//table//tr[count(th)>1 and @bgcolor="#d0d0d0"]//following-sibling::tr')
+      raise InvalidPageError.new("Couldn't find any courses listed.") if nodes.empty?
+      
+      @data = {}
+      nodes.each do |node|
+        node_data = get_course_data(node)
+        @data[node_data[:sln]] = node_data
+      end
+    end
+    
+    # Gets a single course row's data
+    def get_course_data(row)
+      nodes = row.search('td')
+      raise InvalidPageError.new("Couldn't find course information for a single row.") if nodes.empty?
+      
+      data_keys = [:sln, :course, :section, :type, :title, :current_enrollment, :limit_enrollment,
+          :room_capacity, :space_available, nil, :notes]
+      
+      data = extract_info(data_keys, nodes)
+      raise InvalidPageError.new("Failed to extract data for single row.") if !data
+      
+      data
+    end
+    
+    # Extracts course information from each node and
+    # stores it as the proper key in the @data variable
+    def extract_info(keys, nodes)
+      return false if nodes.empty?
+      
+      data = {}
+      nodes.each_with_index do |node, i|
+        # Make sure we have keys left still
+        if i < keys.length then
+          data_key = keys[i]
+          
+          # If the key is nil, we skip this node
+          unless data_key.nil?
+            data[data_key] = node.inner_text.strip.gsub("\302\240", "")
+          end
+        end
+      end
+      
+      data
+    end
+  end
+  
+  #
+  # Exceptions
+  class InvalidCurriculumError < StandardError; end
+end

data/lib/myuw/session.rb

@@ -20,7 +20,7 @@ class MyUW
     def logged_in?
       home = get_bare_login_page
       relay_page = home.form_with(:name => 'f').submit()
-      !relay_page.search("span.greetingw").empty?
+      !relay_page.search("//div[@class='main_search']").empty?
     end
     
     # Logs a user in using the given email and password

data/rubyuw.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rubyuw}
-  s.version = "0.7.0"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto"]
-  s.date = %q{2009-07-11}
+  s.date = %q{2009-09-09}
   s.description = %q{TODO}
   s.email = %q{mitchell.hashimoto@gmail.com}
   s.extra_rdoc_files = [
@@ -18,6 +21,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/myuw.rb",
+     "lib/myuw/curriculum_enrollment.rb",
      "lib/myuw/errors.rb",
      "lib/myuw/registration.rb",
      "lib/myuw/schedule.rb",
@@ -29,7 +33,11 @@ Gem::Specification.new do |s|
      "test/live/session_test.rb",
      "test/live/sln_test.rb",
      "test/live/test_helper.rb",
+     "test/mocked/curriculum_enrollment_test.rb",
      "test/mocked/fixture_pages/bad_request.html",
+     "test/mocked/fixture_pages/curric_courses.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",
      "test/mocked/fixture_pages/login.html",
      "test/mocked/fixture_pages/no_form_login.html",
@@ -59,11 +67,10 @@ Gem::Specification.new do |s|
      "test/mocked/test_helper.rb",
      "test/password.rb.sample"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/mitchellh/rubyuw}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Library which provides a ruby interface to the University of Washington student portal.}
   s.test_files = [
     "test/live/registration_test.rb",
@@ -82,7 +89,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<tenderlove-mechanize>, [">= 0.9.2.20090428085858"])