osu-cc-scraper 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49aea5047e818d92404a7f5b6d3dcbf1a987f65b
-  data.tar.gz: bec95b9ba989b16c91e4f12b614728bec9df8e06
+  metadata.gz: 8a7c8e0f916fd670730f4f80e45f2742512420df
+  data.tar.gz: e7d63ba37d98faf404e5c72ac14c100908b7b060
 SHA512:
-  metadata.gz: 4a49fdac45ab85eff7f81ae245d17d22832246eb7f804e32640d1311109fe3d8b6b1cb48ac1bc100da56bbb8cae6117669ff03fbdc88aba460cf23e62efbc0da
-  data.tar.gz: dfe8e6bbb90fae2d24c0a14dbb4cb33f0f5a8695b97b7233752756a16d5ac83a0880a6f081ffb9b3db51790c3ceea0809e5c9c517644a09f688e2d005d3bc779
+  metadata.gz: 2f3e0c2432c9adb001fea9c19733fd0b07b29aad6c75baf858f05170a6449c6b7f627352bc23844df1029a13173693ec951f3f2c72c7eb0a2f6a18baf6cc1e16
+  data.tar.gz: 2d27785cd4bf5e2f9893f44cf00dd1c77747bf2992f348990b8de6de592539f664ec3f4222445176897c87c6691dde944c7b3cdd1a95842cad9232ec9ec105ac

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

@@ -1,22 +1,31 @@
 require "open-uri"
 require "oga"
 require "osu-cc-scraper/section"
+require "json"
 
 module OsuCcScraper
-  class Course < Struct.new(:department, :course_number, :name)
+  class Course < Struct.new(:subject_code, :course_number, :name)
 
     def sections
       html = fetch_sections
       parse_sections(html)
     end
 
+    def to_json
+      self.to_h.to_json
+    end
+
+    def self.from_json(json)
+      Course.new(*JSON.parse(json).values)
+    end
+
     private
 
       SECTIONS_XPATH = "//table[@id='ctl00_ContentPlaceHolder1_SOCListUC1_gvOfferings']//tr[position() > 1]"
       TITLE_XPATH = "//form/h3"
 
       def fetch_sections
-        open("#{ENDPOINT}/CourseDetail.aspx?subjectcode=#{department.subject_code}&coursenumber=#{course_number}").read
+        open("#{ENDPOINT}/CourseDetail.aspx?subjectcode=#{subject_code}&coursenumber=#{course_number}").read
       end
 
       def parse_sections(html)
@@ -24,7 +33,9 @@ module OsuCcScraper
 
         document.xpath(SECTIONS_XPATH).map { |row|
           Section.new(
-            self,
+            subject_code,
+            course_number,
+            name,
             parse_term(row),
             parse_section(row),
             parse_instructor(row),

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

@@ -1,26 +1,35 @@
 require "open-uri"
 require "oga"
 require "osu-cc-scraper/course"
+require "json"
 
 module OsuCcScraper
-  class Department < Struct.new(:university, :name, :subject_code)
+  class Department < Struct.new(:name, :subject_code)
 
     def courses
       html = fetch_courses
       parse_courses(html)
     end
 
+    def to_json
+      self.to_h.to_json
+    end
+
+    def self.from_json(json)
+      Department.new(*JSON.parse(json).values)
+    end
+
     private
 
       def fetch_courses
-        open("#{ENDPOINT}/CourseList.aspx?subjectcode=#{subject_code}&level=#{university.level}").read
+        open("#{ENDPOINT}/CourseList.aspx?subjectcode=#{subject_code}").read
       end
 
       def parse_courses(html)
         document = Oga.parse_html(html)
         document.xpath("//tr//td//strong/a[last()]").map { |row|
           Course.new(
-            self,
+            subject_code,
             parse_course_course_number(row),
             parse_course_name(row)
           )

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

@@ -1,10 +1,6 @@
 module OsuCcScraper
-  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
-
+  class Section < Struct.new(:subject_code, :course_number, :name, :term,
+                             :section, :instructor, :campus, :type, :status,
+                             :capacity, :current)
   end
 end

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

@@ -3,7 +3,7 @@ require "oga"
 require "osu-cc-scraper/department"
 
 module OsuCcScraper
-  class University < Struct.new(:level)
+  class University
 
     def departments
       html = fetch_departments
@@ -13,14 +13,13 @@ module OsuCcScraper
     private
 
       def fetch_departments
-        open("#{ENDPOINT}/CourseDescription.aspx?level=#{level}").read
+        open("#{ENDPOINT}/CourseDescription.aspx").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),
           )

metadata

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