alexa 0.2.1 → 0.2.2

data/{README.rdoc → README.markdown}

@@ -1,28 +1,39 @@
-= Alexa Web Information Service
+# Alexa Web Information Service #
 
-== Usage
-  Alexa.url_info(:access_key_id => 'key', :secret_access_key => 'secret', :host => 'site.com')
-  # also you can specify option :response_group => 'Rank,ContactInfo' or any other valid group,
-  # see: http://docs.amazonwebservices.com/AlexaWebInfoService/2005-07-11/
-  # default response group takes all the available options
+## Installation ##
+
+```
+  gem install alexa
+```
+
+## Usage ##
+
+``` ruby
+  Alexa.url_info(:access_key_id => "key", :secret_access_key => "secret", :host => "site.com")
 
   returns object with methods:
   :xml_response, :rank, :data_url, :site_title, :site_description, :language_locale, :language_encoding,
   :links_in_count, :keywords, :related_links, :speed_median_load_time, :speed_percentile,
   :rank_by_country, :rank_by_city, :usage_statistics
+```
+
+NOTE: You can specify option `:response_group => "Rank,ContactInfo"` or any other valid group.
+See: [Docs](http://docs.amazonwebservices.com/AlexaWebInfoService/latest/)
+Default response group takes all the available options.
 
 You can set configuration in block like this:
+
+``` ruby
   Alexa.config do |c|
     c.access_key_id = "key"
     c.secret_access_key = "secret"
   end
+```
 
-== Installation
-  gem install alexa
+## Contributors ##
 
-== Contributors
-* rmoriz[http://github.com/rmoriz]
+* [rmoriz](https://github.com/rmoriz)
 
-== Copyright
+## Copyright ##
 
 Copyright (c) 2011 Wojciech Wnętrzak. See LICENSE for details.

data/alexa.gemspec

@@ -1,25 +1,21 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "alexa/version"
+require File.expand_path('../lib/alexa/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name        = "alexa"
-  s.version     = Alexa::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Wojciech Wnętrzak"]
-  s.email       = ["w.wnetrzak@gmail.com"]
-  s.homepage    = "https://github.com/morgoth/alexa"
-  s.summary     = %q{Alexa Web Information Service library}
-  s.description = %q{Alexa Web Information Service library (AWIS)}
+Gem::Specification.new do |gem|
+  gem.authors       = ["Wojciech Wnętrzak"]
+  gem.email         = ["w.wnetrzak@gmail.com"]
+  gem.description   = %q{Alexa Web Information Service library (AWIS)}
+  gem.summary       = %q{Alexa Web Information Service library}
+  gem.homepage      = "https://github.com/morgoth/alexa"
 
-  s.rubyforge_project = "alexa"
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name          = "alexa"
+  gem.require_paths = ['lib']
+  gem.version       = Alexa::VERSION
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  gem.add_dependency "xml-simple"
 
-  s.add_dependency "xml-simple"
-
-  s.add_development_dependency "mocha"
+  gem.add_development_dependency "mocha"
 end

data/lib/alexa/url_info.rb

@@ -1,6 +1,7 @@
 module Alexa
   class UrlInfo
     API_VERSION = "2005-07-11"
+    HOST = "awis.amazonaws.com"
     RESPONSE_GROUP = "Rank,ContactInfo,AdultContent,Speed,Language,Keywords,OwnedDomains,LinksInCount,SiteData,RelatedLinks,RankByCountry,RankByCity,UsageStats"
 
     attr_accessor :host, :response_group, :xml_response,
@@ -79,21 +80,32 @@ module Alexa
     end
 
     def signature
-      @signature ||= Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new("sha1"), Alexa.config.secret_access_key, "UrlInfo" + timestamp)).strip
+      Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new("sha1"), Alexa.config.secret_access_key, sign)).strip
     end
 
     def url
-      URI.parse("http://awis.amazonaws.com/?" +
-        {
-          "Action"         => "UrlInfo",
-          "AWSAccessKeyId" => Alexa.config.access_key_id,
-          "Signature"      => signature,
-          "Timestamp"      => timestamp,
-          "ResponseGroup"  => response_group,
-          "Url"            => host,
-          "Version"        => API_VERSION
-        }.map { |key, value| "#{key}=#{CGI::escape(value)}" }.sort.join("&")
-      )
+      URI.parse("http://#{HOST}/?" + query + "&Signature=" + CGI::escape(signature))
+    end
+
+    def params_without_signature
+      {
+        "Action"           => "UrlInfo",
+        "AWSAccessKeyId"   => Alexa.config.access_key_id,
+        "ResponseGroup"    => response_group,
+        "SignatureMethod"  => "HmacSHA1",
+        "SignatureVersion" => "2",
+        "Timestamp"        => timestamp,
+        "Url"              => host,
+        "Version"          => API_VERSION
+      }
+    end
+
+    def sign
+      "GET\n" + HOST + "\n/\n" + query
+    end
+
+    def query
+      params_without_signature.map { |key, value| "#{key}=#{CGI::escape(value)}" }.sort.join("&")
     end
   end
 end

data/lib/alexa/version.rb

@@ -1,3 +1,3 @@
 module Alexa
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/url_info_test.rb

@@ -11,14 +11,14 @@ describe "Alexa::UlrInfo" do
 
   it "should Generate signature" do
     @alexa.stubs(:timestamp).returns("2009-07-03T07:22:24.000Z")
-    assert_equal "I1mPdBy+flhhzqqUaamNq9gq190=", @alexa.send(:signature)
+    assert_equal "5Jql3rds3vL9hyijnYtUIVv1H8Q=", @alexa.send(:signature)
   end
 
   it "should Generate url" do
     @alexa.stubs(:timestamp).returns("2009-07-03T07:22:24.000Z")
     @alexa.response_group = "Rank,ContactInfo,AdultContent,Speed,Language,Keywords,OwnedDomains,LinksInCount,SiteData,RelatedLinks"
     @alexa.host = "heroku.com"
-    expected_uri = "/?AWSAccessKeyId=12345678901234567890&Action=UrlInfo&ResponseGroup=Rank%2CContactInfo%2CAdultContent%2CSpeed%2CLanguage%2CKeywords%2COwnedDomains%2CLinksInCount%2CSiteData%2CRelatedLinks&Signature=I1mPdBy%2BflhhzqqUaamNq9gq190%3D&Timestamp=2009-07-03T07%3A22%3A24.000Z&Url=heroku.com&Version=2005-07-11"
+    expected_uri = "/?AWSAccessKeyId=12345678901234567890&Action=UrlInfo&ResponseGroup=Rank%2CContactInfo%2CAdultContent%2CSpeed%2CLanguage%2CKeywords%2COwnedDomains%2CLinksInCount%2CSiteData%2CRelatedLinks&SignatureMethod=HmacSHA1&SignatureVersion=2&Timestamp=2009-07-03T07%3A22%3A24.000Z&Url=heroku.com&Version=2005-07-11&Signature=H9VtDwXGXT5O8NodLOlsc2wIfv8%3D"
     assert_equal expected_uri, @alexa.send(:url).request_uri
     assert_equal "awis.amazonaws.com", @alexa.send(:url).host
   end

metadata

@@ -2,7 +2,7 @@
 name: alexa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Wojciech Wn\xC4\x99trzak"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 Z
+date: 2011-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple
@@ -47,7 +47,7 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - alexa.gemspec
 - lib/alexa.rb
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3761737575741442318
+      hash: 3945594913730495291
       segments: 
       - 0
       version: "0"
@@ -82,14 +82,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3761737575741442318
+      hash: 3945594913730495291
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: alexa
-rubygems_version: 1.8.0
+rubyforge_project: 
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Alexa Web Information Service library