osu-cc-scraper 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71df7f91c3049b5d62323435cb066f324c2882ab
-  data.tar.gz: 02eb25347ade8940adabd831f87cbd631c943f1b
+  metadata.gz: 49aea5047e818d92404a7f5b6d3dcbf1a987f65b
+  data.tar.gz: bec95b9ba989b16c91e4f12b614728bec9df8e06
 SHA512:
-  metadata.gz: 1a2017bbf88c24da39b941bbd69bacc3a8cf5fe1309e28a530649bbac78de660a17d60b6b068e91e7d037f05950d28cd33e7f530b9765acc1ee4081c683061fd
-  data.tar.gz: 9573bdcb5255459cdfda6072ec943d9001915ef6fc97860177fa0bd3358acd145bbb75335372d7f8267bad1bccbad60df247cc4fc32b399f41f4643d7657e127
+  metadata.gz: 4a49fdac45ab85eff7f81ae245d17d22832246eb7f804e32640d1311109fe3d8b6b1cb48ac1bc100da56bbb8cae6117669ff03fbdc88aba460cf23e62efbc0da
+  data.tar.gz: dfe8e6bbb90fae2d24c0a14dbb4cb33f0f5a8695b97b7233752756a16d5ac83a0880a6f081ffb9b3db51790c3ceea0809e5c9c517644a09f688e2d005d3bc779

data/lib/osu-cc-scraper/course.rb

@@ -1,10 +1,9 @@
 require "open-uri"
 require "oga"
-
 require "osu-cc-scraper/section"
 
 module OsuCcScraper
-  class Course < Struct.new(:subject_code, :course_number, :name)
+  class Course < Struct.new(:department, :course_number, :name)
 
     def sections
       html = fetch_sections
@@ -17,23 +16,22 @@ module OsuCcScraper
       TITLE_XPATH = "//form/h3"
 
       def fetch_sections
-        open("#{ENDPOINT}/CourseDetail.aspx?subjectcode=#{subject_code}&coursenumber=#{course_number}").read
+        open("#{ENDPOINT}/CourseDetail.aspx?subjectcode=#{department.subject_code}&coursenumber=#{course_number}").read
       end
 
       def parse_sections(html)
         document = Oga.parse_html(html)
 
-        document.xpath(SECTIONS_XPATH).map { |row| 
+        document.xpath(SECTIONS_XPATH).map { |row|
           Section.new(
-            parse_department(document), 
-            parse_number(document), 
-            parse_name(document), 
-            parse_term(row), 
+            self,
+            parse_term(row),
             parse_section(row),
-            parse_instructor(row), 
-            parse_type(row), 
+            parse_instructor(row),
+            parse_campus(row),
+            parse_type(row),
             parse_status(row),
-            parse_capacity(row), 
+            parse_capacity(row),
             parse_current(row)
           )
         }
@@ -43,21 +41,6 @@ module OsuCcScraper
         document.xpath(selector)&.text&.delete("\r\n")&.strip
       end
 
-      def parse_department(document)
-        title = document.xpath(TITLE_XPATH).text.split("\n")
-        title[2].delete("\r\n").strip[0..-2].split(" ")[0]
-      end
-
-      def parse_number(document)
-        title = document.xpath(TITLE_XPATH).text.split("\n")
-        title[2].split(" ")[1][0..-2]
-      end
-
-      def parse_name(document)
-        title = document.xpath(TITLE_XPATH).text.split("\n")
-        title[3].strip
-      end
-
       def parse_term(row)
         fetch_column(row, "td[position() = 1]")
       end
@@ -70,6 +53,10 @@ module OsuCcScraper
         fetch_column(row, "td[position() = 6]")
       end
 
+      def parse_campus(row)
+        fetch_column(row, "td[position() = 9]")
+      end
+
       def parse_type(row)
         fetch_column(row, "td[position() = 11]")
       end

data/lib/osu-cc-scraper/department.rb

@@ -1,10 +1,9 @@
 require "open-uri"
 require "oga"
-
 require "osu-cc-scraper/course"
 
 module OsuCcScraper
-  class Department < Struct.new(:name, :subject_code)
+  class Department < Struct.new(:university, :name, :subject_code)
 
     def courses
       html = fetch_courses
@@ -14,14 +13,14 @@ module OsuCcScraper
     private
 
       def fetch_courses
-        open("#{ENDPOINT}/CourseList.aspx?subjectcode=#{subject_code}&level=undergrad&campus=corvallis").read
+        open("#{ENDPOINT}/CourseList.aspx?subjectcode=#{subject_code}&level=#{university.level}").read
       end
 
       def parse_courses(html)
         document = Oga.parse_html(html)
         document.xpath("//tr//td//strong/a[last()]").map { |row|
           Course.new(
-            parse_course_subject_code(row),
+            self,
             parse_course_course_number(row),
             parse_course_name(row)
           )

data/lib/osu-cc-scraper/section.rb

@@ -1,5 +1,10 @@
 module OsuCcScraper
-  class Section < Struct.new(:department, :number, :name, :term, :section, 
-                             :instructor, :type, :status, :capacity, :current)
+  class Section < Struct.new(:course, :term, :section, :instructor, :campus,
+                             :type, :status, :capacity, :current)
+    def to_a
+      [ course.department.subject_code, course.course_number, course.name,
+        term, section, instructor, campus, type, status, capacity, current ]
+    end
+
   end
 end

data/lib/osu-cc-scraper/university.rb

@@ -1,37 +1,39 @@
 require "open-uri"
 require "oga"
-
 require "osu-cc-scraper/department"
 
 module OsuCcScraper
-  class University
+  class University < Struct.new(:level)
 
     def departments
       html = fetch_departments
       parse_departments(html)
     end
 
-    def fetch_departments
-      open("#{ENDPOINT}/CourseDescription.aspx?level=undergrad").read
-    end
-
-    def parse_departments(html)
-      ng = Oga.parse_html(html)
-      ng.xpath("//tr/td/font/a").map { |row|
-        Department.new(
-          parse_department_name(row),
-          parse_department_subject_code(row), 
-        )
-      }
-    end
-
-    def parse_department_subject_code(row)
-      row.text[/\(.*?\)/][1..-2]    
-    end
-
-    def parse_department_name(row)
-      row.text[/([^(]+)/].strip    
-    end
+    private
+
+      def fetch_departments
+        open("#{ENDPOINT}/CourseDescription.aspx?level=#{level}").read
+      end
+
+      def parse_departments(html)
+        ng = Oga.parse_html(html)
+        ng.xpath("//tr/td/font/a").map { |row|
+          Department.new(
+            self,
+            parse_department_name(row),
+            parse_department_subject_code(row),
+          )
+        }
+      end
+
+      def parse_department_subject_code(row)
+        row.text[/\(.*?\)/][1..-2]
+      end
+
+      def parse_department_name(row)
+        row.text[/([^(]+)/].strip
+      end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osu-cc-scraper
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jonah George
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga