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

@@ -1,47 +1,54 @@
-# GET request
+#GET request
 get '/sample04' do
   haml :sample04
 end
 
-# POST request
+#POST request
 post '/sample04' do
-  # Set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   set :file_id, params[:fileId]
   set :url, params[:url]
   set :base_path, params[:basePath]
 
   begin
-    # Check required variables
+    #Check required variables
     raise 'Please enter all required parameters' if settings.client_id.empty? or settings.private_key.empty? or settings.file_id.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 file GUID
+    #Get file GUID
     file = GroupDocs::Storage::File.new({:guid => settings.file_id}).to_document
 
-    # Obtaining all Metadata for file
+    #Obtaining all Metadata for file
     document = file.metadata!
     file = document.last_view.document.file
-    # Download file
+    #Download file
     dowloaded_file = file.download!("#{File.dirname(__FILE__)}/../public/downloads")
     unless dowloaded_file.empty?
       massage = "<font color='green'>File was downloaded to the <font color='blue'>#{dowloaded_file}</font> folder</font> <br />"
     end
 
   rescue Exception => e
     err = e.message
   end
 
-  # Set variables for template
+  #Set variables for template
   haml :sample04, :locals => {:clientId => settings.client_id, :privateKey => settings.private_key, :fileId => settings.file_id, :massage => massage, :err => err}
 end