morgoth-alexa 0.0.4 → 0.0.5

data/README.rdoc

@@ -11,6 +11,9 @@
   :links_in_count, :keywords, :related_links, :speed_median_load_time, :speed_percentile,
   :rank_by_country, :rank_by_city, :usage_statistics
 
+== Contributors
+  * rmoriz[http://github.com/rmoriz]
+
 == Copyright
 
 Copyright (c) 2009 Wojciech Wnętrzak. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/alexa.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{alexa}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wojciech Wnętrzak"]
-  s.date = %q{2009-07-07}
+  s.date = %q{2009-07-23}
   s.email = %q{w.wnetrzak@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/morgoth/alexa}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Alexa Web Information Service library}
   s.test_files = [
     "test/alexa_test.rb",

data/lib/alexa/url_info.rb

@@ -25,7 +25,7 @@ module Alexa
     end
 
     def parse_xml(xml)
-      xml = XmlSimple.xml_in(xml.force_encoding(Encoding::UTF_8), 'ForceArray' => false)
+      xml = XmlSimple.xml_in(force_encoding(xml), 'ForceArray' => false)
       group = response_group.split(',')
       alexa = xml['Response']['UrlInfoResult']['Alexa']
       @rank = alexa['TrafficData']['Rank'].to_i if group.include?('Rank') and !alexa['TrafficData']['Rank'].empty?
@@ -48,6 +48,14 @@ module Alexa
 
     private
 
+    def force_encoding(xml)
+      if RUBY_VERSION >= '1.9'
+        xml.force_encoding(Encoding::UTF_8)
+      else
+        xml
+      end
+    end
+
     def handle_response(response)
       case response.code.to_i
       when 200...300

data/test/alexa_test.rb

@@ -4,10 +4,10 @@ class AlexaTest < Test::Unit::TestCase
   context "Alexa::UrlInfo" do
     setup do
       @alexa = Alexa::UrlInfo.new(
-        :access_key_id =>  "12345678901234567890",
-        :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF",
-        :host => "some.host"
-        )
+      :access_key_id =>  "12345678901234567890",
+      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF",
+      :host => "some.host"
+      )
     end
 
     should "Generate signature" do
@@ -15,17 +15,21 @@ class AlexaTest < Test::Unit::TestCase
       assert_equal "I1mPdBy+flhhzqqUaamNq9gq190=", signature
     end
 
-    should "Generatee url" do
+    should "Generate url" do
       url = @alexa.send( :generate_url,
-        "UrlInfo",
-        @alexa.access_key_id,
-        "I1mPdBy+flhhzqqUaamNq9gq190=",
-        '2009-07-03T07:22:24.000Z',
-        "Rank,ContactInfo,AdultContent,Speed,Language,Keywords,OwnedDomains,LinksInCount,SiteData,RelatedLinks",
-        "heroku.com"
-        )
-      expected_uri = "/?Action=UrlInfo&AWSAccessKeyId=12345678901234567890&Signature=I1mPdBy%2BflhhzqqUaamNq9gq190%3D&Timestamp=2009-07-03T07%3A22%3A24.000Z&ResponseGroup=Rank%2CContactInfo%2CAdultContent%2CSpeed%2CLanguage%2CKeywords%2COwnedDomains%2CLinksInCount%2CSiteData%2CRelatedLinks&Url=heroku.com"
-      assert_equal expected_uri, url.request_uri
+      "UrlInfo",
+      @alexa.access_key_id,
+      "I1mPdBy+flhhzqqUaamNq9gq190=",
+      '2009-07-03T07:22:24.000Z',
+      "Rank,ContactInfo,AdultContent,Speed,Language,Keywords,OwnedDomains,LinksInCount,SiteData,RelatedLinks",
+      "heroku.com"
+      )
+      if RUBY_VERSION >= '1.9'
+        expected_uri = "/?Action=UrlInfo&AWSAccessKeyId=12345678901234567890&Signature=I1mPdBy%2BflhhzqqUaamNq9gq190%3D&Timestamp=2009-07-03T07%3A22%3A24.000Z&ResponseGroup=Rank%2CContactInfo%2CAdultContent%2CSpeed%2CLanguage%2CKeywords%2COwnedDomains%2CLinksInCount%2CSiteData%2CRelatedLinks&Url=heroku.com"
+      else
+        expected_uri = "/?Action=UrlInfo&Signature=I1mPdBy%2BflhhzqqUaamNq9gq190%3D&AWSAccessKeyId=12345678901234567890&Url=heroku.com&Timestamp=2009-07-03T07%3A22%3A24.000Z&ResponseGroup=Rank%2CContactInfo%2CAdultContent%2CSpeed%2CLanguage%2CKeywords%2COwnedDomains%2CLinksInCount%2CSiteData%2CRelatedLinks"
+        assert_equal expected_uri, url.request_uri
+      end
       assert_equal "awis.amazonaws.com", url.host
     end
 
@@ -196,25 +200,25 @@ class AlexaTest < Test::Unit::TestCase
   end
 
   should "Raise argumment error if keys or host are not present" do
-    assert_raise ArgumentError, do
+    assert_raise ArgumentError do
       Alexa::UrlInfo.new(
-        :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF",
-        :host => "some.host"
+      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF",
+      :host => "some.host"
       )
     end
 
-    assert_raise ArgumentError, do
+    assert_raise ArgumentError do
       Alexa::UrlInfo.new(
-        :access_key_id =>  "12345678901234567890",
-        :host => "some.host"
+      :access_key_id =>  "12345678901234567890",
+      :host => "some.host"
       )
     end
 
-    assert_raise ArgumentError, do
+    assert_raise ArgumentError do
       Alexa::UrlInfo.new(
-        :access_key_id =>  "12345678901234567890",
-        :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF",
+      :access_key_id =>  "12345678901234567890",
+      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
       )
     end
   end
-end
+end  

data/test/test_helper.rb

@@ -13,4 +13,5 @@ def fixture_file(filename)
   return '' if filename == ''
   file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)
   File.read(file_path)
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: morgoth-alexa
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - "Wojciech Wn\xC4\x99trzak"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 -07:00
+date: 2009-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency