awis-sdk-ruby 1.1.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3f60e08f71c0092e6c7ff4185e1e64a6af7776d9
-  data.tar.gz: cb3a28d169416fb66d36ff7d662295b777709de7
+SHA256:
+  metadata.gz: c1b8b0369cacf309ffff5b752c458d3465ef51b7b085fd9c55fce22f8651807d
+  data.tar.gz: a78a3affebba1ae56d03b0db2173044e29ae5139d02a8ea3051ba5a0b0708c13
 SHA512:
-  metadata.gz: b27b1755fc104f0fc196f1ed91c5e0d93408f3fbd62ccb39b3f7d02c135e2a34eca4db3d4a8a60ee819e0b9bf84aa48c8a392da7e5ed1c4d139e2f4474c0d553
-  data.tar.gz: 9d9e2c0011a964374a10a9d89680b57aeebbe44bc5333980f4e40fe163af26c699caecdfbf493f1222aa7f136c59ae084407409ea6223752ed78862f0bfff388
+  metadata.gz: 7229cf7a29ab8992f30e9aef6e51471250de75a7830a1021b4df1fb6d00ce5009fbf2b2410f9cb7903dfb580cda97b73b3f0080f49023d9bfac09a252eaa7c11
+  data.tar.gz: 503f910fbb860e7aab95022c0559a5c36418ddbd602e06cd6009dc07c305364075ef7b6e97987be08627773387add3f2be9710ed0bd48cb4921b7ee5754da4cd

data/.rubocop.yml

@@ -84,4 +84,4 @@ Style/NumericLiterals:
   Enabled: false
 
 Rails:
-  Enabled: true
+  Enabled: false

data/.travis.yml

@@ -2,7 +2,6 @@ notifications:
   disabled: true
 bundler_args: --without extra
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
   - 2.2.3

data/README.md

@@ -1,63 +1,116 @@
 ## Amazon - Alexa Web Information Service (AWIS)
-Ruby Library for AWIS REST API - See: [Alexa Docs](http://docs.amazonwebservices.com/AlexaWebInfoService/latest/)
+Ruby Library for AWIS REST API - see: [Alexa Docs](http://docs.amazonwebservices.com/AlexaWebInfoService/latest/)
 
 ### How to installation
 
-```
+```ruby
 gem install awis-sdk-ruby
 ```
 
+### Support Ruby 2.x 
+
+- The latest update requires Ruby 2.0 or higher
+
 ### How to usage
 
 ##### Configure your amazon certificate
 
-```
+```ruby
 require 'awis'
 
 AWIS_CONFIG = YAML.load(File.read('awis.yml'))
 Awis.config do |c|
-  c.access_key_id = AWIS_CONFIG['access_key_id']
-  c.secret_access_key = AWIS_CONFIG['secret_access_key']
-  c.debug = AWIS_CONFIG['debug']
-  c.protocol = 'https'    # Default 'https'
-  c.timeout = 10          # Default 10
-  c.open_timeout = 10     # Default 10
-  c.logger = false        # Default nil
+  c.access_key_id       = AWIS_CONFIG['access_key_id']
+  c.secret_access_key   = AWIS_CONFIG['secret_access_key']
+  c.debug               = AWIS_CONFIG['debug']
+  c.protocol            = 'https' # Default 'https'
+  c.timeout             = 10 # Default 10
+  c.open_timeout        = 10 # Default 10
+  c.logger              = false # Default nil
 end
 ```
 
-##### Get UrlInfo Information
+##### Get Url Info
 
-``` ruby
+```ruby
 client = Awis::Client.new
 url_info = client.url_info(url: "site.com")
 ```
 
 If you looking for the API request URI:
 
-* Awis::API::UrlInfo.new.load_request_uri(url: 'site.com')
-
+```ruby
+Awis::API::UrlInfo.new.load_request_uri(url: 'site.com')
+```
 
-Returns object that contains attributes:
+returns object that contains attributes:
 
 * data_url
 * rank
 * asin
-
-Returns object that contains relationships:
-
-* contact_info [:data_url, :owner_name, :email, :physical_address, :company_stock_ticker, :phone_numbers]
-* content_data [:data_url, :site_title, :site_description, :speed_median_load_time, :speed_percentile, :adult_content, :language_locale, :links_in_count, :owned_domains]
-* usage_statistics [:time_range_months, :time_range_days, :rank_value, :rank_delta, :reach_rank_value, :reach_rank_delta,
-                    :reach_per_million_value, :reach_per_million_delta, :reach_page_views_per_million_value, :reach_page_views_per_million_delta,
-                    :reach_page_views_rank_value, :reach_page_views_rank_delta, :reach_page_views_per_user_value, :reach_page_views_per_user_delta]
-    - add two methods: [range_type, range_count]
-* related_links [:data_url, :navigable_url, :title]
-* categories [:title, :absolute_path]
+* xml
 
 New methods:
 
 * is_404?
+* not_found?
+* pretty_xml
+
+`pretty_xml` method will easily to review the XML response from the terminal
+
+returns object that contains relationships:
+
+**contact_info**
+- attrubutes
+  - data_url
+  - owner_name
+  - email
+  - physical_address
+  - company_stock_ticker
+  - phone_numbers
+
+**content_data**
+- attrubutes
+  - data_url
+  - site_title
+  - site_description
+  - speed_median_load_time
+  - speed_percentile
+  - adult_content
+  - language_locale
+  - links_in_count
+  - owned_domains
+
+**usage_statistics**
+- attrubutes
+  - time_range_months
+  - time_range_days
+  - rank_value
+  - rank_delta
+  - reach_rank_value
+  - reach_rank_delta,
+  - reach_per_million_value
+  - reach_per_million_delta
+  - page_views_per_million_value
+  - page_views_per_million_delta,
+  - page_views_rank_value
+  - page_views_rank_delta
+  - page_views_per_user_value
+  - page_views_per_user_delta
+- Methods: 
+  - range_type
+  - range_count
+
+**related_links** 
+- attrubutes
+  - data_url
+  - navigable_url
+  - title
+
+**categories** 
+- attrubutes
+  - title
+  - absolute_path
 
 You can specify options:
 
@@ -66,14 +119,16 @@ You can specify options:
 
 ##### Get Sites Linking In
 
-``` ruby
+```ruby
 client = Awis::Client.new
 sites_linking_in = client.sites_linking_in(url: "site.com")
 ```
 
 If you looking for the API request URI:
 
-* Awis::API::SitesLinkingIn.new.load_request_uri(url: 'site.com')
+```ruby
+Awis::API::SitesLinkingIn.new.load_request_uri(url: 'site.com')
+```
 
 Returns object that contains relationships:
 
@@ -87,14 +142,16 @@ You can specify options:
 
 ##### Get Traffic History
 
-``` ruby
+```ruby
 client = Awis::Client.new
 traffic_history = client.traffic_history(url: "site.com")
 ```
 
 If you looking for the API request URI:
 
-* Awis::API::TrafficHistory.new.load_request_uri(url: 'site.com')
+```ruby
+Awis::API::TrafficHistory.new.load_request_uri(url: 'site.com')
+```
 
 Returns object that contains methods:
 
@@ -114,14 +171,16 @@ You can specify options:
 
 ##### Get Category Listings
 
-``` ruby
+```ruby
 client = Awis::Client.new
 category_listings = client.category_listings(path: "Top/Arts")
 ```
 
 If you looking for the API request URI:
 
-* Awis::API::CategoryListings.new.load_request_uri(path: "Top/Games/Card_Games")
+```ruby
+Awis::API::CategoryListings.new.load_request_uri(path: "Top/Games/Card_Games")
+```
 
 Returns object that contains methods:
 
@@ -134,14 +193,16 @@ Returns object that contains relationships:
 
 ##### Get Category Browse
 
-``` ruby
+```ruby
 client = Awis::Client.new
 category_browses = client.category_browse(path: "Top/Arts")
 ```
 
 If you looking for the API request URI:
 
-* Awis::API::CategoryBrowse.new.load_request_uri(path: "Top/Games/Card_Games")
+```ruby
+Awis::API::CategoryBrowse.new.load_request_uri(path: "Top/Games/Card_Games")
+```
 
 Returns object that contains methods:
 
@@ -156,7 +217,7 @@ Returns object that contains relationships:
 
 ##### How to run test
 
-* rake test
+* bundle exec rake test
 
 ##### Request ID and Status Code
 

data/awis.gemspec

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'awis/version'
+require_relative "./lib/awis/version"
 
 Gem::Specification.new do |spec|
   spec.name          = 'awis-sdk-ruby'

data/lib/awis.rb

@@ -4,19 +4,19 @@ require 'multi_xml'
 require 'nokogiri'
 require 'aws-sigv4'
 
-require 'awis/version'
-require 'awis/hash'
-require 'awis/utils'
-require 'awis/exceptions'
-require 'awis/connection'
-require 'awis/config'
-require 'awis/client'
-require 'awis/api'
-require 'awis/models'
+require_relative './awis/version'
+require_relative './awis/hash'
+require_relative './awis/utils'
+require_relative './awis/exceptions'
+require_relative './awis/connection'
+require_relative './awis/config'
+require_relative './awis/client'
+require_relative './awis/api'
+require_relative './awis/models'
 
 module Awis
   SERVICE_PATH          = 'api'
   SERVICE_NAME          = 'awis'
   SERVICE_REGION        = 'us-west-1'
-  SERVICE_HOST          = "#{SERVICE_NAME}.amazonaws.com"
+  SERVICE_HOST          = "#{SERVICE_NAME}.#{SERVICE_REGION}.amazonaws.com"
 end

data/lib/awis/api.rb

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
+require_relative './api/base'
+require_relative './api/url_info'
+require_relative './api/traffic_history'
+require_relative './api/sites_linking_in'
+require_relative './api/category_listings'
+require_relative './api/category_browse'
+
 module Awis
   module API
     autoload :Base,             'awis/api/base'

data/lib/awis/api/base.rb

@@ -35,8 +35,8 @@ module Awis
 
       def load_request_uri(params)
         collection = Awis::Connection.new
-        collection.setup_params(params)
-        collection.uri
+        collection.set_params(params)
+        collection.send(:uri)
       end
 
       def before_validation_arguments(arguments)

data/lib/awis/api/traffic_history.rb

@@ -28,7 +28,7 @@ module Awis
 
         @arguments = arguments
         @arguments[:range] = arguments.fetch(:range, 31)
-        @arguments[:start] = arguments.fetch(:start) { Time.zone.now - (3600 * 24 * @arguments[:range].to_i) }
+        @arguments[:start] = arguments.fetch(:start) { Time.now - (3600 * 24 * @arguments[:range].to_i) }
       end
 
       def start_date

data/lib/awis/client.rb

@@ -29,18 +29,13 @@ module Awis
     private
 
     def parse_response_with_request(kclass, args)
-      case kclass
-      when 'UrlInfo'
-        Models::UrlInfo.new API::UrlInfo.new.fetch(args)
-      when 'SitesLinkingIn'
-        Models::SitesLinkingIn.new API::SitesLinkingIn.new.fetch(args)
-      when 'TrafficHistory'
-        Models::TrafficHistory.new API::TrafficHistory.new.fetch(args)
-      when 'CategoryBrowse'
-        Models::CategoryBrowse.new API::CategoryBrowse.new.fetch(args)
-      when 'CategoryListings'
-        Models::CategoryListings.new API::CategoryListings.new.fetch(args)
-      end
+      raise ArgumentError, 'Amazon class was missing!'  unless [
+        'UrlInfo', 'SitesLinkingIn', 'TrafficHistory',
+        'CategoryBrowse', 'CategoryListings'
+      ].include?(kclass)
+
+      response = Kernel.const_get("Awis::API::#{kclass}").new.fetch(args)
+      Kernel.const_get("Awis::Models::#{kclass}").new(response)
     end
   end
 end

data/lib/awis/connection.rb

@@ -10,14 +10,14 @@ module Awis
     attr_reader :params, :secret_access_key, :access_key_id
 
     HEADERS = {
-      'Content-Type' => 'application/xml',
-      'Accept' => 'application/xml',
-      'User-Agent' => "awis-sdk-ruby v#{Awis::VERSION}"
+      'accept' => 'application/xml',
+      'content-type' => 'application/xml',
+      'user-agent' => "awis-sdk-ruby v#{Awis::VERSION}"
     }.freeze
 
     def initialize(options = {})
-      @secret_access_key = options.fetch(:secret_access_key, Awis.config.access_key_id)
-      @access_key_id     = options.fetch(:access_key_id, Awis.config.secret_access_key)
+      @secret_access_key = options.fetch(:secret_access_key, Awis.config.secret_access_key)
+      @access_key_id     = options.fetch(:access_key_id, Awis.config.access_key_id)
       raise CertificateError, 'Amazon access certificate is missing!' if @secret_access_key.nil? || @access_key_id.nil?
 
       setup_options!
@@ -31,13 +31,20 @@ module Awis
     end
 
     def get(params = {})
+      set_params(params)
+
+      handle_response(request).body
+    end
+
+    def set_params(params)
       @params = params
-      handle_response(request).body.force_encoding(Encoding::UTF_8)
     end
 
     private
 
     def handle_response(response)
+      puts ['URI ', response.uri].join if debug
+
       case response
       when Net::HTTPSuccess
         response
@@ -77,7 +84,7 @@ module Awis
     end
 
     def uri
-      @uri ||= URI.parse("#{protocol}://#{Awis::SERVICE_HOST}/#{Awis::SERVICE_PATH}?" << query)
+      @uri ||= URI.parse("#{protocol}://#{Awis::SERVICE_HOST}/#{Awis::SERVICE_PATH}?#{query}")
     end
 
     def headers

data/lib/awis/models.rb

@@ -1,5 +1,13 @@
 # frozen_string_literal: true
 
+require_relative './models/base'
+require_relative './models/base_entity'
+require_relative './models/url_info'
+require_relative './models/traffic_history'
+require_relative './models/sites_linking_in'
+require_relative './models/category_listings'
+require_relative './models/category_browse'
+
 module Awis
   module Models
     autoload :Base,             'awis/models/base'

data/lib/awis/models/base.rb

@@ -5,6 +5,14 @@ module Awis
     class Base
       attr_accessor :response, :status_code, :request_id
 
+      def initialize(response)
+        response_data = loading_response(response)
+
+        set_xml(response_data)
+        # Need to implement on sub-class
+        setup_data!(response_data)
+      end
+
       def loading_response(response)
         Awis::Utils::XML.new(response.response_body)
       end
@@ -27,6 +35,21 @@ module Awis
       def success?
         status_code == 'Success'
       end
+
+      def pretty_xml
+        doc = Nokogiri.XML(@xml.data) do |config|
+          config.default_xml.noblanks
+        end
+        puts doc.to_xml(:indent => 2)
+
+        nil
+      end
+
+      private
+
+      def set_xml(response)
+        @xml = response
+      end
     end
   end
 end

data/lib/awis/models/category_browse.rb

@@ -11,7 +11,7 @@ module Awis
         @related_categories = []
         @letter_bars = []
 
-        setup_data! loading_response(response)
+        super(response)
       end
 
       # rubocop:disable Metrics/AbcSize

data/lib/awis/models/category_listings.rb

@@ -7,7 +7,8 @@ module Awis
 
       def initialize(response)
         @listings = []
-        setup_data! loading_response(response)
+
+        super(response)
       end
 
       def setup_data!(response)

data/lib/awis/models/sites_linking_in.rb

@@ -7,7 +7,8 @@ module Awis
 
       def initialize(response)
         @sites = []
-        setup_data! loading_response(response)
+
+        super(response)
       end
 
       def setup_data!(response)

data/lib/awis/models/traffic_history.rb

@@ -7,7 +7,8 @@ module Awis
 
       def initialize(response)
         @historical_data = []
-        setup_data! loading_response(response)
+
+        super(response)
       end
 
       # rubocop:disable Metrics/AbcSize

data/lib/awis/models/url_info.rb

@@ -3,14 +3,17 @@
 module Awis
   module Models
     class UrlInfo < Base
-      attr_accessor :data_url, :rank, :asin, :contact_info, :content_data, :usage_statistics, :related_links, :categories
+      attr_accessor :data_url, :rank, :asin, :contact_info, :content_data, :usage_statistics, :related_links,
+                    :categories, :contributing_subdomains, :rank_by_country
 
       def initialize(response)
         @usage_statistics = []
         @related_links = []
         @categories = []
+        @contributing_subdomains = []
+        @rank_by_country = []
 
-        setup_data! loading_response(response)
+        super(response)
       end
 
       def setup_data!(response)
@@ -23,94 +26,122 @@ module Awis
         statistics = []
         related_related_links = []
         category_data = []
+        rank_by_country = []
+        contributing_subdomains = []
 
         response.each_node do |node, path|
           text = node.inner_xml
-          text = text.to_i if text.to_i.to_s == text && node.name != 'aws:Delta'
-          text = nil if text.class == String && text.empty?
+          candidate_text = text.delete(',')
+          value = if integer_value?(candidate_text) && node.name != 'aws:Delta'
+                    candidate_text.to_i
+                  elsif float_value?(candidate_text)
+                    candidate_text.to_f
+                  elsif text.is_a?(String) && text.empty?
+                    nil
+                  else
+                    text
+                  end
 
           if node.name == 'aws:RequestId'
-            @request_id ||= text
+            @request_id ||= value
           elsif node.name == 'aws:StatusCode'
-            @status_code ||= text
+            @status_code ||= value
           elsif node.name == 'aws:DataUrl' && path == "#{traffic_node_name}/aws:DataUrl"
-            @data_url = text
+            @data_url = value
           elsif node.name == 'aws:Asin' && path == "#{traffic_node_name}/aws:Asin"
-            @asin = text
+            @asin = value
           elsif node.name == 'aws:Rank' && path == "#{traffic_node_name}/aws:Rank"
-            @rank = text
+            @rank = value
           elsif node.name == 'aws:DataUrl' && path == "#{content_node_name}/aws:DataUrl"
-            content_data[:data_url] = text
+            content_data[:data_url] = value
           elsif node.name == 'aws:Title' && path == "#{content_node_name}/aws:SiteData/aws:Title"
-            content_data[:site_title] = text
+            content_data[:site_title] = value
           elsif node.name == 'aws:Description'
-            content_data[:site_description] = text
+            content_data[:site_description] = value
           elsif node.name == 'aws:MedianLoadTime'
-            content_data[:speed_median_load_time] = text
+            content_data[:speed_median_load_time] = value
           elsif node.name == 'aws:Percentile'
-            content_data[:speed_percentile] = text
+            content_data[:speed_percentile] = value
           elsif node.name == 'aws:AdultContent'
-            content_data[:adult_content] = text
+            content_data[:adult_content] = value
           elsif node.name == 'aws:Locale'
-            content_data[:language_locale] = text
+            content_data[:language_locale] = value
           elsif node.name == 'aws:LinksInCount'
-            content_data[:links_in_count] = text
+            content_data[:links_in_count] = value
           elsif node.name == 'aws:Domain' && path == "#{content_node_name}/aws:OwnedDomains/aws:OwnedDomain/aws:Domain"
-            content_data[:owned_domains] << { domain: text }
+            content_data[:owned_domains] << { domain: value }
           elsif node.name == 'aws:Title' && path == "#{content_node_name}/aws:OwnedDomains/aws:OwnedDomain/aws:Title"
-            content_data[:owned_domains] << { title: text }
+            content_data[:owned_domains] << { title: value }
           elsif node.name == 'aws:OnlineSince'
-            content_data[:online_since] = text
+            content_data[:online_since] = value
           elsif node.name == 'aws:DataUrl' && path == "#{root_node_name}/aws:ContactInfo/aws:DataUrl"
-            contact_info[:data_url] = text
+            contact_info[:data_url] = value
           elsif node.name == 'aws:OwnerName'
-            contact_info[:owner_name] = text
+            contact_info[:owner_name] = value
           elsif node.name == 'aws:Email'
-            contact_info[:email] = text
+            contact_info[:email] = value
           elsif node.name == 'aws:PhysicalAddress'
-            contact_info[:physical_address] = text
+            contact_info[:physical_address] = value
           elsif node.name == 'aws:CompanyStockTicker'
-            contact_info[:company_stock_ticker] = text
+            contact_info[:company_stock_ticker] = value
           elsif node.name == 'aws:PhoneNumber'
-            contact_info[:phone_numbers] << text
+            contact_info[:phone_numbers] << value
           elsif node.name == 'aws:DataUrl' && path == "#{related_links_node_name}/aws:DataUrl"
-            related_related_links << { data_url: text }
+            related_related_links << { data_url: value }
           elsif node.name == 'aws:NavigableUrl' && path == "#{related_links_node_name}/aws:NavigableUrl"
-            related_related_links << { navigable_url: text }
+            related_related_links << { navigable_url: value }
           elsif node.name == 'aws:Title' && path == "#{related_links_node_name}/aws:Title"
-            related_related_links << { title: text }
+            related_related_links << { title: value }
           elsif node.name == 'aws:Title' && path == "#{categories_node_name}/aws:Title"
-            category_data << { title: text }
+            category_data << { title: value }
           elsif node.name == 'aws:AbsolutePath' &&  path == "#{categories_node_name}/aws:AbsolutePath"
-            category_data << { absolute_path: text }
+            category_data << { absolute_path: value }
           elsif node.name == 'aws:Months' && path == "#{statistic_node_name}/aws:TimeRange/aws:Months"
-            statistics << { time_range_months: text }
+            statistics << { time_range_months: value }
           elsif node.name == 'aws:Days' && path == "#{statistic_node_name}/aws:TimeRange/aws:Days"
-            statistics << { time_range_days: text }
+            statistics << { time_range_days: value }
           elsif node.name == 'aws:Value' && path == "#{statistic_node_name}/aws:Rank/aws:Value"
-            statistics << { rank_value: text }
+            statistics << { rank_value: value }
           elsif node.name == 'aws:Delta' && path == "#{statistic_node_name}/aws:Rank/aws:Delta"
-            statistics << { rank_delta: text }
+            statistics << { rank_delta: value }
           elsif node.name == 'aws:Value' && path == "#{statistic_node_name}/aws:Reach/aws:Rank/aws:Value"
-            statistics << { reach_rank_value: text }
+            statistics << { reach_rank_value: value }
           elsif node.name == 'aws:Delta' && path == "#{statistic_node_name}/aws:Reach/aws:Rank/aws:Delta"
-            statistics << { reach_rank_delta: text }
+            statistics << { reach_rank_delta: value }
           elsif node.name == 'aws:Value' && path == "#{statistic_node_name}/aws:Reach/aws:PerMillion/aws:Value"
-            statistics << { reach_per_million_value: text }
+            statistics << { reach_per_million_value: value }
           elsif node.name == 'aws:Delta' && path == "#{statistic_node_name}/aws:Reach/aws:PerMillion/aws:Delta"
-            statistics << { reach_per_million_delta: text }
+            statistics << { reach_per_million_delta: value }
           elsif node.name == 'aws:Value' && path == "#{statistic_node_name}/aws:PageViews/aws:PerMillion/aws:Value"
-            statistics << { reach_page_views_per_million_value: text }
+            statistics << { page_views_per_million_value: value }
           elsif node.name == 'aws:Delta' && path == "#{statistic_node_name}/aws:PageViews/aws:PerMillion/aws:Delta"
-            statistics << { reach_page_views_per_million_delta: text }
+            statistics << { page_views_per_million_delta: value }
           elsif node.name == 'aws:Value' && path == "#{statistic_node_name}/aws:PageViews/aws:Rank/aws:Value"
-            statistics << { reach_page_views_rank_value: text }
+            statistics << { page_views_rank_value: value }
           elsif node.name == 'aws:Delta' && path == "#{statistic_node_name}/aws:PageViews/aws:Rank/aws:Delta"
-            statistics << { reach_page_views_rank_delta: text }
+            statistics << { page_views_rank_delta: value }
           elsif node.name == 'aws:Value' && path == "#{statistic_node_name}/aws:PageViews/aws:PerUser/aws:Value"
-            statistics << { reach_page_views_per_user_value: text }
+            statistics << { page_views_per_user_value: value }
           elsif node.name == 'aws:Delta' && path == "#{statistic_node_name}/aws:PageViews/aws:PerUser/aws:Delta"
-            statistics << { reach_page_views_per_user_delta: text }
+            statistics << { page_views_per_user_delta: value }
+          elsif node.name == 'aws:Country' && path == rank_by_country_node_name
+            rank_by_country << { country_code: node.attributes['Code'] }
+          elsif node.name == 'aws:Rank' && path == "#{rank_by_country_node_name}/aws:Rank"
+            rank_by_country << { rank: value }
+          elsif node.name == 'aws:PageViews' && path == "#{rank_by_country_node_name}/aws:Contribution/aws:PageViews"
+            rank_by_country << { contribution_page_views: value }
+          elsif node.name == 'aws:Users' && path == "#{rank_by_country_node_name}/aws:Contribution/aws:Users"
+            rank_by_country << { contribution_users: value }
+          elsif node.name == 'aws:DataUrl' && path == "#{contributing_subdomains_node_name}/aws:DataUrl"
+            contributing_subdomains << { data_url: value }
+          elsif node.name == 'aws:Months' && path == "#{contributing_subdomains_node_name}/aws:TimeRange/aws:Months"
+            contributing_subdomains << { time_range_months: value }
+          elsif node.name == 'aws:Percentage' && path == "#{contributing_subdomains_node_name}/aws:Reach/aws:Percentage"
+            contributing_subdomains << { reach_percentage: value }
+          elsif node.name == 'aws:Percentage' && path == "#{contributing_subdomains_node_name}/aws:PageViews/aws:Percentage"
+            contributing_subdomains << { page_views_percentage: value }
+          elsif node.name == 'aws:PerUser' && path == "#{contributing_subdomains_node_name}/aws:PageViews/aws:PerUser"
+            contributing_subdomains << { page_views_per_user: value }
           end
         end
 
@@ -120,10 +151,8 @@ module Awis
         relationship_collections(@usage_statistics, statistics, 13, UsageStatistic)
         relationship_collections(@related_links, related_related_links, 3, RelatedLink)
         relationship_collections(@categories, category_data, 3, CategoryData)
-      end
-
-      def is_404?
-        success? && rank == 404
+        relationship_collections(@rank_by_country, rank_by_country, 4, RankByCountry)
+        relationship_collections(@contributing_subdomains, contributing_subdomains, 5, ContributingSubdomain)
       end
 
       def init_entity_data(attr_name, data, kclass)
@@ -155,10 +184,137 @@ module Awis
       def statistic_node_name
         "#{traffic_node_name}/aws:UsageStatistics/aws:UsageStatistic"
       end
+
+      def contributing_subdomains_node_name
+        "#{traffic_node_name}/aws:ContributingSubdomains/aws:ContributingSubdomain"
+      end
+
+      def rank_by_country_node_name
+        "#{traffic_node_name}/aws:RankByCountry/aws:Country"
+      end
+
+      def has_data?
+        !@rank.nil?
+      end
+
+      def geos_sorted
+        rank_by_country.select { |rbc| !rbc.rank.nil? && !rbc.contribution_page_views.nil? }.
+          sort_by { |rbc| - rbc.contribution_page_views.round }.
+          map { |rbc| { rbc.country_code => rbc.contribution_page_views.round } }
+      end
+
+      def geos_hash
+        @geos_hash ||= geos_sorted.reduce({}, :merge)
+      end
+
+      def not_found?
+        ([content_data.data_url, content_data.site_title] & [404, '404']).size > 0
+      end
+      alias :is_404? :not_found?
+
+      def domains
+        content_data.owned_domains.map(&:domain)
+      end
+
+      def contributing_hostnames
+        contributing_subdomains.map(&:data_url).reject { |hostname| hostname == 'OTHER' }
+      end
+
+      def pvs_per_user
+        usage_statistics.first.page_views_per_user_value
+      end
+
+      def pvs_rank
+        usage_statistics.first.page_views_rank_value
+      end
+
+      def get_pvs_per_mil
+        usage_statistics.first.page_views_per_million_value
+      end
+
+      def speed_percentile
+        content_data.speed_percentile
+      end
+
+      def get_median_load_time
+        content_data.speed_median_load_time
+      end
+
+      def daily_GDN_page_views
+        return unless rank
+
+        alexa_gdn.each do |max_pvs, gdn_range|
+          return gdn_range if rank > max_pvs
+        end
+      end
+
+      def speed_rating
+        if get_median_load_time
+          alexa_speed_rating.each do |max_load_time, rating|
+            return rating if get_median_load_time > max_load_time
+          end
+        end
+
+        'AVERAGE ( < 5s)'
+      end
+
+      def alexa_speed_rating
+        {
+          2200 => 'POOR ( > 5s)',
+          1200 => 'AVERAGE ( < 5s)',
+          0 => 'GOOD ( < 3s)'
+        }
+      end
+
+      def rank_page_view
+        {
+          20000 => '< 1K',
+          5000 => '1K - 10K',
+          3000 => '10K - 100K',
+          1900 => '100K - 500K',
+          1300 => '500K - 1M',
+          850 => '2M - 5M',
+          550 => '5M - 10M',
+          350 => '10M - 20M',
+          200 => '20M - 50M',
+          100 => '50M - 100M',
+          28 => '100M+'
+        }
+      end
+
+      def alexa_gdn
+        {
+          250000 => '< 1K',
+          100000 => '1K - 10K',
+          50000 => '10K - 100K',
+          20000 => '100K - 500K',
+          10000 => '500K - 1M',
+          5000 => '1M - 2M',
+          2000 => '2M - 5M',
+          1000 => '5M - 10M',
+          500 => '10M - 20M',
+          150 => '20M - 50M',
+          30 => '50M - 100M',
+          0 => '100M+'
+        }
+      end
+
+      private
+
+      def integer_value?(text)
+        text.to_i.to_s == text
+      end
+
+      def float_value?(text)
+        !!Float(text.delete('%'))
+      rescue ::StandardError
+        false
+      end
     end
 
     class ContentData < BaseEntity
-      attr_accessor :data_url, :site_title, :site_description, :online_since, :speed_median_load_time, :speed_percentile, :adult_content,
+      attr_accessor :data_url, :site_title, :site_description, :online_since,
+                    :speed_median_load_time, :speed_percentile, :adult_content,
                     :language_locale, :links_in_count, :owned_domains
 
       def initialize(options)
@@ -190,7 +346,7 @@ module Awis
       end
 
       def phone_number_collections(phone_numbers)
-        return @phone_numbers = [] if phone_numbers.blank?
+        return @phone_numbers = [] if phone_numbers.nil? || phone_numbers.empty?
 
         phone_numbers.map { |item| @phone_numbers << PhoneNumber.new(item) }
       end
@@ -212,12 +368,12 @@ module Awis
       attr_accessor :time_range_months, :time_range_days, :rank_value, :rank_delta,
                     :reach_rank_value, :reach_rank_delta,
                     :reach_per_million_value, :reach_per_million_delta,
-                    :reach_page_views_per_million_value, :reach_page_views_per_million_delta,
-                    :reach_page_views_rank_value, :reach_page_views_rank_delta,
-                    :reach_page_views_per_user_value, :reach_page_views_per_user_delta
+                    :page_views_per_million_value, :page_views_per_million_delta,
+                    :page_views_rank_value, :page_views_rank_delta,
+                    :page_views_per_user_value, :page_views_per_user_delta
 
       def range_type
-        return 'month' if time_range_months.present?
+        return 'month' unless time_range_months.nil?
 
         'day'
       end
@@ -226,5 +382,13 @@ module Awis
         (time_range_months || time_range_days)
       end
     end
+
+    class ContributingSubdomain < BaseEntity
+      attr_accessor :data_url, :time_range_months, :reach_percentage, :page_views_percentage, :page_views_per_user
+    end
+
+    class RankByCountry < BaseEntity
+      attr_accessor :country_code, :rank, :contribution_page_views, :contribution_users
+    end
   end
 end

data/lib/awis/utils.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'awis/utils/extra'
-require 'awis/utils/variable'
+require_relative './utils/extra'
+require_relative './utils/variable'
+require_relative './utils/xml'
 
 module Awis
   module Utils

data/lib/awis/utils/xml.rb

@@ -3,6 +3,8 @@
 module Awis
   module Utils
     class XML
+      attr_reader :data
+
       def initialize(data)
         @data = data
       end

data/lib/awis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Awis
-  VERSION = '1.1.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awis-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Encore Shao
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
@@ -168,7 +168,7 @@ files:
 homepage: https://github.com/encoreshao/amazon-awis
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,9 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Ruby - Amazon Alexa Web Information Service Library (AWIS)
 test_files: []