alexa 0.3.0 → 0.3.1

data/.travis.yml

@@ -5,8 +5,8 @@ rvm:
   - 1.9.2
   - 1.9.3
 env:
-  - XML_PARSER=rexml
-  - XML_PARSER=nokogiri
-  - XML_PARSER=libxml
+  - ALEXA_XML_PARSER=rexml
+  - ALEXA_XML_PARSER=nokogiri
+  - ALEXA_XML_PARSER=libxml
   # does not work yet
-  # - XML_PARSER=ox
+  # - ALEXA_XML_PARSER=ox

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gem "minitest", :platform => :ruby_18
 gem "rake"

data/README.md

@@ -27,7 +27,7 @@ You can set configuration in block like this:
 
 ``` ruby
 Alexa.configure do |config|
-  config.access_key_id = "key"
+  config.access_key_id     = "key"
   config.secret_access_key = "secret"
 end
 ```
@@ -58,4 +58,4 @@ Support following:
 
 ## Copyright
 
-Copyright (c) 2011 Wojciech Wnętrzak. See LICENSE for details.
+Copyright (c) 2012 Wojciech Wnętrzak. See LICENSE for details.

data/alexa.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/alexa/version', __FILE__)
+require File.expand_path("../lib/alexa/version", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Wojciech Wnętrzak"]
@@ -12,11 +12,19 @@ Gem::Specification.new do |gem|
   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.require_paths = ["lib"]
   gem.version       = Alexa::VERSION
 
-  gem.add_dependency "multi_xml"
+  gem.add_dependency "multi_xml", ">= 0.5.0"
 
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "fakeweb"
+
+  gem.post_install_message = %{
+
+Gem syntax of 0.4 version of this gem will change with backward incompatibilities.
+If you don't want to update your code, please specify in your Gemfile:
+gem "alexa", "~> 0.3.0"
+
+}
 end

data/lib/alexa.rb

@@ -2,15 +2,13 @@ require "cgi"
 require "base64"
 require "openssl"
 require "digest/sha1"
-require "uri"
 require "net/https"
 require "time"
 
 require "multi_xml"
 
-require "alexa/config"
-require "alexa/url_info"
 require "alexa/version"
+require "alexa/url_info"
 
 module Alexa
   class << self

data/lib/alexa/url_info.rb

@@ -26,24 +26,24 @@ class Alexa::UrlInfo
 
   def parse_xml(xml)
     xml = MultiXml.parse(force_encoding(xml))
-    group = response_group.split(',')
+    group = response_group.split(",")
     alexa = xml["UrlInfoResponse"]["Response"]["UrlInfoResult"]["Alexa"]
-    @rank = alexa['TrafficData']['Rank'].to_i if group.include?('Rank') && !alexa['TrafficData']['Rank'].nil?
-    @data_url = alexa['TrafficData']['DataUrl'] if group.include?('Rank')
-    @rank_by_country = alexa['TrafficData']['RankByCountry']['Country'] if group.include?('RankByCountry') && !alexa['TrafficData']['RankByCountry'].nil?
-    @rank_by_city = alexa['TrafficData']['RankByCity']['City'] if group.include?('RankByCity') && !alexa['TrafficData']['RankByCity'].nil?
-    @usage_statistics = alexa['TrafficData']['UsageStatistics']["UsageStatistic"] if group.include?('UsageStats') && !alexa['TrafficData']['UsageStatistics'].nil?
+    @rank = alexa["TrafficData"]["Rank"].to_i if group.include?("Rank") && !alexa["TrafficData"]["Rank"].nil?
+    @data_url = alexa["TrafficData"]["DataUrl"]["__content__"] if group.include?("Rank")
+    @rank_by_country = alexa["TrafficData"]["RankByCountry"]["Country"] if group.include?("RankByCountry") && !alexa["TrafficData"]["RankByCountry"].nil?
+    @rank_by_city = alexa["TrafficData"]["RankByCity"]["City"] if group.include?("RankByCity") && !alexa["TrafficData"]["RankByCity"].nil?
+    @usage_statistics = alexa["TrafficData"]["UsageStatistics"]["UsageStatistic"] if group.include?("UsageStats") && !alexa["TrafficData"]["UsageStatistics"].nil?
 
-    @site_title = alexa['ContentData']['SiteData']['Title'] if group.include?('SiteData')
-    @site_description = alexa['ContentData']['SiteData']['Description'] if group.include?('SiteData')
-    @language_locale = alexa['ContentData']['Language']['Locale'] if group.include?('Language') && !alexa['ContentData']['Language'].nil?
-    @language_encoding = alexa['ContentData']['Language']['Encoding'] if group.include?('Language') && !alexa['ContentData']['Language'].nil?
-    @links_in_count = alexa['ContentData']['LinksInCount'].to_i if group.include?('LinksInCount') && !alexa['ContentData']['LinksInCount'].nil?
-    @keywords = alexa['ContentData']['Keywords']['Keyword'] if group.include?('Keywords') && !alexa['ContentData']['Keywords'].nil?
-    @speed_median_load_time = alexa['ContentData']['Speed']['MedianLoadTime'].to_i if group.include?('Speed') && !alexa['ContentData']['Speed']['MedianLoadTime'].nil?
-    @speed_percentile = alexa['ContentData']['Speed']['Percentile'].to_i if group.include?('Speed') && !alexa['ContentData']['Speed']['Percentile'].nil?
+    @site_title = alexa["ContentData"]["SiteData"]["Title"] if group.include?("SiteData")
+    @site_description = alexa["ContentData"]["SiteData"]["Description"] if group.include?("SiteData")
+    @language_locale = alexa["ContentData"]["Language"]["Locale"] if group.include?("Language") && !alexa["ContentData"]["Language"].nil?
+    @language_encoding = alexa["ContentData"]["Language"]["Encoding"] if group.include?("Language") && !alexa["ContentData"]["Language"].nil?
+    @links_in_count = alexa["ContentData"]["LinksInCount"].to_i if group.include?("LinksInCount") && !alexa["ContentData"]["LinksInCount"].nil?
+    @keywords = alexa["ContentData"]["Keywords"]["Keyword"] if group.include?("Keywords") && !alexa["ContentData"]["Keywords"].nil?
+    @speed_median_load_time = alexa["ContentData"]["Speed"]["MedianLoadTime"].to_i if group.include?("Speed") && !alexa["ContentData"]["Speed"]["MedianLoadTime"].nil?
+    @speed_percentile = alexa["ContentData"]["Speed"]["Percentile"].to_i if group.include?("Speed") && !alexa["ContentData"]["Speed"]["Percentile"].nil?
 
-    @related_links = alexa['Related']['RelatedLinks']['RelatedLink'] if group.include?('RelatedLinks') && !alexa['Related']['RelatedLinks'].nil?
+    @related_links = alexa["Related"]["RelatedLinks"]["RelatedLink"] if group.include?("RelatedLinks") && !alexa["Related"]["RelatedLinks"].nil?
   end
 
   private
@@ -53,7 +53,7 @@ class Alexa::UrlInfo
   end
 
   def force_encoding(xml)
-    if RUBY_VERSION >= '1.9'
+    if RUBY_VERSION >= "1.9"
       xml.force_encoding(Encoding::UTF_8)
     else
       xml

data/lib/alexa/version.rb

@@ -1,3 +1,3 @@
 module Alexa
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/config_test.rb

@@ -6,7 +6,7 @@ describe Alexa do
     Alexa.secret_access_key = nil
   end
 
-  it "should raise argumment error if access key id is not present" do
+  it "raises argumment error if access key id is not present" do
     assert_raises ArgumentError do
       Alexa::UrlInfo.new(
         :secret_access_key => "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF",
@@ -15,7 +15,7 @@ describe Alexa do
     end
   end
 
-  it "should raise argumment error if secret access key is not present" do
+  it "raises argumment error if secret access key is not present" do
     assert_raises ArgumentError do
       Alexa::UrlInfo.new(
         :access_key_id => "12345678901234567890",
@@ -24,7 +24,7 @@ describe Alexa do
     end
   end
 
-  it "should raise argumment error if host is not present" do
+  it "raises argumment error if host is not present" do
     assert_raises ArgumentError do
       Alexa::UrlInfo.new(
         :access_key_id => "12345678901234567890",

data/test/helper.rb

@@ -6,10 +6,10 @@ require "mocha"
 
 require "alexa"
 
-if ENV["XML_PARSER"]
-  require ENV["XML_PARSER"] if ["nokogiri", "libxml", "ox"].include?(ENV["XML_PARSER"])
-  MultiXml.parser = ENV["XML_PARSER"]
-end
+alexa_xml_parser = ENV["ALEXA_XML_PARSER"] || "rexml"
+
+require alexa_xml_parser if ["nokogiri", "libxml", "ox"].include?(alexa_xml_parser)
+MultiXml.parser = alexa_xml_parser
 
 class MiniTest::Unit::TestCase
   def setup

data/test/url_info_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-describe "Alexa::UlrInfo" do
+describe Alexa::UrlInfo do
   before do
     @alexa = Alexa::UrlInfo.new(
       :access_key_id => "12345678901234567890",
@@ -9,16 +9,18 @@ describe "Alexa::UlrInfo" do
     )
   end
 
-  it "should Generate signature" do
+  it "generates signature" do
     @alexa.stubs(:timestamp).returns("2009-07-03T07:22:24.000Z")
+
     assert_equal "5Jql3rds3vL9hyijnYtUIVv1H8Q=", @alexa.send(:signature)
   end
 
-  it "should Generate url" do
+  it "generates 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&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
@@ -31,24 +33,25 @@ describe "Alexa::UlrInfo" do
       @alexa.parse_xml(@alexa.xml_response)
     end
 
-    it "should return rank" do
+    it "returns rank" do
       assert_equal 493, @alexa.rank
     end
 
-    it "should return data url" do
+    it "returns data url" do
       assert_equal "github.com/", @alexa.data_url
     end
 
-    it "should return site title" do
+    it "returns site title" do
       assert_equal "GitHub", @alexa.site_title
     end
 
-    it "should return site description" do
+    it "returns site description" do
       expected = "Online project hosting using Git. Includes source-code browser, in-line editing, wikis, and ticketing. Free for public open-source code. Commercial closed source hosting is also available."
+
       assert_equal expected, @alexa.site_description
     end
 
-    it "should not have other attributes" do
+    it "does not have other attributes" do
       assert_nil @alexa.language_locale
     end
   end
@@ -60,84 +63,87 @@ describe "Alexa::UlrInfo" do
       @alexa.parse_xml(@alexa.xml_response)
     end
 
-    it "should return rank" do
+    it "returns rank" do
       assert_equal 551, @alexa.rank
     end
 
-    it "should return data url" do
+    it "returns data url" do
       assert_equal "github.com", @alexa.data_url
     end
 
-    it "should return site title" do
+    it "returns site title" do
       assert_equal "GitHub", @alexa.site_title
     end
 
-    it "should return site description" do
+    it "returns site description" do
       expected = "Online project hosting using Git. Includes source-code browser, in-line editing, wikis, and ticketing. Free for public open-source code. Commercial closed source hosting is also available."
       assert_equal expected, @alexa.site_description
     end
 
-    it "should return language locale" do
+    it "returns language locale" do
       assert_nil @alexa.language_locale
     end
 
-    it "should return language encoding" do
+    it "returns language encoding" do
       assert_nil @alexa.language_encoding
     end
 
-    it "should return links in count" do
+    it "returns links in count" do
       assert_equal 43819, @alexa.links_in_count
     end
 
-    it "should return keywords" do
+    it "returns keywords" do
       assert_nil @alexa.keywords
     end
 
-    it "should return related links" do
+    it "returns related links" do
       assert_equal 10, @alexa.related_links.size
     end
 
-    it "should return speed_median load time" do
+    it "returns speed_median load time" do
       assert_equal 1031, @alexa.speed_median_load_time
     end
 
-    it "should return speed percentile" do
+    it "returns speed percentile" do
       assert_equal 68, @alexa.speed_percentile
     end
 
-    it "should return rank by country" do
+    it "returns rank by country" do
       assert_equal 19, @alexa.rank_by_country.size
     end
 
-    it "should return rank by city" do
+    it "returns rank by city" do
       assert_equal 163, @alexa.rank_by_city.size
     end
 
-    it "should return usage statistics" do
+    it "returns usage statistics" do
       assert_equal 4, @alexa.usage_statistics.size
     end
   end
 
   describe "with github.com rank response group" do
-    it "should successfuly connect" do
+    it "successfuly connects" do
       FakeWeb.register_uri(:get, %r{http://awis.amazonaws.com}, :response => fixture("github_rank.txt"))
       @alexa.response_group = "Rank"
       @alexa.connect
       @alexa.parse_xml(@alexa.xml_response)
+
       assert_equal 551, @alexa.rank
     end
   end
 
   describe "parsing xml with failure" do
-    it "should raise error when unathorized" do
+    it "raises error when unathorized" do
       FakeWeb.register_uri(:get, %r{http://awis.amazonaws.com}, :response => fixture("unathorized.txt"))
+
       assert_raises StandardError do
         @alexa.connect
       end
     end
 
-    it "should raise error when forbidden" do
+    it "raises error when forbidden" do
       FakeWeb.register_uri(:get, %r{http://awis.amazonaws.com}, :response => fixture("forbidden.txt"))
+
       assert_raises StandardError do
         @alexa.connect
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexa
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &18737420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *18737420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &18736900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18736900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &18735980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18735980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Alexa Web Information Service library (AWIS)
 email:
 - w.wnetrzak@gmail.com
@@ -59,7 +74,6 @@ files:
 - Rakefile
 - alexa.gemspec
 - lib/alexa.rb
-- lib/alexa/config.rb
 - lib/alexa/url_info.rb
 - lib/alexa/version.rb
 - test/config_test.rb
@@ -73,7 +87,17 @@ files:
 - test/url_info_test.rb
 homepage: https://github.com/morgoth/alexa
 licenses: []
-post_install_message: 
+post_install_message: ! '
+
+
+  Gem syntax of 0.4 version of this gem will change with backward incompatibilities.
+
+  If you don''t want to update your code, please specify in your Gemfile:
+
+  gem "alexa", "~> 0.3.0"
+
+
+'
 rdoc_options: []
 require_paths:
 - lib
@@ -85,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4342544955797275684
+      hash: 2191053239788630908
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,10 +118,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4342544955797275684
+      hash: 2191053239788630908
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Alexa Web Information Service library

data/lib/alexa/config.rb

@@ -1,25 +0,0 @@
-require "singleton"
-
-module Alexa
-  class Config
-    include Singleton
-    attr_reader :access_key_id, :secret_access_key
-
-    def access_key_id=(key)
-      puts "Depracation warning: Alexa.config.access_key_id= is deprecated. Use Alexa.access_key_id="
-      Alexa.access_key_id = key
-    end
-
-    def secret_access_key=(key)
-      puts "Depracation warning: Alexa.config.secret_access_key= is deprecated. Use Alexa.secret_access_key="
-      Alexa.secret_access_key = key
-    end
-  end
-
-  def self.config
-    if block_given?
-      yield Config.instance
-    end
-    Config.instance
-  end
-end