majestic_seo_api 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5b4571ac9b35fde014ce2613067c56a2fe3a233
-  data.tar.gz: d4d1fa3c11e01184b462f8b26dcf7168c4055ced
+  metadata.gz: fe0486a6a6caabfa56a80f4a4b1af15a717c6998
+  data.tar.gz: 3547882b94326e2eb7d89118dd25783064b43bc9
 SHA512:
-  metadata.gz: 97e51ca3ba7170bfcd21824732cc9fe1d709fe28966bfbc69e41db02be301f3fb53ae87c08248008a43d7e2ea48ff1f4aa450cd287b2572049ab96bbb42b2f21
-  data.tar.gz: 2725e3f0ed6efb0832f86967efc62c6711b01c3bd2db6990fab3a96fb1d458bd2bae8bcf070cacba01d7bb17aaa90ffddc97c647e1abdba88725828a9ef6607d
+  metadata.gz: 2f10a79265c8d76953f666a5f51d02921c11876936c45794bc1af2bd3b8be107b3da2705a0486089b73ad572264dc3df74f15177056a51fb12ea7f86e3324c04
+  data.tar.gz: dd8f0d4fa85d68159ad6470bf89cb60e889ddb60aba447697740e0017122eaf4e5b26246a541049c0f41a7376dae89c5d5ac7bcb6bdf109e07307e489ee4107d

data/lib/majestic_seo/api/client.rb

@@ -61,18 +61,19 @@ module MajesticSeo
         self.config ||= YAML.load_file(File.join(File.dirname(__FILE__), "../../generators/templates/majestic_seo.template.yml"))[env] rescue nil
         self.config ||= {}
     	end
-
-    	def set_api_url
-        @api_url = case @environment.to_sym
-          when :sandbox     then "http://developer.majesticseo.com/api_command"
-          when :production  then "http://enterprise.majesticseo.com/api_command"
+      
+      #TODO: Switch to the JSON API
+    	def set_api_url(format = :xml)
+        @api_url      =   case @environment.to_sym
+          when :sandbox     then "http://developer.majestic.com/api/#{format}"
+          when :production  then "http://api.majestic.com/api/#{format}"
           else
-            "http://developer.majesticseo.com/api_command"
+            "http://developer.majestic.com/api/#{format}"
         end
       end
 
     	def set_connection
-    	  @connection = Faraday.new(:url => @api_url, :ssl => {:verify => false}) do |builder|
+    	  @connection = Faraday.new(url: @api_url, ssl: {verify: false}) do |builder|
           builder.request   :url_encoded
           builder.request   :retry
           builder.response  :logger if (@verbose)
@@ -134,18 +135,30 @@ module MajesticSeo
 
     	# 'parameters' a hash containing the command parameters.
     	# 'options'  a hash containing command/call options (timeout, proxy settings etc)
-    	def execute_request(parameters = {}, options = {})
-        response = nil
-
+    	def execute_request(parameters = {}, options = {}, retries = 3)
+        response        =   nil
+        timeout         =   options.delete(:timeout)      { |opt| 60 }
+        open_timeout    =   options.delete(:open_timeout) { |opt| 60 }
+        
         begin
           log(:info, "[MajesticSeo::Api::Client] - Sending API Request to Majestic SEO. Parameters: #{parameters.inspect}. Options: #{options.inspect}")
-          response = @connection.get do |request|
-            request.params    =   parameters  if (!parameters.empty?)
-            request.options   =   options     if (!options.empty?)
+          
+          response      =   @connection.get do |request|
+            request.params                    =   parameters  if (!parameters.empty?)
+            request.options                   =   options     if (!options.empty?)
+            request.options[:timeout]         =   timeout
+            request.options[:open_timeout]    =   open_timeout
           end
+        
         rescue StandardError => e
           log(:error, "[MajesticSeo::Api::Client] - Error occurred while trying to perform API-call with parameters: #{parameters.inspect}. Error Class: #{e.class.name}. Error Message: #{e.message}. Stacktrace: #{e.backtrace.join("\n")}")
-          response    =   nil
+          retries -= 1
+          
+          if retries > 0
+            retry
+          else
+            raise e
+          end
         end
 
     		return response

data/lib/majestic_seo_api.rb

@@ -1,5 +1,5 @@
 module MajesticSeoApi
-  VERSION = "1.2.8"
+  VERSION = "1.3.0"
 
   require File.join(File.dirname(__FILE__), 'majestic_seo/railtie') if defined?(Rails)
 

data/majestic_seo_api.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
 
   s.name = 'majestic_seo_api'
-  s.version = '1.2.8'
+  s.version = '1.3.0'
 
   s.homepage      =   "http://developer-support.majesticseo.com/connectors/"
   s.email         =   "sebastian@agiley.se"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: majestic_seo_api
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Majestic-12 Ltd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 2
 summary: Interface for communicating with Majestic SEO's API