RubyGems - googleajax - Versions diffs - 1.0.0 → 1.0.1 - Mend

googleajax 1.0.0 → 1.0.1

Files changed (12) hide show

data/.gitignore ADDED

@@ -0,0 +1,5 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 1.0.0
1	+ 1.0.1

data/googleajax.gemspec ADDED

@@ -0,0 +1,77 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.name = %q{googleajax}
+  s.version = "1.0.1"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["geemus(Wesley Beary)", "Marc-Andre Lafortune"]
+  s.date = %q{2010-03-01}
+  s.email = %q{me@geemus.com}
+  s.extra_rdoc_files = [
+    "README.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "README.txt",
+     "Rakefile",
+     "VERSION",
+     "googleajax.gemspec",
+     "lib/googleajax.rb",
+     "lib/googleajax/api.rb",
+     "lib/googleajax/as_hash.rb",
+     "lib/googleajax/as_open_struct.rb",
+     "lib/googleajax/base.rb",
+     "lib/googleajax/basic.rb",
+     "lib/googleajax/extensions/hash.rb",
+     "lib/googleajax/extensions/kernel.rb",
+     "lib/googleajax/extensions/string.rb",
+     "lib/googleajax/feed.rb",
+     "lib/googleajax/filters.rb",
+     "lib/googleajax/hash.rb",
+     "lib/googleajax/language.rb",
+     "lib/googleajax/request.rb",
+     "lib/googleajax/results.rb",
+     "lib/googleajax/search.rb",
+     "spec/googleajax_as_open_struct_spec.rb",
+     "spec/googleajax_basic_spec.rb",
+     "spec/googleajax_common.rb",
+     "spec/googleajax_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/geemus/googleajax}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Ruby wrapper to the Google AJAX API REST interfaces(Feeds, Language and Search).}
+  s.test_files = [
+    "spec/googleajax_as_open_struct_spec.rb",
+     "spec/googleajax_basic_spec.rb",
+     "spec/googleajax_common.rb",
+     "spec/googleajax_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/temp_spec.rb"
+  ]
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<json>, [">= 1.0.0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<json>, [">= 1.0.0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<json>, [">= 1.0.0"])
+  end
+end

data/lib/googleajax.rb CHANGED

@@ -1,6 +1,5 @@
+require 'net/http'
 require 'cgi'
-require 'open-uri'
-require 'rubygems'
 require 'json' unless defined?(Rails)
 # The following extensions are standard in either Ruby 1.8.7, 1.9 or rails:

data/lib/googleajax/api.rb CHANGED

@@ -26,7 +26,11 @@ module GoogleAjax
       Filters::Recursive.remap(data, self)
     end
+    LOOKS_LIKE_HTML = /\w*<html>/i
     def parse(data)
+      if data =~ LOOKS_LIKE_HTML
+        raise StandardError, /<title>(.*)<\/title>/.match(data)[1]
+      end
       if defined? Rails
         ActiveSupport::JSON::decode(data)
       else

data/lib/googleajax/filters.rb CHANGED

@@ -44,6 +44,7 @@ module GoogleAjax
       TRUE_OR_FALSE = /^true|(false)$/i
       INTEGER = /^\d+$/
       FLOAT = /^\d+\.\d+$/
+      TIME = /^[A-Z][a-z]{2}, \d\d [A-Z][a-z]{2} \d{4} \d\d:\d\d:\d\d \S*$/  # Very strict date format
       def initialize(h)
         h.each do |key, value|
           # Won't use Integer.try_convert for 1.8.6 & 7 compatibility
@@ -54,6 +55,9 @@ module GoogleAjax
             h[key] = value.to_f
           when TRUE_OR_FALSE
             h[key] = Regexp.last_match[1].nil?
+          when TIME
+            require 'time'
+            h[key] = Time.parse(value)
           end
         end
         super(h)

data/lib/googleajax/language.rb CHANGED

@@ -14,9 +14,17 @@ module GoogleAjax
     # source and destination can be the language code ("en") or a symbol (:english).
     # source can also be an empty string, in which case Google does an auto-detection and
     # will set :detected_source_language to the language it used as a source.
+    #
+    # Google limits GET request to 2000 chars, but allows POST for the translate request
+    # so we use this to allow texts up to 5000 chars (another limit imposed by Google).
+    #
+    # TODO: Give easy way to shorten text downto the acceptable limit.
     def self.translate(query, source, destination, args = {})
-      langpair = [source, destination].map{|l| LANGUAGE_CODE[l] || l.to_s}.join("%7C")
-      args = { :langpair => langpair }.merge(args)
+      langpair = [source, destination].map{|l| LANGUAGE_CODE[l] || l.to_s}.join("|")
+      args = {
+        :langpair => langpair,
+        :http_method => :post
+      }.merge(args)
       get(:translate, query, args)
     end

data/lib/googleajax/request.rb CHANGED

@@ -1,21 +1,29 @@
 module GoogleAjax
   module Request
-    API_BASE = 'http://ajax.googleapis.com/ajax/services/'
+    HOST = 'ajax.googleapis.com'
+    PATH_PREFIX = "/ajax/services/"
     attr_accessor :api_key
     attr_accessor :referer
     alias_method :referrer, :referer  # See mispelling section in http://en.wikipedia.org/wiki/HTTP_referrer
     alias_method :referrer=, :referer=
     # Api doc is at http://code.google.com/apis/ajaxsearch/documentation/reference.html#_intro_fonje
+    # We use one special option (not forwarded to google):  :html_method => :post will use a Post instead of a Get.
     def get(api, method, query, args = nil)
       raise "You must assign a value to GoogleAjax.referer" unless referer
-      url  = "#{API_BASE}#{api}/"
-      url += "#{method}?"
-      url += "&q=#{CGI::escape(query)}"
-      url += "&key=#{api_key}" if api_key
-      url += "&" + args.collect {|key, value| "#{key}=#{value}"}.join('&') unless args.nil? || args.empty?
-      open(url, "Referer" => referer).read
+      args ||= {}
+      use_post = args.delete(:http_method) == :post
+      args = args.merge!('q' => query)
+      args['key'] = api_key if api_key
+      if use_post
+        request = Net::HTTP::Post.new("#{PATH_PREFIX}#{api}/#{method}", "Referer" => referer)
+        request.set_form_data(args)
+      else
+        request = Net::HTTP::Get.new("#{PATH_PREFIX}#{api}/#{method}?" + args.map{|k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join("&"), "Referer" => referer)
+      end
+      Net::HTTP.new(HOST).start do |http|
+        http.request(request).body
+      end
     end
   end
-end
+end

data/lib/googleajax/search.rb CHANGED

@@ -34,6 +34,7 @@ module GoogleAjax
     # :call-seq:
     #   news(query, args = {})
     # Arguments: http://code.google.com/apis/ajaxsearch/documentation/reference.html#_fonje_news
+    # Contrary to the doc, scoring=d is not an acceptable parameter (nor is scoring=date)
     ##
     # :call-seq:

data/spec/googleajax_common.rb CHANGED

@@ -17,6 +17,20 @@ shared_examples_for "GoogleAjax" do
       end
     end
+    describe ".news" do
+      before :each do
+        GoogleAjax.referer = "http://example.com"
+      end
+      it "returns fresh news" do
+        one_day = 24 * 60 * 60
+        yesterday = Time.now - one_day
+        results = GoogleAjax::Search.news("", :topic => :h)[:results]
+        results.size.should >= 4
+        results.all?{|r| r[:published_date].should >= yesterday}
+      end
+    end
     {
       :blogs  => 100_000,
       :books  => 10_000,
@@ -65,6 +79,10 @@ shared_examples_for "GoogleAjax" do
       it "does an approximate translation" do
         GoogleAjax::Language.translate("Ruby rocks", "en", "fr")[:translated_text].should == "Ruby roches"
       end
+      it "translates texts longer than the 2k limit on get requets" do
+        GoogleAjax::Language.translate("Ruby rocks. "*250, "en", "fr")[:translated_text].count("Ruby").should == 1000
+      end
     end
   end
@@ -77,7 +95,7 @@ shared_examples_for "GoogleAjax" do
       it "returns the right feeds" do
         feeds = GoogleAjax::Feed.find("Ruby")
         feeds.size.should == 10
-        feeds.any?{|result| result[:url] == "http://ruby-lang.org/en/feeds/news.rss"}.should be_true
+        feeds.map{|f| f[:url]}.should include "http://www.ruby-lang.org/en/feeds/news.rss"
       end
     end

data/spec/temp_spec.rb ADDED

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/../lib/googleajax')
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+describe "GoogleAjax (temp)" do
+  it "returns results as a hash" do
+    GoogleAjax.referer = "http://example.com"
+    GoogleAjax::Language.translate("Ruby rocks", "en", "fr").should == "Ruby roches"
+  end
+end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: googleajax
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - geemus(Wesley Beary)
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-12-24 00:00:00 -08:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -42,10 +42,12 @@ extensions: []
 extra_rdoc_files:
 - README.txt
 files:
+- .gitignore
 - History.txt
 - README.txt
 - Rakefile
 - VERSION
+- googleajax.gemspec
 - lib/googleajax.rb
 - lib/googleajax/api.rb
 - lib/googleajax/as_hash.rb
@@ -102,3 +104,4 @@ test_files:
 - spec/googleajax_common.rb
 - spec/googleajax_spec.rb
 - spec/spec_helper.rb
+- spec/temp_spec.rb