lib/page_rankr/ranks/alexa_global.rb in PageRankr-2.0.4 vs lib/page_rankr/ranks/alexa_global.rb in PageRankr-3.0.0

@@ -1,25 +1,27 @@
-require 'typhoeus'
-require 'nokogiri'
+require File.expand_path('../../rank', __FILE__)
 
 module PageRankr
   class Ranks
     class AlexaGlobal
       include Rank
       
+      def url
+        "http://data.alexa.com/data"
+      end
+
+      def params
+        {:cli => 10, :dat => "snbamz", :url => @site.to_s}
+      end
+
       # Alexa may sometimes return a result for the incorrect site and thus it is necessary to check if
       # the results returned are for the site we want.
       #
       # For example, slocourts.net returns results for ca.gov, presumably because www.slocourts.ca.gov redirects
       # to slocourts.net. Clearly something is wrong with how Alexa handles this case and so in the event this
       # happens we treat the results as if there were no results.
       def xpath
          "//popularity[contains(@url, '#{@site.domain}')]/@text"
-      end
-      
-      def request
-        @request ||= Typhoeus::Request.new("http://data.alexa.com/data",
-            :params => {:cli => 10, :dat => "snbamz", :url => @site.to_s})
       end
     end
   end
 end
\ No newline at end of file