semrush 3.0.7 → 3.0.8

data/README.rdoc

@@ -21,6 +21,11 @@ Create an initializer, for instance semrush.rb with the following:
 
 Replace '7899esf6874' with your SEMRush api key.
 
+You may also use the following parameters in config:
+
+  config.before = lambda{|params| puts params}            # (Proc or lambda) will be called before the call to SemRush (even if this return false it still runs the request)
+  config.after  = lambda{|params, results| puts results}  # (Proc or lambda) will be called after the call to SemRush (if the call returns an exception, this will not be executed)
+
 == Getting started
 
 First, create a report for a domain, a URL or a phrase with:
@@ -51,8 +56,6 @@ You may use the following parameters:
   :limit      # (Integer) select only the first 'limit' entries (This parameter is required in order to avoid uncontrolled heavy usage)
   :offset     # (Integer) skip the first 'offset' entries
   :export_columns # (String) select the columns you want to fetch, for instance: :export_columns => "Dn,Rk"
-  :before     # (Proc or lambda) will be called before the call to SemRush (even if this return false it still runs the request)
-  :after      # (Proc or lambda) will be called after the call to SemRush (if the call returns an exception, this will not be executed)
 
 Some examples:
 
@@ -64,11 +67,6 @@ or
   report = Semrush::Report.domain("seobook.com")
   data = report.basics(:db => 'us', :limit => 100)
 
-or
-
-  data = Semrush::Report.domain("seobook.com").basics(:db => 'us', :limit => 100, :before => lambda{|params| puts params})
-  data = Semrush::Report.domain("seobook.com").basics(:db => 'us', :limit => 100, :after => lambda{|params, results| puts results})
-
 You will find more information about these parameters at http://www.semrush.com/api.html
 
 == Reports

data/lib/semrush.rb

@@ -14,6 +14,10 @@ module Semrush
   @@api_key = ""
   mattr_accessor :debug
   @@debug = false
+  mattr_accessor :before
+  @@before = Proc.new{}
+  mattr_accessor :after
+  @@after = Proc.new{}
 
 
   # Email Options (TODO: remove if unnecessary)
@@ -33,6 +37,8 @@ module Semrush
     yield self
     Pony.options = @@email_options
     raise Exception::BadApiKey.new if @@api_key.nil? || @@api_key.empty?
+    raise Exception::BadArgument.new(self, "before is not a proc: proc type is required.") unless @@before.is_a?(Proc)
+    raise Exception::BadArgument.new(self, "after is not a proc: proc type is required.") unless @@after.is_a?(Proc)
   end
 
 end

data/lib/semrush/report.rb

@@ -233,13 +233,13 @@ module Semrush
       }
       puts "[Semrush query] URL: #{temp_url}" if Semrush.debug
       url = URI.parse(temp_url)
-      params[:before].call(params) if params[:before]
+      Semrush.before.call(params)
       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")
       output = response.starts_with?("ERROR") ? error(response) : parse(response)
-      params[:after].call(params, output) if params[:after]
+      Semrush.after.call(params, output)
       output
     end
 
@@ -261,8 +261,6 @@ module Semrush
       params.delete(:request_type) unless REQUEST_TYPES.include?(params[:request_type].try(:to_sym))
       @parameters = {:db => "us", :api_key => Semrush.api_key, :limit => "", :offset => "", :export_columns => ""}.merge(@parameters).merge(params)
       raise Semrush::Exception::Nolimit.new(self, "The limit parameter is missing: a limit is required.") unless @parameters[:limit].present?
-      raise Semrush::Exception::BadArgument.new(self, "Request parameter before is not a proc: proc type is required.") unless @parameters[:before].blank? || @parameters[:before].is_a?(Proc)
-      raise Semrush::Exception::BadArgument.new(self, "Request parameter after is not a proc: proc type is required.") unless @parameters[:after].blank? || @parameters[:after].is_a?(Proc)
       raise Semrush::Exception::BadArgument.new(self, "Request parameter is missing: Domain name, URL, or keywords are required.") unless @parameters[:request].present?
       raise Semrush::Exception::BadArgument.new(self, "Bad db: #{@parameters[:db]}") unless DBS.include?(@parameters[:db].try(:to_sym))
       raise Semrush::Exception::BadArgument.new(self, "Bad report type: #{@parameters[:report_type]}") unless REPORT_TYPES.include?(@parameters[:report_type].try(:to_sym))

data/lib/semrush/version.rb

@@ -1,3 +1,3 @@
 module Semrush
-  VERSION = "3.0.7" # we want to follow the API version: for API 3.0, the gem will be version 3.0.x
+  VERSION = "3.0.8" # 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.7
+  version: 3.0.8
   prerelease: 
 platform: ruby
 authors: