rubyuw 0.99.15 → 0.99.16

data/.gitignore

@@ -2,3 +2,5 @@ pkg/*
 test/password.rb
 .yardoc
 doc/*
+test.rb
+.bundle/*

data/Gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gemspec
+
+group :development do
+  gem "rake"
+  gem "jeweler", "1.4.0"
+end

data/Gemfile.lock

@@ -0,0 +1,31 @@
+PATH
+  remote: .
+  specs:
+    rubyuw (0.99.16)
+      mechanize (>= 0.9.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    mechanize (1.0.0)
+      nokogiri (>= 1.2.1)
+    nokogiri (1.4.3.1)
+    rake (0.8.7)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler (= 1.4.0)
+  mechanize (>= 0.9.3)
+  rake
+  rubyuw!

data/Rakefile

@@ -1,3 +1,6 @@
+require "rubygems"
+require "bundler/setup"
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
@@ -42,4 +45,4 @@ namespace :test do
   task :run_live do
     run_tests(Dir[File.join(File.dirname(__FILE__), 'test', 'live', '**', '*.rb')])
   end
-end
+end

data/VERSION

@@ -1 +1 @@
-0.99.15
+0.99.16

data/lib/rubyuw/base.rb

@@ -18,7 +18,7 @@ module RubyUW
     # See allow_concurrency=
     @@allow_concurrency = false
 
-    class <<self
+    class << self
       # Authenticate with MyUW. This method sets up and verifies
       # a session with MyUW. Every feature of RubyUW which requires
       # authentication (as of writing this documentation this is
@@ -152,4 +152,4 @@ module RubyUW
       end
     end
   end
-end
+end

data/lib/rubyuw/curriculum_enrollment.rb

@@ -19,7 +19,7 @@ module RubyUW
   # the array access notation common to ruby. This access returns
   # a {RubyUW::SLN} object.
   class CurriculumEnrollment
-    class <<self
+    class << self
       # Pulls data about a specific curriculum. The SLN data is pulled
       # directly from the MyUW curriculum information page. Authentication
       # is required prior to use.
@@ -29,47 +29,57 @@ module RubyUW
       def find(curriculum, term)
         raise Errors::NotLoggedInError.new unless Base.authenticated?
 
-        page = Base.connection.get("https://sdb.admin.washington.edu/timeschd/uwnetid/tsstat.asp?QTRYR=#{term}&CURRIC=#{curriculum}")
+        url = "https://sdb.admin.washington.edu/timeschd/uwnetid/tsstat.asp?QTRYR=#{term}&CURRIC=#{curriculum}"
+
+        page = Base.connection.get(url)
+        if page.form_with(:name => "relay")
+          # Strange thing UW began implementing 08/31/2010. This is to
+          # get around it.
+          page = Base.connection.goto(url).
+                    submit_form('relay').
+                    submit_form('relay').execute!
+        end
+
         raise Errors::CurriculumDoesNotExistError.new if !curriculum_exists?(page)
-        
+
         extract_courses(page, term)
       rescue WWW::Mechanize::ResponseCodeError
         raise Errors::CurriculumDoesNotExistError.new
       end
-      
+
       protected
 
       def curriculum_exists?(page)
         !(page.body.to_s =~ /No sections found for (.+?)/i)
       end
-      
+
       def extract_courses(page, term)
         course_nodes = page.search('//table//tr[count(th)>1 and @bgcolor="#d0d0d0"]//following-sibling::tr')
-        
+
         results = {}
-        course_nodes.each { |node| 
+        course_nodes.each { |node|
           sln, data = extract_course(node)
           results[sln] = RubyUW::SLN.new(sln, term, data)
         }
-        
+
         results
       end
-      
+
       def extract_course(node)
         data_keys = [:sln, :course, :section, :type, :title, :current_enrollment, :limit_enrollment,
             :room_capacity, :space_available, nil, :notes]
 
         results = Base.extract(node, './/td | .//th', data_keys)
         results[:sln].gsub!(/^>/, '') # Strips leading '>' off of quiz sections
-        
+
         [results[:sln], results]
       end
     end
   end
-  
+
   module Errors
     # An error indicating that the curriclum requesting does not
     # exist.
     class CurriculumDoesNotExistError < Error; end
   end
-end
+end

data/rubyuw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyuw}
-  s.version = "0.99.15"
+  s.version = "0.99.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto"]
-  s.date = %q{2010-04-20}
+  s.date = %q{2010-08-31}
   s.description = %q{Library which provides a ruby interface to the University of Washington student portal.}
   s.email = %q{mitchell.hashimoto@gmail.com}
   s.extra_rdoc_files = [
@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "README.md",
      "Rakefile",
      "VERSION",
@@ -76,7 +78,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mitchellh/rubyuw}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Library which provides a ruby interface to the University of Washington student portal.}
   s.test_files = [
     "test/live/curriculum_enrollment_test.rb",
@@ -97,7 +99,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mechanize>, [">= 0.9.3"])
     else
       s.add_dependency(%q<mechanize>, [">= 0.9.3"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyuw
 version: !ruby/object:Gem::Version 
+  hash: 435
   prerelease: false
   segments: 
   - 0
   - 99
-  - 15
-  version: 0.99.15
+  - 16
+  version: 0.99.16
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -14,23 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mechanize
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: mechanize
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 0
         - 9
         - 3
         version: 0.9.3
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 description: Library which provides a ruby interface to the University of Washington student portal.
 email: mitchell.hashimoto@gmail.com
 executables: []
@@ -41,6 +44,8 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - VERSION
@@ -106,23 +111,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Library which provides a ruby interface to the University of Washington student portal.