sample28.rb in groupdocs-1.5.9

- old
+ new
@@ -1,66 +1,97 @@
-# GET request
+#GET request
 get '/sample28' do
   haml :sample28
 end
 
-# POST request
+#POST request
 post '/sample28' do
-  # set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   set :file_id, params[:fileId]
   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'
+      groupdocs.api_server = base_path # default is 'https://api.groupdocs.com'
     end
 
-    # make a request to API using client_id and private_key
+    #Make a request to API using client_id and private_key
     files_list = GroupDocs::Storage::Folder.list!('/', {})
     document = ''
 
-    # get document by file ID
+    #Get document by file ID
     files_list.each do |element|
       if element.respond_to?('guid') == true and element.guid == settings.file_id
         document = element
       end
     end
 
+    document = GroupDocs::Storage::File.new(guid: settings.file_id)
 
     unless document.instance_of? String
-      # get list of annotations
+      #Get list of annotations
       annotations = document.to_document.annotations!()
 
-      # delete all annotations from document
+      #Delete all annotations from document
       annotations.each do |annotation|
           annotation.remove!()
       end
       case settings.base_path
 
+<<<<<<< HEAD
         when 'https://stage-api-groupdocs.dynabic.com'
           iframe = "<iframe width='100%' height='600' frameborder='0' src='http://stage-apps-groupdocs.dynabic.com/document-viewer/embed/#{settings.file_id}'></iframe>"
         when 'https://dev-api-groupdocs.dynabic.com'
           iframe = "<iframe width='100%' height='600' frameborder='0' src='http://dev-apps-groupdocs.dynabic.com/document-viewer/embed/#{settings.file_id}'></iframe>"
         else
           iframe = "<iframe width='100%' height='600' frameborder='0' src='https://apps.groupdocs.com/document-viewer/embed/#{settings.file_id}'></iframe>"
       end
+=======
+      #Prepare to sign url
+      iframe = "/document-viewer/embed/#{settings.file_id}"
+      # Construct result string
+      url = GroupDocs::Api::Request.new(:path => iframe).prepare_and_sign_url
+      #Generate iframe URL
+      case base_path
+        when 'https://stage-api-groupdocs.dynabic.com'
+          iframe = "https://stage-api-groupdocs.dynabic.com#{url}"
+        when 'https://dev-api-groupdocs.dynabic.com'
+          iframe = "https://dev-apps.groupdocs.com#{url}"
+        else
+          iframe = "https://apps.groupdocs.com#{url}"
+      end
+      #Make iframe
+      iframe = "<iframe id='downloadframe' src='#{iframe}' width='800' height='1000'></iframe>"
+
+>>>>>>> samples-dev
       message = 'Annotations was deleted from document'
     end
 
   rescue Exception => e
     err = e.message
   end
 
+<<<<<<< HEAD
   # set variables for template
+=======
+  #Set variables for template
+>>>>>>> samples-dev
   haml :sample28, :locals => {:userId => settings.client_id, :privateKey => settings.private_key, :messages => message, :iframe => iframe, :fileId => settings.file_id, :err => err}
 end