xkcd 1.0.1 → 1.1.0

data/Rakefile

@@ -4,5 +4,9 @@ Rake::TestTask.new do |t|
   t.libs << 'test'
 end
 
+Rake::TestTask.new(:spec) do |t|
+  t.test_files = FileList['spec/**/*_spec.rb']
+end
+
 desc "Run tests"
 task :default => :test

data/lib/xkcd.rb

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 require 'nokogiri'
 require 'open-uri'
-require 'json'
+require 'json' 
+require 'google-search'
+require 'uri'
 
 # The main XKCD driver
 class XKCD
@@ -18,6 +20,22 @@ class XKCD
         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
@@ -30,11 +48,15 @@ class XKCD
         "#{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

metadata

@@ -1,83 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: xkcd
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Hemanth.HM
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: google-search
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple gem to get random img/comic url from xkcd
 email: hemanth.hm@gmail.com
-executables: 
+executables:
 - xkcd
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/xkcd.rb
 - bin/xkcd
 - test/test_karam.rb
 homepage: http://rubygems.org/gems/xkcd
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: XCKD random img urls!
-test_files: 
+test_files:
 - test/test_karam.rb