tangzero-rgsearch 0.9 → 1.0

data/Rakefile

@@ -1,11 +1,11 @@
-require 'rubygems'
-require 'rubygems/specification'
-require 'rake'
-require 'rake/gempackagetask'
-require 'spec/rake/spectask'
+require "rubygems"
+require "rubygems/specification"
+require "rake"
+require "rake/gempackagetask"
+require "spec/rake/spectask"
  
 GEM = "rgsearch"
-GEM_VERSION = "0.9"
+GEM_VERSION = "1.0"
 SUMMARY = "Ruby Google Search Mashup Framework"
 AUTHOR = "TangZero"
 EMAIL = "t4ngz3r0@gmail.com"
@@ -17,21 +17,21 @@ spec = Gem::Specification.new do |s|
   s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.summary = SUMMARY
-  s.require_paths = ['lib']
-  s.files = FileList['lib/**/*.rb', '[A-Z]*'].to_a
+  s.require_paths = ["lib"]
+  s.files = FileList["lib/**/*.rb", "[A-Z]*"].to_a
   
-  s.add_dependency(%q<json>, [">= 1.1.1"])
+  s.add_dependency(%q<activesupport>, [">= 2.2.2"])
   s.has_rdoc = false
   
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  s.rubyforge_project = GEM # GitHub bug, gem isn't being build when this miss
+  s.rubyforge_project = GEM # GitHub bug, gem isn"t being build when this miss
 end
 
 Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_files = FileList["spec/**/*_spec.rb"]
   t.spec_opts = %w(-fs --color)
 end
   

data/lib/rgsearch.rb

@@ -1,18 +1,16 @@
-require 'rubygems'
-require 'net/http'
-require 'uri'
-require 'json'
+require "rubygems"
+require "uri"
+require "open-uri"
+require "active_support"
 
 Dir["#{File.dirname(__FILE__)}/rgsearch/*.rb"].sort.each { |lib| require lib }
 
 module RGSearch
 	
-	API_VERSION = '1.0'
-	API_URL = 'http://ajax.googleapis.com/ajax/services/search'
+	API_VERSION = "1.0"
+	API_URL = "http://ajax.googleapis.com/ajax/services/search"
 		
-	%w(proxy_host proxy_port proxy_user proxy_pass key).each do |att|
-		attr_accessor att.to_sym
-		module_function att.to_sym, "#{att}=".to_sym
-  	end
+	attr_accessor :key
+	module_function :key, :key=	
 
 end

data/lib/rgsearch/request.rb

@@ -1,29 +1,33 @@
 module RGSearch
 
-	class Request
+  class Request
 
-		def self.get(url, options = {})
-			uri = URI.parse URI.encode(url)
-			uri.query = to_query options
-			request = Net::HTTP::Get.new uri.request_uri
-			response = connection.start(uri.host) { |http| http.request request }
-			response.body
+    def self.get(url, params = {}, options = {})
+			options = {:proxy => proxy?}.merge(options)
+			uri = get_uri(url, params)
+			response = uri.open(options).collect.join
+			Unicode.unescape(response)
 		rescue Exception => e
 			raise RGSearchException, e.message
 		end
 
-		private		
-		def self.connection()
-			Net::HTTP.Proxy RGSearch.proxy_host, RGSearch.proxy_port,
-							RGSearch.proxy_user, RGSearch.proxy_pass
+		private
+		def self.proxy?
+			ENV.include?("http_proxy") || ENV.include?("HTTP_PROXY")
 		end
-
-		def self.to_query(options = {})
+		
+		def self.to_query(params = {})
 			query = []
-			options.each { |k, v| query << "#{k}=#{v}" }
-			URI.encode query.join('&')
+			params.each { |k, v| query << "#{k}=#{v}" }
+			URI.encode(query.join("&"))
 		end
 		
-	end
+		def self.get_uri(url, params)
+		  uri = URI.parse(URI.encode(url))
+			uri.query = to_query(params)
+			return uri
+		end
+    
+  end
 
 end

data/lib/rgsearch/result.rb

@@ -1,16 +1,43 @@
 module RGSearch
 
-	class Result < BaseResult
+	class Result
+		
+		def initialize(data)			
+			if data.kind_of?(Hash)
+				data.each do |key, value|
+					set_att(key, make_result(value))
+				end
+			end
+		end
 
-		def initialize(data = {})
-			@data = data
-			@data.each { |k, v| set_parameter(k, v) }
+		private
+		def make_result(value)
+			if value.kind_of?(String) or value.kind_of?(Numeric)
+				value
+			elsif value.kind_of?(Hash)
+				Result.new(value)
+			elsif value.kind_of?(Array)
+				value.collect {|v| make_result(v)}
+			end
 		end
-		
-		def to_s
-			@data.inspect
+
+		def set_att(key, value)
+			key = to_att(key)
+			instance_variable_set("@#{key}", value) 
+			instance_eval("def #{key}; @#{key}; end")
 		end
-		
+
+		def to_att(att)
+			i = 0
+			word = []			
+			att.each_char do |c|
+				i = i + 1 if c =~ /[A-Z]/
+				word[i] = "" if word[i].nil?
+				word[i] << c.downcase
+			end			
+			word.compact.join("_")
+		end
+
 	end
-	
-end
+
+end

data/lib/rgsearch/search.rb

@@ -1,54 +1,54 @@
 module RGSearch
 
-	class Search
-
-		def self.web(query, options = {})
-			find 'web', query, options
-		end
-
-		def self.images(query, options = {})
-			find 'images', query, options
-		end
-
-		def self.news(query, options = {})
-			find 'news', query, options
-		end
-
-		def self.blogs(query, options = {})
-			find 'blogs', query, options
-		end
-
-		def self.videos(query, options = {})
-			find 'video', query, options
-		end
-
-		def self.books(query, options = {})
-			find 'books', query, options
-		end
-		
-		def self.local(query, options = {})
-			find 'local', query, options
-		end
-
-		private
-		def self.find(engine, query, options)
-			url = URI.encode "#{API_URL}/#{engine}"
-			validate options, query
-			data = Request.get(url, options)
-			ResultSet.new JSON.parse(data)
-		end
-		
-		def self.validate(options, query)
-			raise RGSearchException, 'key is not specified' unless RGSearch.key
-			raise RGSearchException, 'start is invalid' if options[:start] and options[:start] < 0
-			unless ["small", "large"].include? options[:rsz] || "small"
-				raise RGSearchException, 'result size is invalid'
-			end
-			options[:q] = query
-			options[:v] = API_VERSION
-			options[:key] = RGSearch.key			
-		end
-
-	end
+  class Search
+
+    def self.web(query, params = {})
+      find "web", query, params
+    end
+
+    def self.images(query, params = {})
+      find "images", query, params
+    end
+
+    def self.news(query, params = {})
+      find "news", query, params
+    end
+
+    def self.blogs(query, params = {})
+      find "blogs", query, params
+    end
+
+    def self.videos(query, params = {})
+      find "video", query, params
+    end
+
+    def self.books(query, params = {})
+      find "books", query, params
+    end
+    
+    def self.local(query, params = {})
+      find "local", query, params
+    end
+
+    private
+    def self.find(engine, query, params)
+      url = URI.encode "#{API_URL}/#{engine}"
+      validate params, query
+      data = Request.get(url, params, {})
+      Result.new ActiveSupport::JSON.decode(data)
+    end
+    
+    def self.validate(params, query)
+      raise RGSearchException, "key is not specified" unless RGSearch.key
+      raise RGSearchException, "start is invalid" if params[:start] and params[:start] < 0
+      unless ["small", "large"].include? params[:rsz] || "small"
+        raise RGSearchException, "result size is invalid"
+      end
+      params[:q] = query
+      params[:v] = API_VERSION
+      params[:key] = RGSearch.key
+    end
+
+  end
 
 end

data/lib/rgsearch/unicode.rb

@@ -0,0 +1,20 @@
+module RGSearch
+  
+  class Unicode
+  
+    def self.escape(str)
+      ary = str.unpack("U*").map!{|i| "\\u#{i.to_s(16)}"}
+      ary.join
+    end
+  
+    UNESCAPE_ARRAY = []
+    def self.unescape(str)
+      str.gsub(/\\u([0-9a-f]{4})/) {
+        UNESCAPE_ARRAY[0] = $1.hex
+        UNESCAPE_ARRAY.pack("U")
+      }
+    end
+  
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tangzero-rgsearch
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: "1.0"
 platform: ruby
 authors: 
 - TangZero
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-06 00:00:00 -08:00
+date: 2009-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: activesupport
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 2.2.2
     version: 
 description: 
 email: t4ngz3r0@gmail.com
@@ -32,11 +32,10 @@ extra_rdoc_files: []
 
 files: 
 - lib/rgsearch/exception.rb
-- lib/rgsearch/search.rb
-- lib/rgsearch/base_result.rb
 - lib/rgsearch/request.rb
 - lib/rgsearch/result.rb
-- lib/rgsearch/resultset.rb
+- lib/rgsearch/search.rb
+- lib/rgsearch/unicode.rb
 - lib/rgsearch.rb
 - Rakefile
 - README.textile

data/lib/rgsearch/base_result.rb

@@ -1,12 +0,0 @@
-module RGSearch
-	
-	class BaseResult
-	
-		def set_parameter(key, value)
-			instance_variable_set("@#{key}", value) 
-			instance_eval("def #{key}; @#{key}; end")
-		end
-	
-	end
-	
-end

data/lib/rgsearch/resultset.rb

@@ -1,44 +0,0 @@
-module RGSearch
-
-	class ResultSet < BaseResult
-
-		attr_reader :results, :cursor
-
-	    def initialize(data)
-			@results = []
-			@cursor = Result.new
-			data.each do |k, v|
-				if k == 'responseData' and v != nil
-					v.each do |k, v|
-						if k == 'results'
-							v.each do |result|
-								@results << Result.new(result)
-							end
-						elsif k == 'cursor'
-							pages = []
-							cursor_data = { :pages => pages }
-							v.each do |k, v|
-								if k == 'pages'
-									v.each do |page|
-										pages << Result.new(page)
-									end
-								else
-									cursor_data[k] = v
-								end
-							end
-							@cursor = Result.new(cursor_data)
-						end
-					end
-				else
-					set_parameter(k, v)
-				end
-			end
-	    end
-
-	    def to_s
-	    	@results.inspect
-		end
-
-	end
-	
-end