Reduce duplication in scraper models

corincerami · Jun 20, 2015 · 0e1f15e · 0e1f15e
1 parent 9f61d9c
commit 0e1f15e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 106 deletions.
diff --git a/Rakefile b/Rakefile
@@ -10,9 +10,9 @@ task scrape_curiosity: :environment do
 end
 
 task scrape_opportunity: :environment do
-  OpportunityScraper.new.scrape
+  OpportunitySpiritScraper.new("Opportunity").scrape
 end
 
 task scrape_spirit: :environment do
-  SpiritScraper.new.scrape
+  OpportunitySpiritScraper.new("Spirit").scrape
 end
diff --git a/app/models/opportunity_scraper.rb → app/models/opportunity_spirit_scraper.rb b/app/models/opportunity_scraper.rb → app/models/opportunity_spirit_scraper.rb
@@ -1,8 +1,8 @@
-class OpportunityScraper
+class OpportunitySpiritScraper
   BASE_URI = "http://mars.nasa.gov/mer/gallery/all/"
 
-  def initialize
-    @rover = Rover.find_by(name: "Opportunity")
+  def initialize(rover)
+    @rover = Rover.find_by(name: rover)
   end
 
   SOL_SELECT_CSS_PATHS = [
@@ -28,7 +28,8 @@ def scrape
   end
 
   def main_page
-    Nokogiri::HTML(open(BASE_URI + "opportunity.html"))
+    rover_html = "#{@rover.name.downcase}.html"
+    Nokogiri::HTML(open(BASE_URI + rover_html))
   end
 
   def sol_paths

diff --git a/app/models/spirit_scraper.rb b/app/models/spirit_scraper.rb
diff --git a/spec/models/opportunity_scraper_spec.rb b/spec/models/opportunity_scraper_spec.rb
diff --git a/spec/models/spirit_scraper_spec.rb b/spec/models/spirit_scraper_spec.rb