alexa 0.0.7 → 0.1.0

data/README.rdoc

@@ -11,11 +11,14 @@
   :links_in_count, :keywords, :related_links, :speed_median_load_time, :speed_percentile,
   :rank_by_country, :rank_by_city, :usage_statistics
 
+You can set configuration in block like this:
+  Alexa.config do |c|
+    c.access_key_id = "key"
+    c.secret_access_key = "secret"
+  end
+
 == Installation
-<b>deprecated!</b>
-  gem install morgoth-alexa
-<b>actual</b>
-  gem install alexa --source http://gemcutter.org
+  gem install alexa
 
 == Contributors
 * rmoriz[http://github.com/rmoriz]

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

data/alexa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{alexa}
-  s.version = "0.0.7"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wojciech Wnętrzak"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2010-01-28}
   s.description = %q{Alexa Web Information Service library (AWIS)}
   s.email = %q{w.wnetrzak@gmail.com}
   s.extra_rdoc_files = [
@@ -25,12 +25,14 @@ Gem::Specification.new do |s|
      "VERSION",
      "alexa.gemspec",
      "lib/alexa.rb",
+     "lib/alexa/config.rb",
      "lib/alexa/url_info.rb",
-     "test/alexa_test.rb",
+     "test/config_test.rb",
      "test/fixtures/empty.xml",
      "test/fixtures/polsl.xml",
      "test/fixtures/polsl_small.xml",
-     "test/test_helper.rb"
+     "test/test_helper.rb",
+     "test/url_info_test.rb"
   ]
   s.homepage = %q{http://github.com/morgoth/alexa}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -38,7 +40,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Alexa Web Information Service library}
   s.test_files = [
-    "test/alexa_test.rb",
+    "test/url_info_test.rb",
+     "test/config_test.rb",
      "test/test_helper.rb"
   ]
 

data/lib/alexa.rb

@@ -8,6 +8,7 @@ require "net/https"
 require "xmlsimple"
 require "time"
 
+require 'alexa/config'
 require 'alexa/url_info'
 
 module Alexa

data/lib/alexa/config.rb

@@ -0,0 +1,15 @@
+require 'singleton'
+
+module Alexa
+  class Config
+    include Singleton
+    attr_accessor :access_key_id, :secret_access_key
+  end
+
+  def self.config
+    if block_given?
+      yield Config.instance
+    end
+    Config.instance
+  end
+end

data/lib/alexa/url_info.rb

@@ -1,23 +1,25 @@
 module Alexa
   class UrlInfo
     RESPONSE_GROUP = "Rank,ContactInfo,AdultContent,Speed,Language,Keywords,OwnedDomains,LinksInCount,SiteData,RelatedLinks,RankByCountry,RankByCity,UsageStats"
-    attr_accessor :access_key_id, :secret_access_key, :host, :response_group, :xml_response,
+    attr_accessor :host, :response_group, :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
 
-    def initialize(options = {} )
-      @access_key_id = options[:access_key_id] or raise ArgumentError.new("you must specify access_key_id")
-      @secret_access_key = options[:secret_access_key] or raise ArgumentError.new("you must specify secret_access_key")
+    def initialize(options = {})
+      Alexa.config.access_key_id = options[:access_key_id] || Alexa.config.access_key_id
+      Alexa.config.secret_access_key = options[:secret_access_key] || Alexa.config.secret_access_key
+      raise ArgumentError.new("you must specify access_key_id") if Alexa.config.access_key_id.nil?
+      raise ArgumentError.new("you must specify secret_access_key") if Alexa.config.secret_access_key.nil?
       @host = options[:host] or raise ArgumentError.new("you must specify host")
       @response_group = options[:response_group] || RESPONSE_GROUP
     end
 
     def connect
       action = "UrlInfo"
-      timestamp = ( Time::now ).utc.strftime("%Y-%m-%dT%H:%M:%S.000Z")
-      signature = generate_signature(secret_access_key, action, timestamp)
-      url = generate_url(action, access_key_id, signature, timestamp, response_group, host)
+      timestamp = Time::now.utc.strftime("%Y-%m-%dT%H:%M:%S.000Z")
+      signature = generate_signature(Alexa.config.secret_access_key, action, timestamp)
+      url = generate_url(action, Alexa.config.access_key_id, signature, timestamp, response_group, host)
       response = Net::HTTP.start(url.host) do |http|
         http.get url.request_uri
       end
@@ -74,7 +76,7 @@ module Alexa
       end
     end
 
-    def generate_signature(secret_acces_key, action, timestamp)
+    def generate_signature(secret_access_key, action, timestamp)
       Base64.encode64( OpenSSL::HMAC.digest( OpenSSL::Digest::Digest.new( "sha1" ), secret_access_key, action + timestamp)).strip
     end
 

data/test/config_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+class ConfigTest < Test::Unit::TestCase
+  context "Config test" do
+    setup do
+      # Config is singleton
+      Alexa.config.access_key_id = nil
+      Alexa.config.secret_access_key = nil
+    end
+
+    should "raise argumment error if access key id is not present" do
+      assert_raise ArgumentError do
+        Alexa::UrlInfo.new(
+        :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF",
+        :host => "some.host"
+        )
+      end
+    end
+
+    should "raise argumment error if secret access key is not present" do
+      assert_raise ArgumentError do
+        Alexa::UrlInfo.new(
+        :access_key_id =>  "12345678901234567890",
+        :host => "some.host"
+        )
+      end
+    end
+
+    should "raise argumment error if host is not present" do
+      assert_raise ArgumentError do
+        Alexa::UrlInfo.new(
+        :access_key_id =>  "12345678901234567890",
+        :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
+        )
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -6,9 +6,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'alexa'
 
-class Test::Unit::TestCase
-end
-
 def fixture_file(filename)
   return '' if filename == ''
   file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename)

data/test/{alexa_test.rb → url_info_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AlexaTest < Test::Unit::TestCase
+class UrlInfoTest < Test::Unit::TestCase
   context "Alexa::UrlInfo" do
     setup do
       @alexa = Alexa::UrlInfo.new(
@@ -11,14 +11,14 @@ class AlexaTest < Test::Unit::TestCase
     end
 
     should "Generate signature" do
-      signature = @alexa.send :generate_signature, @alexa.secret_access_key, "UrlInfo", '2009-07-03T07:22:24.000Z'
+      signature = @alexa.send :generate_signature, Alexa.config.secret_access_key, "UrlInfo", '2009-07-03T07:22:24.000Z'
       assert_equal "I1mPdBy+flhhzqqUaamNq9gq190=", signature
     end
 
     should "Generate url" do
       url = @alexa.send(:generate_url,
       "UrlInfo",
-      @alexa.access_key_id,
+      Alexa.config.access_key_id,
       "I1mPdBy+flhhzqqUaamNq9gq190=",
       '2009-07-03T07:22:24.000Z',
       "Rank,ContactInfo,AdultContent,Speed,Language,Keywords,OwnedDomains,LinksInCount,SiteData,RelatedLinks",
@@ -192,27 +192,4 @@ class AlexaTest < Test::Unit::TestCase
       end
     end
   end
-
-  should "Raise argumment error if keys or host are not present" do
-    assert_raise ArgumentError do
-      Alexa::UrlInfo.new(
-      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF",
-      :host => "some.host"
-      )
-    end
-
-    assert_raise ArgumentError do
-      Alexa::UrlInfo.new(
-      :access_key_id =>  "12345678901234567890",
-      :host => "some.host"
-      )
-    end
-
-    assert_raise ArgumentError do
-      Alexa::UrlInfo.new(
-      :access_key_id =>  "12345678901234567890",
-      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
-      )
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alexa
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors: 
 - "Wojciech Wn\xC4\x99trzak"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 +01:00
+date: 2010-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,14 @@ files:
 - VERSION
 - alexa.gemspec
 - lib/alexa.rb
+- lib/alexa/config.rb
 - lib/alexa/url_info.rb
-- test/alexa_test.rb
+- test/config_test.rb
 - test/fixtures/empty.xml
 - test/fixtures/polsl.xml
 - test/fixtures/polsl_small.xml
 - test/test_helper.rb
+- test/url_info_test.rb
 has_rdoc: true
 homepage: http://github.com/morgoth/alexa
 licenses: []
@@ -75,5 +77,6 @@ signing_key:
 specification_version: 3
 summary: Alexa Web Information Service library
 test_files: 
-- test/alexa_test.rb
+- test/url_info_test.rb
+- test/config_test.rb
 - test/test_helper.rb