lib/scrapers/nasa_apod.rb in scrapers-0.4.3 vs lib/scrapers/nasa_apod.rb in scrapers-1.0.0

@@ -1,10 +1,10 @@
 =begin rdoc
 
 nasa_apod.rb -- oneline desc
 
-Time-stamp: <2013-08-23 22:47:58 tamara>
+Time-stamp: <2013-10-15 00:17:15 tamara>
 Copyright (C) 2013 Tamara Temple Web Development
 Author:     Tamara Temple <[e-mail]>
 License:    MIT
 
 == Discussion
@@ -21,38 +21,36 @@
 
 module Scrapers
   
   module NasaApod
 
+    NASA_APOD_URL="http://asterisk.apod.com/library/APOD/APOD%20mirror/astropix.html"
+
     module_function
 
-    def scrape(url)
+    def scrape(url=nil)
+      url ||= NASA_APOD_URL
       apod = Hash.new
-      unless url.nil?
+      Mechanize.start do |m|
 
-        Mechanize.start do |m|
-
-          m.get url
+        m.get url
         
-          # APOD has a funky entry page, but we want the actual page
-          prev = m.current_page.link_with(:text => '<').href
-          m.get prev
-          canonical = m.current_page.link_with(:text => '>' ).href
-          m.get canonical
+        # APOD has a funky entry page, but we want the actual page
+        prev = m.current_page.link_with(:text => '<').href
+        m.get prev
+        canonical = m.current_page.link_with(:text => '>' ).href
+        m.get canonical
 
-          m.current_page.tap do |page|
-            apod[:title] = page.title.strip
-            apod[:link] = page.uri.to_s
-            apod[:description] = (page/("body")).text
-            apod[:pubDate] = page.response['date'].to_s
-            apod[:guid] = page.uri.to_s
-            apod[:content_encoded] = (page/("body")).to_html            
-          end
-
+        m.current_page.tap do |page|
+          apod[:title] = page.title.strip
+          apod[:link] = page.uri.to_s
+          apod[:description] = (page/("body")).text
+          apod[:pubDate] = page.response['date'].to_s
+          apod[:guid] = page.uri.to_s
+          apod[:content_encoded] = (page/("body")).to_html            
         end
 
       end
-      
       apod
     end
 
   end