awis-sdk-ruby 0.0.3 → 0.0.4

data/.travis.yml

@@ -5,5 +5,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
+  - 2.2.3
+  - 2.3.0
+  - 2.4.0
 env:
   - XML_PARSER=nokogiri

data/Gemfile

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

data/README.md

@@ -12,9 +12,9 @@ gem install awis-sdk-ruby
 ##### Configure your amazon certificate
 
 ```
-AWIS_CONFIG = YAML.load(File.read('awis.yml'))
-
 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']

data/lib/awis.rb

@@ -1,5 +1,5 @@
 require "multi_xml"
-require 'nokogiri'
+require "nokogiri"
 
 require "awis/version"
 require "awis/hash"
@@ -13,8 +13,10 @@ require "awis/api"
 require "awis/models"
 
 module Awis
-  API_VERSION = "2005-07-11".freeze
-  API_HOST    = "awis.amazonaws.com".freeze
+  API_VERSION           = "2005-07-11".freeze
+  API_HOST              = "awis.amazonaws.com".freeze
+  API_SIGNATURE_VERSION = "2".freeze
+
   class << self
   end
 end

data/lib/awis/connection.rb

@@ -7,17 +7,13 @@ require "time"
 
 module Awis
   class Connection
-    attr_accessor :access_key_id, :secret_access_key, :proxy, :debug
+    attr_accessor :debug
     attr_writer :params
 
-    RFC_3986_UNRESERVED_CHARS = "-_.~a-zA-Z\\d".freeze
-
     def initialize
       raise CertificateError.new("Amazon access certificate is missing!") if Awis.config.access_key_id.nil? || Awis.config.secret_access_key.nil?
 
-      @access_key_id  = Awis.config.access_key_id
-      @secret_access_key  = Awis.config.secret_access_key
-      @debug = Awis.config.debug || nil
+      @debug = Awis.config.debug || false
     end
 
     def params
@@ -48,43 +44,43 @@ module Awis
     end
 
     def request
-      puts "[DEBUG] -> #{uri}" if debug
+      showing_request_uri
       
       Faraday.get(uri)
     end
 
+    def showing_request_uri
+      puts "[DEBUG] -> #{uri}" if debug
+    end
+
     def timestamp
       @timestamp ||= Time::now.utc.strftime("%Y-%m-%dT%H:%M:%S.000Z")
     end
 
     def signature
-      Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new("sha256"), secret_access_key, sign)).strip
+      Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new("sha256"), Awis.config.secret_access_key, sign)).strip
     end
 
     def uri
-      URI.parse("http://#{Awis::API_HOST}/?" + query + "&Signature=" + CGI::escape(signature))
+      URI.parse("http://#{Awis::API_HOST}/?" + query_params + "&Signature=" + CGI::escape(signature))
     end
 
     def default_params
       {
-        "AWSAccessKeyId"   => access_key_id,
+        "AWSAccessKeyId"   => Awis.config.access_key_id,
         "SignatureMethod"  => "HmacSHA256",
-        "SignatureVersion" => "2",
+        "SignatureVersion" => Awis::API_SIGNATURE_VERSION,
         "Timestamp"        => timestamp,
         "Version"          => Awis::API_VERSION
       }
     end
 
     def sign
-      "GET\n" + Awis::API_HOST + "\n/\n" + query
-    end
-
-    def query
-      default_params.merge(params).map { |key, value| "#{key}=#{regexp_params(value)}" }.sort.join("&")
+      "GET\n" + Awis::API_HOST + "\n/\n" + query_params
     end
 
-    def regexp_params(value)
-      URI.escape(value.to_s, Regexp.new("[^#{RFC_3986_UNRESERVED_CHARS}]"))
+    def query_params
+      default_params.merge(params).map { |key, value| "#{key}=#{CGI::escape(value.to_s)}" }.sort.join("&")
     end
   end
 end

data/lib/awis/models/category_browse.rb

@@ -91,32 +91,40 @@ module Awis
     class Category
       attr_accessor :path, :title, :sub_category_count, :total_listing_count
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
 
     class LanguageCategory
       attr_accessor :path, :title, :sub_category_count, :total_listing_count
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
 
     class RelatedCategory
       attr_accessor :path, :title, :sub_category_count, :total_listing_count
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
 
     class LetterBar
       attr_accessor :path, :title, :sub_category_count, :total_listing_count
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
   end

data/lib/awis/models/category_listings.rb

@@ -45,8 +45,10 @@ module Awis
     class Listing
       attr_accessor :data_url, :title, :popularity_rank, :description
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
   end

data/lib/awis/models/sites_linking_in.rb

@@ -32,8 +32,10 @@ module Awis
     class Site
       attr_accessor :title, :url
       
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
   end

data/lib/awis/models/traffic_history.rb

@@ -51,8 +51,10 @@ module Awis
     class HistoricalData
       attr_accessor :date, :page_views_per_million, :page_views_per_user, :rank, :reach_per_million
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
   end

data/lib/awis/models/url_info.rb

@@ -11,9 +11,11 @@ module Awis
       end
 
       def setup_data!(response)
-        content_data = { }
+        content_data = { 
+          owned_domains: []
+        }
         contact_info = { 
-          phone_number: []
+          phone_numbers: []
         }
         statistics = []
         related_related_links = []
@@ -49,8 +51,12 @@ module Awis
             content_data[:language_locale] = text
           elsif node.name == 'aws:LinksInCount'
             content_data[:links_in_count] = text
-          elsif node.name == 'aws:OwnedDomains'
-            content_data[:owned_domains] = text
+          elsif node.name == 'aws:Domain' && path == "#{content_node_name}/aws:OwnedDomains/aws:OwnedDomain/aws:Domain"
+            content_data[:owned_domains] << { domain: text }
+          elsif node.name == 'aws:Title' && path == "#{content_node_name}/aws:OwnedDomains/aws:OwnedDomain/aws:Title"
+            content_data[:owned_domains] << { title: text }
+          elsif node.name == 'aws:OnlineSince'
+            content_data[:online_since] = text
           elsif node.name == 'aws:DataUrl' && path == "#{root_node_name}/aws:ContactInfo/aws:DataUrl"
             contact_info[:data_url] = text
           elsif node.name == 'aws:OwnerName'
@@ -144,21 +150,47 @@ module Awis
     end
 
     class ContentData
-      attr_accessor :data_url, :site_title, :site_description, :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(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        @owned_domains = []
+        owned_domain_objects = options.delete(:owned_domains)
+
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
+
+        owned_domains_relationship_collections(@owned_domains, owned_domain_objects, 2, OwnedDomain)
+      end
+
+      def owned_domains_relationship_collections(_object, items, items_count, kclass)
+        return if items.empty?
+
+        all_items = {}.array_slice_merge!(:item, items, items_count)
+        all_items.map { |item| _object << kclass.new(item) }
+      end
+    end
+
+    class OwnedDomain
+      attr_accessor :domain, :title
+
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
 
     class ContactInfo
       attr_accessor :data_url, :owner_name, :email, :physical_address, :company_stock_ticker, :phone_numbers
 
-      def initialize(hash)
-        phone_numbers = hash.delete(:phone_numbers)
+      def initialize(options)
+        phone_numbers = options.delete(:phone_numbers)
 
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
         phone_number_collections(phone_numbers)
       end
 
@@ -172,24 +204,30 @@ module Awis
     class PhoneNumber
       attr_accessor :number
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
 
     class RelatedLink
       attr_accessor :data_url, :navigable_url, :title
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
 
     class CategoryData
       attr_accessor :title, :absolute_path
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
 
@@ -198,8 +236,10 @@ module Awis
                     :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
 
-      def initialize(hash)
-        hash.map { |k, v| instance_variable_set("@#{k}", v) }
+      def initialize(options)
+        options.each do |key, value|
+          instance_variable_set("@#{key}", value)
+        end
       end
     end
   end

data/lib/awis/version.rb

@@ -1,3 +1,3 @@
 module Awis
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awis-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2746170648665062270
+      hash: -2197500946134306758
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23