@@ -5,6 +5,14 @@ require 'cgi' require 'hpricot' +module Hpricot + class Elem + def get_html(xpath) + search(xpath).inner_html + end + end +end + ## # This module holds every class and every method that handles Technorati API. # It contains classes for every logical entity that exists in the realm of @@ -18,7 +26,7 @@ module Rubyrati def fetch(path, key, *args) url = URI.parse("http://api.technorati.com/" + path) - @complete_url = url.path + self.key(key) + self.set_arguments(args) + @complete_url = url.path + key(key) + args.collect{|x| set_arguments(x)}.join response = Net::HTTP.start(url.host, url.port) do |http| http.get @complete_url, 'User-Agent' => key, 'Accept' => 'text/xml' end lib/rubyrati/base.rb @@ -4,32 +4,31 @@ module Rubyrati class Blog < Base def get_links(key, *args) path = "cosmos" - res = fetch(path, key, *args) - parsed_response = {:linking_blogs => res.search("//item").collect{|i| resultify_links(i)}} + res = fetch(path, key, {:url => @url}, args) + parsed_response = {:linking_blogs => res.search("//item").collect{|i| resultify_links(i)} + } end private - def resultify_links(element) + def resultify_links(e) { - :name => element.search("//weblog/name").inner_html, - :url => element.search("//weblog/url").inner_html, - :rssurl => element.search("//weblog/rssurl").inner_html, - :atomurl => element.search("//weblog/atomurl").inner_html, - :inbound_blogs => element.search("//weblog/inboundblogs").inner_html, - :inbound_links => element.search("//weblog/inboundlinks").inner_html, - :last_update => element.search("//weblog/lastupdate").inner_html, - :nearest_permalink => element.search("//nearestpermalink").inner_html, - :excerpt => element.search("//excerpt").inner_html, - :link_created => element.search("//linkcreated").inner_html, - :link_url => element.search("//linkurl").inner_html + :name => e.get_html("//weblog/name"), + :url => e.get_html("//weblog/url"), + :rssurl => e.get_html("//weblog/rssurl"), + :atomurl => e.get_html("//weblog/atomurl"), + :inbound_blogs => e.get_html("//weblog/inboundblogs").to_i, + :inbound_links => e.get_html("//weblog/inboundlinks"), + :last_update => e.get_html("//weblog/lastupdate"), + :nearest_permalink => e.get_html("//nearestpermalink"), + :excerpt => e.get_html("//excerpt"), + :link_created => e.get_html("//linkcreated"), + :link_url => e.get_html("//linkurl") } end def resultify_blog(elements) - { - # To be written. - } + {} end end end \ No newline at end of file lib/rubyrati/cosmos.rb @@ -9,12 +9,14 @@ class TestRubyrati < Test::Unit::TestCase def test_should_do_a_basic_cosmos_query testblog = Rubyrati::Blog.new(@url) - assert_not_nil(testblog.get_links(@key)) + result = testblog.get_links(@key) + assert_not_nil(result) + p result end def test_should_return_a_hash_of_parameters testblog = Rubyrati::Blog.new(@url) - assert_equal(testblog.get_links(@key).class, Array) + assert_equal(Hash, testblog.get_links(@key).class) end end \ No newline at end of file test/test_rubyrati.rb 16c73841bbf7d8e42ea3b1259c063453fec3f2e0 Apostlion apostlion@gmail.com http://github.com/apostlion/rubyrati/commit/9878d5a6fc7026b895337dca449ae1dcdad8e2a2 9878d5a6fc7026b895337dca449ae1dcdad8e2a2 2009-01-17T04:14:28-08:00 2009-01-17T04:14:28-08:00 Fixed resultify_links, overall polish ba3de753f5d38e554c0e7e8a81c7dd65e0e17203 Apostlion apostlion@gmail.com