groupdocs 1.5.8 → 1.5.9

data/examples/api-samples/samples/sample19.rb

@@ -1,14 +1,14 @@
-# GET request
+#GET request
 get '/sample19' do
   haml :sample19
 end
 
-# POST request
+#POST request
 post '/sample19/compere_callback' do
-  # Set download path
+  #Set download path
   downloads_path = "#{File.dirname(__FILE__)}/../public/downloads"
 
-  # Get callback request
+  #Get callback request
   data = JSON.parse(request.body.read)
   begin
     raise 'Empty params!' if data.empty?
@@ -16,14 +16,14 @@ post '/sample19/compere_callback' do
     client_id = nil
     private_key = nil
 
-    # Get value of SourceId
+    #Get value of SourceId
     data.each do |key, value|
       if key == 'SourceId'
         source_id = value
       end
     end
 
-    # Get private key and client_id from file user_info.txt
+    #Get private key and client_id from file user_info.txt
     if File.exist?("#{File.dirname(__FILE__)}/../public/user_info.txt")
       contents = File.read("#{File.dirname(__FILE__)}/../public/user_info.txt")
       contents = contents.split(' ')
@@ -31,13 +31,13 @@ post '/sample19/compere_callback' do
       private_key = contents.last
     end
 
-    # Create Job instance
+    #Create Job instance
     job = GroupDocs::Job.new({:id => source_id})
 
-    # Get document by job id
+    #Get document by job id
     documents = job.documents!({:client_id => client_id, :private_key => private_key})
 
-    # Download converted file
+    #Download converted file
     documents[:inputs].first.outputs.first.download!(downloads_path, {:client_id => client_id, :private_key => private_key})
 
   rescue Exception => e
@@ -45,15 +45,15 @@ post '/sample19/compere_callback' do
   end
 end
 
-# GET request
+#GET request
 get '/sample19/check' do
 
-  # Check is there download directory
+  #Check is there download directory
   unless File.directory?("#{File.dirname(__FILE__)}/../public/downloads")
     return 'Directory was not found.'
   end
 
-  # Get file name from download directory
+  #Get file name from download directory
   name = nil
   Dir.entries("#{File.dirname(__FILE__)}/../public/downloads").each do |file|
     name = file if file != '.' && file != '..'
@@ -62,15 +62,15 @@ get '/sample19/check' do
   name
 end
 
-# GET request
+#GET request
 get '/sample19/downloads/:filename' do |filename|
-  # Send file with header to download it
+  #Send file with header to download it
   send_file "#{File.dirname(__FILE__)}/../public/downloads/#{filename}", :filename => filename, :type => 'Application/octet-stream'
 end
 
-# POST request
+#POST request
 post '/sample19' do
-  # Set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   set :sourceFileId, params[:sourceFileId]
@@ -78,10 +78,10 @@ post '/sample19' do
   set :callback, params[:callback]
   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
@@ -90,35 +90,42 @@ post '/sample19' do
 
   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.sourceFileId.empty? or settings.targetFileId.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
 
-    # Write client and private key to the file for callback job
+    #Write client and private key to the file for callback job
     if settings.callback
       out_file = File.new("#{File.dirname(__FILE__)}/../public/user_info.txt", 'w')
-      # white space is required
+      #White space is required
       out_file.write("#{settings.client_id} ")
       out_file.write("#{settings.private_key}")
       out_file.close
     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!('/', {})
 
     source_document = ''
     target_document = ''
 
-    # Get source and target documents by file ID
+    #Get source and target documents by file ID
     files_list.each do |element|
       if element.respond_to?('guid') == true and element.guid == settings.sourceFileId
         source_document = element
@@ -142,37 +149,36 @@ post '/sample19' do
         i += 1
       end
 
-
-      # Get job by ID
+      #Get job by ID
       job = GroupDocs::Job.new(id: info.id)
 
-      # Get all job documents
+      #Get all job documents
       documents = job.documents!()
-      # Get compared file giud
+      #Get compared file giud
       guid = documents[:outputs].first.file.guid
 
-      #Get url from request
+      #Prepare to sign url
+      iframe = "/document-viewer/embed/#{guid}"
+      # Construct result string
+      url = GroupDocs::Api::Request.new(:path => iframe).prepare_and_sign_url
+      #Generate iframe URL
       case settings.base_path
-
         when 'https://stage-api-groupdocs.dynabic.com'
-          url = "http://stage-apps-groupdocs.dynabic.com/document-viewer/embed/#{guid}"
+          iframe = "https://stage-api-groupdocs.dynabic.com#{url}"
         when 'https://dev-api-groupdocs.dynabic.com'
-          url = "http://dev-apps-groupdocs.dynabic.com/document-viewer/embed/#{guid}"
+          iframe = "https://dev-apps.groupdocs.com#{url}"
         else
-          url = "https://apps.groupdocs.com/document-viewer/embed/#{guid}"
+          iframe = "https://apps.groupdocs.com#{url}"
       end
 
-      # Add the signature to url request
-      iframe = GroupDocs::Api::Request.new(:path => url).prepare_and_sign_url
-      # Construct result iframe
-      iframe = "<iframe src='#{iframe}' frameborder='0' width='100%' height='600'></iframe>"
-
+      #Construct result iframe
+      iframe = "<iframe id='downloadframe' src='#{iframe}' width='800' height='1000'></iframe>"
     end
 
   rescue Exception => e
     err = e.message
   end
 
-  # Set variables for template
+  #Set variables for template
   haml :sample19, :locals => {:userId => settings.client_id, :privateKey => settings.private_key, :sourceFileId => settings.sourceFileId, :targetFileId => settings.targetFileId, :callback => settings.callback, :iframe => iframe, :err => err}
 end

data/examples/api-samples/samples/sample20.rb

@@ -1,11 +1,11 @@
-# GET request
+#GET request
 get '/sample20' do
   haml :sample20
 end
 
-# POST request
+#POST request
 post '/sample20' do
-  # set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   set :resultFileId, params[:resultFileId]
@@ -13,26 +13,33 @@ post '/sample20' do
 
   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.resultFileId.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
 
-    # construct new storage file
+    #Construct new storage file
     file = GroupDocs::Storage::File.new(guid: settings.resultFileId)
-    # construct new document
+    #Construct new document
     document = GroupDocs::Document.new(file: file)
-    # get compare changes
-    changes = document.changes!()
 
+    #Get compare changes
+    changes = document.changes!()
     result = ''
     result += "<table class='border'>"
     result += "<tr><td><font color='green'>Change Name</font></td><td><font color='green'>Change</font></td></tr>"
@@ -56,6 +63,6 @@ post '/sample20' do
     err = e.message
   end
 
-  # set variables for template
+  #Set variables for template
   haml :sample20, :locals => {:userId => settings.client_id, :privateKey => settings.private_key, :resultFileId => settings.resultFileId, :result => result, :err => err}
 end

data/examples/api-samples/samples/sample21.rb

@@ -1,14 +1,14 @@
-# GET request
+#GET request
 get '/sample21' do
   haml :sample21
 end
 
-# POST request
+#POST request
 post '/sample21/signature_callback' do
-  # Set download path
+  #Set download path
   downloads_path = "#{File.dirname(__FILE__)}/../public/downloads"
 
-  # Get callback request
+  #Get callback request
   data = JSON.parse(request.body.read)
   begin
     raise 'Empty params!' if data.empty?
@@ -16,14 +16,14 @@ post '/sample21/signature_callback' do
     client_id = nil
     private_key = nil
 
-    # Get value of SourceId
+    #Get value of SourceId
     data.each do |key, value|
       if key == 'SourceId'
         source_id = value
       end
     end
 
-    # Get private key and client_id from file user_info.txt
+    #Get private key and client_id from file user_info.txt
     if File.exist?("#{File.dirname(__FILE__)}/../public/user_info.txt")
       contents = File.read("#{File.dirname(__FILE__)}/../public/user_info.txt")
       contents = contents.split(' ')
@@ -31,13 +31,13 @@ post '/sample21/signature_callback' do
       private_key = contents.last
     end
 
-    # Create Job instance
+    #Create Job instance
     job = GroupDocs::Signature::Envelope.new({:id => source_id})
 
-    # Get document by job id
+    #Get document by job id
     documents = job.documents!({}, {:client_id => client_id, :private_key => private_key})
 
-    # Download converted file
+    #Download converted file
     documents[0].file.download!(downloads_path, {:client_id => client_id, :private_key => private_key})
 
   rescue Exception => e
@@ -46,15 +46,15 @@ post '/sample21/signature_callback' do
 end
 
 
-# GET request
+#GET request
 get '/sample21/check' do
 
-  # Check is there download directory
+  #Check is there download directory
   unless File.directory?("#{File.dirname(__FILE__)}/../public/downloads")
     return 'Directory was not found.'
   end
 
-  # Get file name from download directory
+  #Get file name from download directory
   name = nil
   Dir.entries("#{File.dirname(__FILE__)}/../public/downloads").each do |file|
     name = file if file != '.' && file != '..'
@@ -63,15 +63,15 @@ get '/sample21/check' do
   name
 end
 
-# GET request
+#GET request
 get '/sample21/downloads/:filename' do |filename|
-  # Send file with header to download it
+  #Send file with header to download it
   send_file "#{File.dirname(__FILE__)}/../public/downloads/#{filename}", :filename => filename, :type => 'Application/octet-stream'
 end
 
-# POST request
+#POST request
 post '/sample21' do
-  # set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   set :email, params[:email]
@@ -83,10 +83,10 @@ post '/sample21' do
   set :url, params[:url]
   set :source, params[:source]
 
-  # 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
@@ -94,111 +94,119 @@ post '/sample21' do
   end
 
   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.email.empty? or settings.name.empty? or settings.lastName.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
 
-    # Write client and private key to the file for callback job
+    #Write client and private key to the file for callback job
     if settings.callback
       out_file = File.new("#{File.dirname(__FILE__)}/../public/user_info.txt", 'w')
-      # white space is required
+      #White space is required
       out_file.write("#{settings.client_id} ")
       out_file.write("#{settings.private_key}")
       out_file.close
     end
 
     file = nil
-    # get document by file GUID
+    #Get document by file GUID
     case settings.source
       when 'guid'
-        # Create instance of File
+        #Create instance of File
         file = GroupDocs::Storage::File.new({:guid => settings.fileId}).to_document.metadata!()
         file = file.last_view.document.file.to_document
       when 'local'
-        # construct path
+        #Construct path
         file_path = "#{Dir.tmpdir}/#{params[:file][:filename]}"
-        # open file
+
+        #Open file
         File.open(file_path, 'wb') { |f| f.write(params[:file][:tempfile].read) }
-        # make a request to API using client_id and private_key
+        #Make a request to API using client_id and private_key
         file = GroupDocs::Storage::File.upload!(file_path, {}).to_document
       when 'url'
-        # Upload file from defined url
+        #Upload file from defined url
         file = GroupDocs::Storage::File.upload_web!(settings.url).to_document
       else
         raise 'Wrong GUID source.'
     end
 
     name = file.name
-    # create envelope using user id and entered by user name
+    #Create envelope using user id and entered by user name
     envelope = GroupDocs::Signature::Envelope.new
     envelope.name = file.name
     envelope.email_subject = 'Sing this!'
     envelope.create!({})
 
-    # Add uploaded document to envelope
+    #Add uploaded document to envelope
     envelope.add_document!(file, {})
 
-    # Get role list for current user
+    #Get role list for current user
     roles = GroupDocs::Signature::Role.get!({})
 
-    # Create new recipient
+    #Create new recipient
     recipient = GroupDocs::Signature::Recipient.new
     recipient.email = settings.email
     recipient.first_name = settings.name
     recipient.last_name = settings.lastName
     recipient.role_id = roles.detect { |role| role.name == 'Signer' }.id
 
-    # Add recipient to envelope
-    add = envelope.add_recipient!(recipient)
+    #Add recipient to envelope
+    recipient = envelope.add_recipient!(recipient)
 
-    # Get recipient id
-    recipient.id = add[:recipient][:id]
 
-    # Get document id
+    #Get document id
     document = envelope.documents!({})
 
 
-    # Get field and add the location to field
+    #Get field and add the location to field
     field = GroupDocs::Signature::Field.get!({}).detect { |f| f.type == :signature }
     field.location = {:location_x => 0.15, :location_y => 0.73, :location_w => 150, :location_h => 50, :page => 1}
     field.name = 'EMPLOYEE SIGNATURE'
 
-    # Add field to envelope
+    #Add field to envelope
     envelope.add_field!(field, document[0], recipient, {})
 
 
-    # Send envelop
+    #Send envelop
     envelope.send!({:callbackUrl => settings.callback})
 
-    #Get url from request
-    case settings.base_path
-
+    #Prepare to sign url
+    iframe = "/signature2/signembed/#{envelope.id}/#{recipient.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'
-        url = "http://stage-apps-groupdocs.dynabic.com/signature/signembed/#{envelope.id}/#{recipient.id}"
+        iframe = "https://stage-api-groupdocs.dynabic.com#{url}"
       when 'https://dev-api-groupdocs.dynabic.com'
-        url = "http://dev-apps-groupdocs.dynabic.com/signature/signembed/#{envelope.id}/#{recipient.id}"
+        iframe = "https://dev-apps.groupdocs.com#{url}"
       else
-        url = "https://apps.groupdocs.com/signature/signembed/#{envelope.id}/#{recipient.id}"
+        iframe = "https://apps.groupdocs.com#{url}"
     end
 
-
-    iframe = GroupDocs::Api::Request.new(:path => url).prepare_and_sign_url
-    # Make iframe
-    iframe = "<iframe src='#{iframe}' frameborder='0' width='720' height='600'></iframe>"
+    #Make iframe
+    iframe = "<iframe id='downloadframe' src='#{iframe}' width='800' height='1000'></iframe>"
+    #Create message
     message = "<p>File was uploaded to GroupDocs. Here you can see your <strong>#{name}</strong> file in the GroupDocs Embedded Viewer.</p>"
   rescue Exception => e
     err = e.message
   end
 
-  # Set variables for template
+  #Set variables for template
   haml :sample21, :locals => {:userId => settings.client_id, :privateKey => settings.private_key, :email => settings.email, :name => settings.name, :lastName => settings.lastName, :iframe => iframe, :massage => message, :err => err, :callback => settings.callback,}
 end