awis-sdk-ruby 0.0.6 → 0.0.7

data/README.md

@@ -44,9 +44,9 @@ 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, 
+* 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] 
+                    :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]
@@ -57,7 +57,7 @@ New methods:
 
 You can specify options:
 
-* url 
+* url
 * response_group - which data to include in response (i.e. ["rank", "contact_info", "content_data"]) - defaults to all available
 
 ##### Get Sites Linking In

data/lib/awis.rb

@@ -20,4 +20,4 @@ module Awis
 
   class << self
   end
-end
+end

data/lib/awis/api/base.rb

@@ -4,10 +4,21 @@ module Awis
       include Utils::Extra
       attr_reader :arguments, :response_body
 
+      def fetch(arguments = {})
+        validation_arguments!(arguments)
+
+        loading_response_body
+        self
+      end
+
       def parsed_body
         @parsed_body ||= MultiXml.parse(response_body)
       end
 
+      def loading_response_body
+        @response_body = Awis::Connection.new.get(params)
+      end
+
       def root_node_name
         "#{action_name}Response"
       end
@@ -22,6 +33,11 @@ module Awis
         collection.uri
       end
 
+      def before_validation_arguments(arguments)
+        raise ArgumentError, "Invalid arguments. should be like { url: 'site.com' }" unless arguments.is_a?(Hash)
+        raise ArgumentError, "Invalid arguments. the url must be configured." unless arguments.has_key?(:url)
+      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

@@ -3,14 +3,6 @@ module Awis
     class CategoryBrowse < Base
       DEFAULT_RESPONSE_GROUP = %w(categories related_categories language_categories letter_bars).freeze
 
-      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)
 
@@ -18,9 +10,15 @@ module Awis
       end
 
       private
+      def before_validation_arguments(arguments)
+        raise ArgumentError, "Invalid arguments. should be like { path: 'Top/Arts' }" unless arguments.is_a?(Hash)
+        raise ArgumentError, "Invalid arguments. the path must be configured." unless arguments.has_key?(:path)
+      end
+
       def validation_arguments!(arguments)
-        @arguments = arguments
+        before_validation_arguments(arguments)
 
+        @arguments = arguments
         @arguments[:response_group] = Array(arguments.fetch(:response_group, DEFAULT_RESPONSE_GROUP))
         @arguments[:descriptions]   = arguments.fetch(:descriptions, true)
       end

data/lib/awis/api/category_listings.rb

@@ -1,13 +1,7 @@
 module Awis
   module API
     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
+      DEFAULT_RESPONSE_GROUP = %w(listings).freeze
 
       def load_request_uri(arguments = {})
         validation_arguments!(arguments)
@@ -16,9 +10,15 @@ module Awis
       end
 
       private
+      def before_validation_arguments(arguments)
+        raise ArgumentError, "Invalid arguments. should be like { path: '/Top/Games/Card_Games' }" unless arguments.is_a?(Hash)
+        raise ArgumentError, "Invalid arguments. the path must be configured." unless arguments.has_key?(:path)
+      end
+
       def validation_arguments!(arguments)
-        @arguments = arguments
+        before_validation_arguments(arguments)
 
+        @arguments = arguments
         @arguments[:sort_by]      = arguments.fetch(:sort_by, "popularity")
         @arguments[:recursive]    = arguments.fetch(:recursive, true)
         @arguments[:descriptions] = arguments.fetch(:descriptions, true)
@@ -29,7 +29,7 @@ module Awis
       def params
         {
           "Action"        => "CategoryListings",
-          "ResponseGroup" => "Listings",
+          "ResponseGroup" => DEFAULT_RESPONSE_GROUP[0],
           "Path"          => arguments[:path],
           "Recursive"     => recursive_param,
           "Descriptions"  => descriptions_params,

data/lib/awis/api/sites_linking_in.rb

@@ -1,15 +1,7 @@
 module Awis
   module API
     class SitesLinkingIn < Base
-      attr_accessor :sites
-
-      def fetch(arguments = {})
-        raise ArgumentError, "You must provide a URL" unless arguments.has_key?(:url)
-        validation_arguments!(arguments)
-
-        @response_body = Awis::Connection.new.get(params)
-        self
-      end
+      DEFAULT_RESPONSE_GROUP = %w(sites_linking_in).freeze
 
       def load_request_uri(arguments = {})
         validation_arguments!(arguments)
@@ -19,6 +11,8 @@ module Awis
 
       private
       def validation_arguments!(arguments)
+        before_validation_arguments(arguments)
+
         @arguments = arguments
         @arguments[:count] = arguments.fetch(:count, 20)
         @arguments[:start] = arguments.fetch(:start, 0)
@@ -28,7 +22,7 @@ module Awis
         {
           "Action"        => "SitesLinkingIn",
           "Url"           => arguments[:url],
-          "ResponseGroup" => "SitesLinkingIn",
+          "ResponseGroup" => DEFAULT_RESPONSE_GROUP[0],
           "Count"         => arguments[:count],
           "Start"         => arguments[:start]
         }

data/lib/awis/api/traffic_history.rb

@@ -1,14 +1,6 @@
 module Awis
   module API
     class TrafficHistory < Base
-      def fetch(arguments = {})
-        raise ArgumentError, "Any valid URL." unless arguments.has_key?(:url)
-
-        validation_arguments!(arguments)
-        @response_body = Awis::Connection.new.get(params)
-        self
-      end
-
       def load_request_uri(arguments = {})
         validation_arguments!(arguments)
 
@@ -27,8 +19,9 @@ module Awis
       end
 
       def validation_arguments!(arguments)
-        @arguments = arguments
+        before_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

data/lib/awis/api/url_info.rb

@@ -3,14 +3,6 @@ module Awis
     class UrlInfo < Base
       DEFAULT_RESPONSE_GROUP = %w(related_links categories rank rank_by_country usage_stats adult_content speed language owned_domains links_in_count site_data).freeze
 
-      def fetch(arguments = {})
-        raise ArgumentError, "Any valid URL." unless arguments.has_key?(:url)
-        validation_arguments!(arguments)
-
-        @response_body = Awis::Connection.new.get(params)
-        self
-      end
-
       def load_request_uri(arguments = {})
         validation_arguments!(arguments)
 
@@ -19,6 +11,8 @@ module Awis
 
       private
       def validation_arguments!(arguments)
+        before_validation_arguments(arguments)
+
         @arguments = arguments
         @arguments[:response_group] = Array(arguments.fetch(:response_group, DEFAULT_RESPONSE_GROUP))
       end

data/lib/awis/client.rb

@@ -1,6 +1,5 @@
 module Awis
   class Client
-
     def initialize
       raise CertificateError.new("Amazon access certificate is missing!") if Awis.config.access_key_id.nil? || Awis.config.secret_access_key.nil?
     end
@@ -41,4 +40,4 @@ module Awis
       end
     end
   end
-end
+end

data/lib/awis/connection.rb

@@ -26,7 +26,7 @@ module Awis
 
     def get(params = {})
       setup_params(params)
-      
+
       handle_response(request).body.force_encoding(Encoding::UTF_8)
     end
 
@@ -49,7 +49,7 @@ module Awis
 
     def request
       showing_request_uri
-      
+
       Faraday.get(uri)
     end
 

data/lib/awis/hash.rb

@@ -1,8 +1,4 @@
 class Hash
-  def deep_find(key)
-    key?(key) ? self[key] : self.values.inject(nil) { |memo, v| memo ||= v.deep_find(key) if v.respond_to?(:deep_find) }
-  end
-
   def array_slice_merge!(key, array, count)
     self[key] = array.each_slice(count).collect { |e| e.reduce({}, :merge) }
   end

data/lib/awis/models.rb

@@ -8,4 +8,4 @@ module Awis
     autoload :CategoryListings, "awis/models/category_listings"
     autoload :CategoryBrowse,   "awis/models/category_browse"
   end
-end
+end

data/lib/awis/models/base.rb

@@ -14,7 +14,7 @@ module Awis
       def action_name
         self.class.name.split(/\:\:/)[-1]
       end
-      
+
       def relationship_collections(_object, items, items_count, kclass)
         return if items.empty?
 

data/lib/awis/models/category_browse.rb

@@ -8,7 +8,7 @@ module Awis
         @language_categories = []
         @related_categories = []
         @letter_bars = []
-        
+
         setup_data! loading_response(response)
       end
 

data/lib/awis/models/traffic_history.rb

@@ -10,7 +10,7 @@ module Awis
 
       def setup_data!(response)
         datas = []
-        
+
         response.each_node do |node, path|
           text = node.inner_xml
           text = text.to_i if text.to_i.to_s === text
@@ -26,15 +26,13 @@ module Awis
             @site ||= text
           elsif node.name == 'aws:Start'
             @start ||= text
-          elsif node.name == 'aws:Rank'
-            @rank ||= text
           elsif node.name == 'aws:Date' && path == "#{base_node_name}/aws:Date"
             datas << { date: text }
           elsif node.name == 'aws:PerMillion' && path == "#{base_node_name}/aws:PageViews/aws:PerMillion"
             datas << { page_views_per_million: text }
           elsif node.name == 'aws:PerUser' && path == "#{base_node_name}/aws:PageViews/aws:PerUser"
             datas << { page_views_per_user: text }
-          elsif node.name == 'aws:PerMillion' && path == "#{base_node_name}/aws:Rank"
+          elsif node.name == 'aws:Rank' && path == "#{base_node_name}/aws:Rank"
             datas << { rank: text }
           elsif node.name == 'aws:PerMillion' && path == "#{base_node_name}/aws:Reach/aws:PerMillion"
             datas << { reach_per_million: text }

data/lib/awis/models/url_info.rb

@@ -7,15 +7,15 @@ module Awis
         @usage_statistics = []
         @related_links = []
         @categories = []
-        
+
         setup_data! loading_response(response)
       end
 
       def setup_data!(response)
-        content_data = { 
+        content_data = {
           owned_domains: []
         }
-        contact_info = { 
+        contact_info = {
           phone_numbers: []
         }
         statistics = []
@@ -156,7 +156,7 @@ module Awis
     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)
@@ -207,7 +207,7 @@ module Awis
     end
 
     class UsageStatistic < BaseEntity
-      attr_accessor :time_range_months, :time_range_days, :rank_value, :rank_delta, :reach_rank_value, :reach_rank_delta, 
+      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
 

data/lib/awis/version.rb

@@ -1,3 +1,3 @@
 module Awis
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awis-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3875215359314092874
+      hash: 3226589619329212718
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23