semrush 3.0.9 → 3.0.10

data/lib/semrush.rb

@@ -9,7 +9,7 @@ require 'semrush/report'
 
 module Semrush
   API_REPORT_URL = "http://%DB%.api.semrush.com/?action=report&type=%REPORT_TYPE%&%REQUEST_TYPE%=%REQUEST%&key=%API_KEY%&display_limit=%LIMIT%&display_offset=%OFFSET%&export=api&export_columns=%EXPORT_COLUMNS%"
-  API_UNITS_URL = "http://fr.semrush.com/users/countapiunits.html?key=%API_KEY%"
+  API_UNITS_URL = "http://www.semrush.com/users/countapiunits.html?key=%API_KEY%"
   mattr_accessor :api_key
   @@api_key = ""
   mattr_accessor :debug

data/lib/semrush/report.rb

@@ -63,22 +63,31 @@ module Semrush
     # Takes a hash parameter that may contain the following keys :
     # * :api_key (ex: :api_key => 'gt97s6d4a6w')
     def self.remaining_quota params = {}
-      temp_url = "#{API_UNITS_URL}" #do not copy the constant as is or else the constant would be modified !!
-      params = {:api_key => Semrush.api_key}.merge(params)
-      params.each {|k, v|
-        if v.blank?
-          temp_url.gsub!(/&[^&=]+=%#{k.to_s}%/i, '')
-        else
-          temp_url.gsub!("%#{k.to_s.upcase}%", URI.escape(v.to_s).gsub('&', '%26'))
-        end
-      }
-      puts "[Semrush query] URL: #{temp_url}" if Semrush.debug
-      url = URI.parse(temp_url)
+      @remaining_quota_url ||= begin
+        temp_url = "#{API_UNITS_URL}" #do not copy the constant as is or else the constant would be modified !!
+        params = {:api_key => Semrush.api_key}.merge(params)
+        params.each {|k, v|
+          if v.blank?
+            temp_url.gsub!(/&[^&=]+=%#{k.to_s}%/i, '')
+          else
+            temp_url.gsub!("%#{k.to_s.upcase}%", URI.escape(v.to_s).gsub('&', '%26'))
+          end
+        }
+        temp_url
+      end
+      puts "[Semrush query] URL: #{@remaining_quota_url}" if Semrush.debug
+      url = URI.parse(@remaining_quota_url)
       response = Net::HTTP.start(url.host, url.port) {|http|
         http.get(url.path+"?"+url.query)
-      }.body rescue "ERROR :: RESPONSE ERROR (-1)" # Make this error up
-      response.force_encoding("utf-8")
-      response.starts_with?("ERROR") ? error(response) : response.to_i
+      }
+      body = response.body
+      if body.blank? && response['location'].present?  && response['location']!=@remaining_quota_url
+        @remaining_quota_url = URI.join("http://#{url.host}", response['location']).to_s
+        self.remaining_quota params
+      else
+        body.force_encoding("utf-8")
+        body.starts_with?("ERROR") ? error(body) : body.to_i
+      end
     end
 
     # Main report.

data/lib/semrush/version.rb

@@ -1,3 +1,3 @@
 module Semrush
-  VERSION = "3.0.9" # we want to follow the API version: for API 3.0, the gem will be version 3.0.x
+  VERSION = "3.0.10" # we want to follow the API version: for API 3.0, the gem will be version 3.0.x
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semrush
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
   prerelease: 
 platform: ruby
 authors: