lib/xkcd.rb in xkcd-1.0.1 vs lib/xkcd.rb in xkcd-1.1.0

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 require 'nokogiri'
 require 'open-uri'
-require 'json'
+require 'json' 
+require 'google-search'
+require 'uri'
 
 # The main XKCD driver
 class XKCD
     # Get img/comic URL from xkcd
     #
@@ -16,10 +18,26 @@
 
     def self.comic
         open('http://dynamic.xkcd.com/random/comic/').base_uri.to_s
     end
     
+    def self.search(query)      
+      comic_id = 149 #Default to make me a sandwich if nothing can be found
+      Google::Search::Web.new(:query => "xkcd " + query).each do |result|
+         current_url = URI(result.uri) #Parse the search result URL
+         if current_url.hostname == "xkcd.com" #Ignore all of URLs which are not from XKCD.com
+           id = current_url.path.gsub(/\//, "").to_i #Checking to make sure that only a URL with a comic strip ID is taken
+           if id != 0
+             comic_id = id
+             break 
+           end
+         end
+      end
+      
+       self.get_comic(comic_id)
+    end
+    
     class << XKCD
         alias_method :get, :comic
     end
 
 =begin
@@ -28,13 +46,17 @@
         img_url = img.attributes["src"].value
         img_title = img.attributes["title"].value
         "#{img_title} : #{img_url}"
     end
 =end
-    def self.img
+    def self.img        
         max = JSON.parse(open('http://xkcd.com/info.0.json').read)["num"]
         comic_num = 1 + rand(max-1) 
         comic_num = 1 if comic_num == 404 # Avoid 404th comic ;)
-        comic = JSON.parse(open("http://xkcd.com/#{comic_num}/info.0.json").read)
-        "#{comic['alt']} : #{comic['img']}"    
+        self.get_comic(comic_num)    
+    end
+    
+    def self.get_comic(id)
+      comic = JSON.parse(open("http://xkcd.com/#{id}/info.0.json").read)
+      "#{comic['alt']} : #{comic['img']}"
     end
 end