examples/api-samples/samples/sample36.rb in groupdocs-1.5.8 vs examples/api-samples/samples/sample36.rb in groupdocs-1.5.9

@@ -1,47 +1,51 @@
-# GET request
+#GET request
 get '/sample36' do
   haml :sample36
 end
 
-
-
-
-# POST request
+#POST request
 post '/sample36' do
-  # Set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   set :envelope, params[:envelopeGuid]
   set :base_path, params[:basePath]
 
-  # Set download path
+  #Set download path
   downloads_path = "#{File.dirname(__FILE__)}/../public/downloads"
 
-  # Remove all files from download directory or create folder if it not there
+  #Remove all files from download directory or create folder if it not there
   if File.directory?(downloads_path)
     Dir.foreach(downloads_path) { |f| fn = File.join(downloads_path, f); File.delete(fn) if f != '.' && f != '..' }
   else
     Dir::mkdir(downloads_path)
   end
 
 
   begin
-    # Check required variables
+    #Check required variables
     raise 'Please enter all required parameters' if settings.client_id.empty? or settings.private_key.empty?
 
-    if settings.base_path.empty? then settings.base_path = 'https://api.groupdocs.com' end
+    #Prepare base path
+    if settings.base_path.empty?
+      base_path = 'https://api.groupdocs.com'
+    elsif settings.base_path.match('/v2.0')
+      base_path = settings.base_path.split('/v2.0')[0]
+    else
+      base_path = settings.base_path
+    end
 
-    # Configure your access to API server
+    #Configure your access to API server
     GroupDocs.configure do |groupdocs|
       groupdocs.client_id = settings.client_id
       groupdocs.private_key = settings.private_key
-      # Optionally specify API server and version
-      groupdocs.api_server = settings.base_path # default is 'https://api.groupdocs.com'
+      #Optionally specify API server and version
+      groupdocs.api_server = base_path # default is 'https://api.groupdocs.com'
     end
 
-    # Get envelope from GroupDocs Storage
+    #Get envelope from GroupDocs Storage
     envelope = GroupDocs::Signature::Envelope.get!(settings.envelope)
 
     #Download signed files
     path = envelope.signed_documents!(downloads_path)
 
@@ -51,8 +55,8 @@
     message = "<span style=\"color:green\">Files from the envelope were downloaded to server's local folder. You can check them <a href=\"/downloads/#{file}\">here</a></span>"
   rescue Exception => e
     err = e.message
   end
 
-  # set variables for template
+  #Set variables for template
   haml :sample36, :locals => {:userId => settings.client_id, :privateKey => settings.private_key, :envelopeGuid => settings.envelope, :message => message, :err => err}
 end