alexa 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d993a6237b4a5ee390e3b076b57b13e49f3c0014
-  data.tar.gz: b3ad19ed26b737f4993a73289e4acf44a498f772
+SHA256:
+  metadata.gz: 11db0614491c18c079708be97c2b65ff9f05bb9999439e4436c27bb39aec1aea
+  data.tar.gz: 854d04563942132728f9ae59e9a5d3046411f566413c76a21855df032f80be55
 SHA512:
-  metadata.gz: 47de954fcf55be7005c4cadf751e315be6a4211427b65642a60c7898c8c65295b8f03e718557f426c0482bed01a670251b2482c08c1317ee10139ebd2704b06f
-  data.tar.gz: 8e7feb1cac57937f7beb6468f93eb7aad20d10e7637d712d986f3cf7c6e1d79c2f37fe2539b2baa6af65f105c7312e4455b1baf1166fa4280c9fceec07e4e6bf
+  metadata.gz: f68b8c4202388d2c6d3874f304aeb1985b3174b9ebd1db92074172fb8923448a6fef932a7b0f80cf9fc6c6c5680643869a8bd2846ed7a8a282739d91c30ddd71
+  data.tar.gz: af94f14db646a36c316c5fbe94b855e7ad7d220b914dd18f5067f2376b0bdc06be3268b1e957a75e2e2eb543e29a1f1a0f2181e986e833a661d1961ce2257043

data/.travis.yml

@@ -1,10 +1,12 @@
-notifications:
-  disabled: true
-bundler_args: --without extra
+language: ruby
+cache: bundler
+
+before_install:
+  - gem install bundler
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 2.4
+  - 2.5
 env:
   - XML_PARSER=rexml
   - XML_PARSER=nokogiri

data/Gemfile

@@ -1,9 +1,5 @@
 source "https://rubygems.org"
 
-group :extra do
-  gem "debugger"
-end
-
 gem "rake"
 
 # xml parsers

data/alexa.gemspec

@@ -1,27 +1,33 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/alexa/version", __FILE__)
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "alexa/version"
 
 Gem::Specification.new do |gem|
+  gem.name          = "alexa"
+  gem.version       = Alexa::VERSION
   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.description   = %q{Alexa Web Information Service library (AWIS)}
   gem.homepage      = "https://github.com/morgoth/alexa"
   gem.license       = "MIT"
 
-  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.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  gem.bindir        = "exe"
+  gem.executables   = gem.files.grep(%r{^exe/}) { |f| File.basename(f) }
   gem.require_paths = ["lib"]
-  gem.version       = Alexa::VERSION
 
   gem.required_ruby_version = ">= 1.9.3"
 
+  gem.add_dependency "aws-sigv4"
   gem.add_dependency "multi_xml", ">= 0.5.0"
-  gem.add_dependency "faraday", "~> 0.8"
 
   gem.add_development_dependency "minitest", ">= 5.0.0"
   gem.add_development_dependency "mocha"
   gem.add_development_dependency "webmock"
+  gem.add_development_dependency "vcr"
 end

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "alexa"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/alexa.rb

@@ -13,5 +13,6 @@ require "alexa/api/url_info"
 
 module Alexa
   API_VERSION = "2005-07-11"
-  API_HOST    = "awis.amazonaws.com"
+  API_REGION  = "us-west-1"
+  API_HOST    = "https://awis.#{API_REGION}.amazonaws.com"
 end

data/lib/alexa/connection.rb

@@ -1,80 +1,77 @@
 require "cgi"
-require "base64"
-require "openssl"
-require "digest/sha1"
-require "faraday"
-require "time"
+require "aws-sigv4"
+require "net/https"
 
 module Alexa
   class Connection
-    attr_accessor :secret_access_key, :access_key_id
-    attr_writer :params
+    attr_reader :params, :secret_access_key, :access_key_id
 
-    RFC_3986_UNRESERVED_CHARS = "-_.~a-zA-Z\\d"
+    HEADERS = {
+      "Content-Type" => "application/xml",
+      "Accept" => "application/xml",
+      "User-Agent" => "Ruby alexa gem v#{Alexa::VERSION}"
+    }
 
     def initialize(credentials = {})
-      self.secret_access_key = credentials.fetch(:secret_access_key)
-      self.access_key_id     = credentials.fetch(:access_key_id)
-    end
-
-    def params
-      @params ||= {}
+      @secret_access_key = credentials.fetch(:secret_access_key)
+      @access_key_id     = credentials.fetch(:access_key_id)
     end
 
     def get(params = {})
-      self.params = params
+      @params = params
       handle_response(request).body.force_encoding(Encoding::UTF_8)
     end
 
+    private
+
     def handle_response(response)
-      case response.status.to_i
-      when 200...300
+      case response
+      when Net::HTTPSuccess
         response
-      when 300...600
-        if response.body.nil?
-          raise ResponseError.new(nil, response)
-        else
-          xml = MultiXml.parse(response.body)
-          message = xml["Response"]["Errors"]["Error"]["Message"]
-          raise ResponseError.new(message, response)
-        end
       else
-        raise ResponseError.new("Unknown code: #{respnse.code}", response)
+        raise ResponseError.new(response.body, response)
       end
     end
 
     def request
-      Faraday.get(uri)
-    end
-
-    def timestamp
-      @timestamp ||= Time::now.utc.strftime("%Y-%m-%dT%H:%M:%S.000Z")
+      req = Net::HTTP::Get.new(uri)
+      headers.each do |key, value|
+        req[key] = value
+      end
+      Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+        http.request(req)
+      end
     end
 
-    def signature
-      Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new("sha256"), secret_access_key, sign)).strip
+    def uri
+      @uri ||= URI.parse("#{Alexa::API_HOST}/api?" << query)
     end
 
-    def uri
-      URI.parse("http://#{Alexa::API_HOST}/?" + query + "&Signature=" + CGI::escape(signature))
+    def headers
+      HEADERS.merge(auth_headers)
     end
 
-    def default_params
-      {
-        "AWSAccessKeyId"   => access_key_id,
-        "SignatureMethod"  => "HmacSHA256",
-        "SignatureVersion" => "2",
-        "Timestamp"        => timestamp,
-        "Version"          => Alexa::API_VERSION
-      }
+    def auth_headers
+      signer.sign_request(
+        http_method: "GET",
+        headers: HEADERS,
+        url: uri.to_s
+      ).headers
     end
 
-    def sign
-      "GET\n" + Alexa::API_HOST + "\n/\n" + query
+    def signer
+      Aws::Sigv4::Signer.new(
+        service: "awis",
+        region: Alexa::API_REGION,
+        access_key_id: access_key_id,
+        secret_access_key: secret_access_key
+      )
     end
 
     def query
-      default_params.merge(params).map { |key, value| "#{key}=#{URI.escape(value.to_s, Regexp.new("[^#{RFC_3986_UNRESERVED_CHARS}]"))}" }.sort.join("&")
+      params.map do |key, value|
+        "#{key}=#{CGI.escape(value.to_s)}"
+      end.sort!.join("&")
     end
   end
 end

data/lib/alexa/version.rb

@@ -1,3 +1,3 @@
 module Alexa
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: alexa
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Wojciech Wnętrzak
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_xml
+  name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Alexa Web Information Service library (AWIS)
 email:
 - w.wnetrzak@gmail.com
@@ -94,6 +108,8 @@ files:
 - README.md
 - Rakefile
 - alexa.gemspec
+- bin/console
+- bin/setup
 - lib/alexa.rb
 - lib/alexa/api/base.rb
 - lib/alexa/api/category_browse.rb
@@ -106,27 +122,6 @@ files:
 - lib/alexa/exceptions.rb
 - lib/alexa/utils.rb
 - lib/alexa/version.rb
-- test/api/category_browse_test.rb
-- test/api/category_listings_test.rb
-- test/api/sites_linking_in_test.rb
-- test/api/traffic_history_test.rb
-- test/api/url_info_test.rb
-- test/client_test.rb
-- test/connection_test.rb
-- test/fixtures/bad_request.txt
-- test/fixtures/category_browse/card_games.txt
-- test/fixtures/category_listings/card_games.txt
-- test/fixtures/forbidden.txt
-- test/fixtures/sites_linking_in/github_count_3.txt
-- test/fixtures/traffic_history/alexa_error.txt
-- test/fixtures/traffic_history/github.txt
-- test/fixtures/unathorized.txt
-- test/fixtures/url_info/custom-response-group.txt
-- test/fixtures/url_info/empty_group.txt
-- test/fixtures/url_info/github_full.txt
-- test/fixtures/url_info/github_rank.txt
-- test/helper.rb
-- test/utils_test.rb
 homepage: https://github.com/morgoth/alexa
 licenses:
 - MIT
@@ -147,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Alexa Web Information Service library

data/test/api/category_browse_test.rb

@@ -1,41 +0,0 @@
-require "helper"
-
-describe Alexa::API::CategoryBrowse do
-  it "raises argument error when path not present" do
-    assert_raises Alexa::ArgumentError, /path/ do
-      Alexa::API::CategoryBrowse.new(:access_key_id => "fake", :secret_access_key => "fake").fetch
-    end
-  end
-
-  describe "parsing xml" do
-    before do
-      stub_request(:get, %r{http://awis.amazonaws.com}).to_return(fixture("category_browse/card_games.txt"))
-      @category_browse = Alexa::API::CategoryBrowse.new(:access_key_id => "fake", :secret_access_key => "fake")
-      @category_browse.fetch(:path => "Top/Games/Card_Games")
-    end
-
-    it "returns categories" do
-      assert_equal 8, @category_browse.categories.size
-    end
-
-    it "returns language categories" do
-      assert_equal 20, @category_browse.language_categories.size
-    end
-
-    it "returns related categories" do
-      assert_equal 8, @category_browse.related_categories.size
-    end
-
-    it "returns letter bars" do
-      assert_equal 36, @category_browse.letter_bars.size
-    end
-
-    it "has success status code" do
-      assert_equal "Success", @category_browse.status_code
-    end
-
-    it "has request id" do
-      assert_equal "c8bec6fe-84f3-9a8e-7444-47f86c64d74b", @category_browse.request_id
-    end
-  end
-end

data/test/api/category_listings_test.rb

@@ -1,37 +0,0 @@
-require "helper"
-
-describe Alexa::API::CategoryListings do
-  it "raises argument error when path not present" do
-    assert_raises Alexa::ArgumentError, /path/ do
-      Alexa::API::CategoryListings.new(:access_key_id => "fake", :secret_access_key => "fake").fetch
-    end
-  end
-
-  describe "parsing xml" do
-    before do
-      stub_request(:get, %r{http://awis.amazonaws.com}).to_return(fixture("category_listings/card_games.txt"))
-      @category_listings = Alexa::API::CategoryListings.new(:access_key_id => "fake", :secret_access_key => "fake")
-      @category_listings.fetch(:path => "Top/Games/Card_Games")
-    end
-
-    it "returns recursive count" do
-      assert_equal 1051, @category_listings.recursive_count
-    end
-
-    it "returns count" do
-      assert_equal 1, @category_listings.count
-    end
-
-    it "returns listings" do
-      assert_equal 20, @category_listings.listings.size
-    end
-
-    it "has success status code" do
-      assert_equal "Success", @category_listings.status_code
-    end
-
-    it "has request id" do
-      assert_equal "a069b6cd-309f-df52-88be-1bd88ab45b7e", @category_listings.request_id
-    end
-  end
-end