visionmedia-google-search 1.0.1 → 1.0.2

data/History.rdoc

@@ -1,4 +1,8 @@
 
+=== 1.0.2 / 2009-07-27
+
+* Defaulting Item#uri to unescapedUrl
+
 === 1.0.0 / 2009-07-24
 
 * Initial release

data/google-search.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google-search}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-07-24}
+  s.date = %q{2009-07-30}
   s.description = %q{Google Search API}
   s.email = %q{tj@vision-media.ca}
   s.extra_rdoc_files = ["lib/google-search/item/base.rb", "lib/google-search/item/blog.rb", "lib/google-search/item/book.rb", "lib/google-search/item/image.rb", "lib/google-search/item/local.rb", "lib/google-search/item/news.rb", "lib/google-search/item/patent.rb", "lib/google-search/item/video.rb", "lib/google-search/item/web.rb", "lib/google-search/item.rb", "lib/google-search/response.rb", "lib/google-search/search/base.rb", "lib/google-search/search/blog.rb", "lib/google-search/search/book.rb", "lib/google-search/search/image.rb", "lib/google-search/search/local.rb", "lib/google-search/search/mixins/filter.rb", "lib/google-search/search/mixins/order_by.rb", "lib/google-search/search/mixins/safety_level.rb", "lib/google-search/search/mixins.rb", "lib/google-search/search/news.rb", "lib/google-search/search/patent.rb", "lib/google-search/search/video.rb", "lib/google-search/search/web.rb", "lib/google-search/search.rb", "lib/google-search/version.rb", "lib/google-search.rb", "README.rdoc", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake"]

data/lib/google-search/item/base.rb

@@ -18,11 +18,6 @@ module Google
       
       attr_reader :uri
       
-      ##
-      # Unescaped uri.
-      
-      attr_reader :unescaped_uri
-
       ##
       # Visible uri.
       
@@ -54,9 +49,8 @@ module Google
       def initialize hash
         @index = hash['index']
         @title = hash['titleNoFormatting'] || hash['title']
-        @uri = hash['url'] || hash['postUrl']
+        @uri = hash['unescapedUrl'] || hash['url'] || hash['postUrl']
         @content = hash['contentNoFormatting'] || hash['content']
-        @unescaped_uri = hash['unescapedUrl']
         @thumbnail_uri = hash['tbUrl']
         @thumbnail_width = hash['tbWidth'].to_i
         @thumbnail_height = hash['tbHeight'].to_i

data/lib/google-search/version.rb

@@ -1,6 +1,6 @@
 
 module Google
   class Search
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/spec/item_book_spec.rb

@@ -9,7 +9,7 @@ describe Google::Search::Item::Book do
       item.title.should include('Foo Fighters')
       item.author.should == '<b>Foo</b> Fighters (CRT), Hal Leonard Publishing Corporation'
       item.id.should == 'ISBN1423404580'
-      item.uri.should == 'http://books.google.com/books%3Fid%3DvUoCAgAACAAJ%26dq%3Dfoo%26client%3Dinternal-uds%26source%3duds'
+      item.uri.should == 'http://books.google.com/books?id=vUoCAgAACAAJ&dq=foo&client=internal-uds&source=uds'
       item.thumbnail_uri.should == 'http://bks6.books.google.com/books?id=vUoCAgAACAAJ&printsec=frontcover&img=1&zoom=5&sig=ACfU3U1NHHhXuERH30Xfn0GC3A0BW5nMPg'
       item.published_year.should == 2006
       item.pages.should == 69

data/spec/item_news_spec.rb

@@ -8,12 +8,11 @@ describe Google::Search::Item::News do
       item = Google::Search::Item::News.new hash
       item.title.should include('TICKET TO DINING')
       item.language.should == 'en'
-      item.uri.should == 'http%3A%2F%2Fwww.montgomerynews.com%2Farticles%2F2009%2F07%2F22%2Fentertainment%2Fdoc4a672746b0941650009917.txt'
+      item.uri.should == 'http://www.montgomerynews.com/articles/2009/07/22/entertainment/doc4a672746b0941650009917.txt'
       item.published.should be_a(DateTime)
       item.publisher.should == 'Montgomery Newspapers'
       item.content.should include('After all, it was')
       item.redirect_uri.should == 'http://news.google.com/news/url?sa=T&ct=us/0-0-0&fd=S&url=http://www.montgomerynews.com/articles/2009/07/22/entertainment/doc4a672746b0941650009917.txt&cid=0&ei=4aFnSpnxK474rQPutNHRAQ&usg=AFQjCNGsuTniL5DY24lNJ8qy204ZWjQoKA'
-      item.unescaped_uri.should == 'http://www.montgomerynews.com/articles/2009/07/22/entertainment/doc4a672746b0941650009917.txt'
       item.location.should == 'Fort Washington,PA,USA'
     end
   end

data/spec/item_patent_spec.rb

@@ -11,9 +11,8 @@ describe Google::Search::Item::Patent do
       item.content.should include('METHOD OF AND APPARATUS FOR DETERMINING RH')
       item.assignee.should == ''
       item.application_date.should be_a(DateTime)
-      item.uri.should == 'http://www.google.com/patents/about%3Fid%3DGDMdAAAAEBAJ%26dq%3Dfoo%26client%3Dinternal-uds%26source%3duds'
+      item.uri.should == 'http://www.google.com/patents/about?id=GDMdAAAAEBAJ&dq=foo&client=internal-uds&source=uds'
       item.thumbnail_uri.should == 'http://bks9.books.google.com/patents?id=GDMdAAAAEBAJ&printsec=drawing&img=1&zoom=1&sig=ACfU3U10b3w-4hMfKTEykPmtqnoObaLhaA'
-      item.unescaped_uri.should == 'http://www.google.com/patents/about?id=GDMdAAAAEBAJ&dq=foo&client=internal-uds&source=uds'
       item.status.should == 'issued'
     end
   end

data/spec/item_web_spec.rb

@@ -13,7 +13,6 @@ describe Google::Search::Item::Web do
       item.uri.should == 'http://en.wikipedia.org/wiki/Foobar'
       item.cache_uri.should == 'http://www.google.com/search?q=cache:4styY9qq7tYJ:en.wikipedia.org'
       item.visible_uri.should == 'en.wikipedia.org'
-      item.unescaped_uri.should == 'http://en.wikipedia.org/wiki/Foobar'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visionmedia-google-search
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 -07:00
+date: 2009-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,6 +133,7 @@ files:
 - tasks/spec.rake
 has_rdoc: false
 homepage: http://github.com/visionmedia/google-search
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -158,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: google-search
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Google Search API