awis-sdk-ruby 0.0.4 → 0.0.5

data/lib/awis.rb

@@ -5,6 +5,7 @@ require "awis/version"
 require "awis/hash"
 require "awis/utils/xml"
 require "awis/utils/extra"
+require "awis/utils/variable"
 require "awis/exceptions"
 require "awis/connection"
 require "awis/config"

data/lib/awis/api/base.rb

@@ -16,6 +16,12 @@ module Awis
         self.class.name.split(/\:\:/)[-1]
       end
 
+      def load_request_uri(params)
+        collection = Awis::Connection.new
+        collection.setup_params(params)
+        collection.uri
+      end
+
       class << self
         def loading_data_from_xml(xml_file_path)
           MultiXml.parse(File.new(xml_file_path))

data/lib/awis/api/category_browse.rb

@@ -5,16 +5,26 @@ module Awis
 
       def fetch(arguments = {})
         raise ArgumentError.new("Valid category path (Top/Arts, Top/Business/Automotive)") unless arguments.has_key?(:path)
+        validation_arguments!(arguments)
+        
+        @response_body = Awis::Connection.new.get(params)
+        self
+      end
+
+      def load_request_uri(arguments = {})
+        validation_arguments!(arguments)
+
+        super(params)
+      end
+
+      private
+      def validation_arguments!(arguments)
         @arguments = arguments
 
         @arguments[:response_group] = Array(arguments.fetch(:response_group, DEFAULT_RESPONSE_GROUP))
         @arguments[:descriptions]   = arguments.fetch(:descriptions, true)
-
-        @response_body = Awis::Connection.new.get(params)
-        self
       end
 
-      private
       def params
         {
           "Action"        => action_name,

data/lib/awis/api/category_listings.rb

@@ -3,6 +3,20 @@ module Awis
     class CategoryListings < Base
       def fetch(arguments = {})
         raise ArgumentError, "You must provide a URL" unless arguments.has_key?(:path)
+        validation_arguments!(arguments)
+        
+        @response_body = Awis::Connection.new.get(params)
+        self
+      end
+
+      def load_request_uri(arguments = {})
+        validation_arguments!(arguments)
+
+        super(params)
+      end
+
+      private
+      def validation_arguments!(arguments)
         @arguments = arguments
 
         @arguments[:sort_by]      = arguments.fetch(:sort_by, "popularity")
@@ -10,12 +24,8 @@ module Awis
         @arguments[:descriptions] = arguments.fetch(:descriptions, true)
         @arguments[:start]        = arguments.fetch(:start, 0)
         @arguments[:count]        = arguments.fetch(:count, 20)
-
-        @response_body = Awis::Connection.new.get(params)
-        self
       end
 
-      private
       def params
         {
           "Action"        => "CategoryListings",

data/lib/awis/api/sites_linking_in.rb

@@ -5,16 +5,25 @@ module Awis
 
       def fetch(arguments = {})
         raise ArgumentError, "You must provide a URL" unless arguments.has_key?(:url)
-
-        @arguments = arguments
-        @arguments[:count] = arguments.fetch(:count, 20)
-        @arguments[:start] = arguments.fetch(:start, 0)
+        validation_arguments!(arguments)
 
         @response_body = Awis::Connection.new.get(params)
         self
       end
 
+      def load_request_uri(arguments = {})
+        validation_arguments!(arguments)
+
+        super(params)
+      end
+
       private
+      def validation_arguments!(arguments)
+        @arguments = arguments
+        @arguments[:count] = arguments.fetch(:count, 20)
+        @arguments[:start] = arguments.fetch(:start, 0)
+      end
+
       def params
         {
           "Action"        => "SitesLinkingIn",

data/lib/awis/api/traffic_history.rb

@@ -3,15 +3,19 @@ module Awis
     class TrafficHistory < Base
       def fetch(arguments = {})
         raise ArgumentError, "Any valid URL." unless arguments.has_key?(:url)
-        @arguments = arguments
-
-        @arguments[:range] = arguments.fetch(:range, 31)
-        @arguments[:start] = arguments.fetch(:start) { Time.now - (3600 * 24 * @arguments[:range].to_i) }
 
+        validation_arguments!(arguments)
         @response_body = Awis::Connection.new.get(params)
         self
       end
 
+      def load_request_uri(arguments = {})
+        validation_arguments!(arguments)
+
+        super(params)
+      end
+
+      private
       def params
         {
           "Action"        => "TrafficHistory",
@@ -22,6 +26,13 @@ module Awis
         }
       end
 
+      def validation_arguments!(arguments)
+        @arguments = arguments
+
+        @arguments[:range] = arguments.fetch(:range, 31)
+        @arguments[:start] = arguments.fetch(:start) { Time.now - (3600 * 24 * @arguments[:range].to_i) }
+      end
+
       def start_param
         arguments[:start].respond_to?(:strftime) ? arguments[:start].strftime("%Y%m%d") : arguments[:start]
       end

data/lib/awis/api/url_info.rb

@@ -5,18 +5,24 @@ module Awis
 
       def fetch(arguments = {})
         raise ArgumentError, "Any valid URL." unless arguments.has_key?(:url)
-        @arguments = arguments
-        @arguments[:response_group] = Array(arguments.fetch(:response_group, DEFAULT_RESPONSE_GROUP))
+        validation_arguments!(arguments)
 
-        loading_response_data
+        @response_body = Awis::Connection.new.get(params)
         self
       end
 
-      def loading_response_data
-        @response_body = Awis::Connection.new.get(params)
+      def load_request_uri(arguments = {})
+        validation_arguments!(arguments)
+
+        super(params)
       end
 
       private
+      def validation_arguments!(arguments)
+        @arguments = arguments
+        @arguments[:response_group] = Array(arguments.fetch(:response_group, DEFAULT_RESPONSE_GROUP))
+      end
+
       def params
         {
           "Action"        => action_name,

data/lib/awis/connection.rb

@@ -20,9 +20,13 @@ module Awis
       @params ||= {}
     end
 
-    def get(params = {})
+    def setup_params(params)
       self.params = params
+    end
 
+    def get(params = {})
+      setup_params(params)
+      
       handle_response(request).body.force_encoding(Encoding::UTF_8)
     end
 

data/lib/awis/models.rb

@@ -1,6 +1,7 @@
 module Awis
   module Models
     autoload :Base,             "awis/models/base"
+    autoload :BaseEntity,       "awis/models/base_entity"
     autoload :UrlInfo,          "awis/models/url_info"
     autoload :TrafficHistory,   "awis/models/traffic_history"
     autoload :SitesLinkingIn,   "awis/models/sites_linking_in"

data/lib/awis/models/base_entity.rb

@@ -0,0 +1,11 @@
+module Awis
+  module Models
+    class BaseEntity
+      include Utils::Variable
+
+      def initialize(options)
+        custom_instance_variables(options)
+      end
+    end
+  end
+end

data/lib/awis/models/category_browse.rb

@@ -9,7 +9,7 @@ module Awis
         @related_categories = []
         @letter_bars = []
         
-        setup_data!( loading_response(response) )
+        setup_data! loading_response(response)
       end
 
       def setup_data!(response)
@@ -21,6 +21,7 @@ module Awis
         response.each_node do |node, path|
           text = node.inner_xml
           text = text.to_i if text.to_i.to_s === text
+          text = nil if (text.class == String && text.empty?)
 
           if node.name == 'aws:RequestId'
             @request_id ||= text
@@ -88,44 +89,20 @@ module Awis
       end
     end
 
-    class Category
+    class Category < BaseEntity
       attr_accessor :path, :title, :sub_category_count, :total_listing_count
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
 
-    class LanguageCategory
+    class LanguageCategory < BaseEntity
       attr_accessor :path, :title, :sub_category_count, :total_listing_count
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
 
-    class RelatedCategory
+    class RelatedCategory < BaseEntity
       attr_accessor :path, :title, :sub_category_count, :total_listing_count
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
 
-    class LetterBar
+    class LetterBar < BaseEntity
       attr_accessor :path, :title, :sub_category_count, :total_listing_count
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
   end
 end

data/lib/awis/models/category_listings.rb

@@ -5,7 +5,7 @@ module Awis
 
       def initialize(response)
         @listings = []
-        setup_data!( loading_response(response) )
+        setup_data! loading_response(response)
       end
 
       def setup_data!(response)
@@ -14,6 +14,7 @@ module Awis
         response.each_node do |node, path|
           text = node.inner_xml
           text = text.to_i if text.to_i.to_s === text
+          text = nil if (text.class == String && text.empty?)
 
           if node.name == 'aws:RequestId'
             @request_id ||= text
@@ -42,14 +43,8 @@ module Awis
       end
     end
 
-    class Listing
+    class Listing < BaseEntity
       attr_accessor :data_url, :title, :popularity_rank, :description
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
   end
 end

data/lib/awis/models/sites_linking_in.rb

@@ -5,7 +5,7 @@ module Awis
 
       def initialize(response)
         @sites = []
-        setup_data!( loading_response(response) )
+        setup_data! loading_response(response)
       end
 
       def setup_data!(response)
@@ -13,6 +13,7 @@ module Awis
 
         response.each_node do |node, path|
           text = node.inner_xml
+          text = nil if (text.class == String && text.empty?)
 
           if node.name == 'aws:RequestId'
             @request_id ||= text
@@ -29,14 +30,8 @@ module Awis
       end
     end
 
-    class Site
+    class Site < BaseEntity
       attr_accessor :title, :url
-      
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
   end
 end

data/lib/awis/models/traffic_history.rb

@@ -5,7 +5,7 @@ module Awis
 
       def initialize(response)
         @historical_data = []
-        setup_data!( loading_response(response) )
+        setup_data! loading_response(response)
       end
 
       def setup_data!(response)
@@ -14,6 +14,7 @@ module Awis
         response.each_node do |node, path|
           text = node.inner_xml
           text = text.to_i if text.to_i.to_s === text
+          text = nil if (text.class == String && text.empty?)
 
           if node.name == 'aws:RequestId'
             @request_id ||= text
@@ -48,14 +49,8 @@ module Awis
       end
     end
 
-    class HistoricalData
+    class HistoricalData < BaseEntity
       attr_accessor :date, :page_views_per_million, :page_views_per_user, :rank, :reach_per_million
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
   end
 end

data/lib/awis/models/url_info.rb

@@ -7,7 +7,8 @@ module Awis
         @usage_statistics = []
         @related_links = []
         @categories = []
-        setup_data!( loading_response(response) )
+        
+        setup_data! loading_response(response)
       end
 
       def setup_data!(response)
@@ -24,6 +25,7 @@ module Awis
         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?)
 
           if node.name == 'aws:RequestId'
             @request_id ||= text
@@ -118,6 +120,10 @@ module Awis
         relationship_collections(@categories, category_data, 3, CategoryData)
       end
 
+      def is_404?
+        success? && rank == 404
+      end
+
       def init_entity_data(attr_name, data, kclass)
         return if data.empty?
 
@@ -149,18 +155,14 @@ module Awis
       end
     end
 
-    class ContentData
+    class ContentData < BaseEntity
       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)
         @owned_domains = []
         owned_domain_objects = options.delete(:owned_domains)
-
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-
+        super(options)
         owned_domains_relationship_collections(@owned_domains, owned_domain_objects, 2, OwnedDomain)
       end
 
@@ -172,25 +174,16 @@ module Awis
       end
     end
 
-    class OwnedDomain
+    class OwnedDomain < BaseEntity
       attr_accessor :domain, :title
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
 
-    class ContactInfo
+    class ContactInfo < BaseEntity
       attr_accessor :data_url, :owner_name, :email, :physical_address, :company_stock_ticker, :phone_numbers
 
       def initialize(options)
         phone_numbers = options.delete(:phone_numbers)
-
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
+        super(options)
         phone_number_collections(phone_numbers)
       end
 
@@ -201,45 +194,31 @@ module Awis
       end
     end
 
-    class PhoneNumber
+    class PhoneNumber < BaseEntity
       attr_accessor :number
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
 
-    class RelatedLink
+    class RelatedLink < BaseEntity
       attr_accessor :data_url, :navigable_url, :title
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
 
-    class CategoryData
+    class CategoryData < BaseEntity
       attr_accessor :title, :absolute_path
-
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
     end
 
-    class UsageStatistic
+    class UsageStatistic < BaseEntity
       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
 
-      def initialize(options)
-        options.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
+      def range_type
+        return 'month' unless time_range_months.blank?
+
+        'day'
+      end
+
+      def range_count
+        (time_range_months || time_range_days)
       end
     end
   end

data/lib/awis/utils/variable.rb

@@ -0,0 +1,13 @@
+module Awis
+  module Utils
+    module Variable
+      def custom_instance_variables(options)
+        options.each do |key, value|
+          value = (value.class == String && value.empty?) ? nil : value
+
+          instance_variable_set("@#{key}", value)
+        end
+      end
+    end
+  end
+end

data/lib/awis/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awis-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -137,12 +137,14 @@ files:
 - lib/awis/hash.rb
 - lib/awis/models.rb
 - lib/awis/models/base.rb
+- lib/awis/models/base_entity.rb
 - lib/awis/models/category_browse.rb
 - lib/awis/models/category_listings.rb
 - lib/awis/models/sites_linking_in.rb
 - lib/awis/models/traffic_history.rb
 - lib/awis/models/url_info.rb
 - lib/awis/utils/extra.rb
+- lib/awis/utils/variable.rb
 - lib/awis/utils/xml.rb
 - lib/awis/version.rb
 homepage: https://github.com/encoreshao/amazon-awis
@@ -165,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2197500946134306758
+      hash: 3645655576391450679
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23