semrush 3.0.6 → 3.0.7

data/README.rdoc

@@ -51,6 +51,8 @@ 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:
 
@@ -62,6 +64,11 @@ 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/report.rb

@@ -233,11 +233,14 @@ module Semrush
       }
       puts "[Semrush query] URL: #{temp_url}" if Semrush.debug
       url = URI.parse(temp_url)
+      params[:before].call(params) if params[:before]
       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) : parse(response)
+      output = response.starts_with?("ERROR") ? error(response) : parse(response)
+      params[:after].call(params, output) if params[:after]
+      output
     end
 
     # All parameters:
@@ -258,6 +261,8 @@ 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.6" # we want to follow the API version: for API 3.0, the gem will be version 3.0.x
+  VERSION = "3.0.7" # 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.6
+  version: 3.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport