groupdocs 1.5.8 → 1.5.9

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

@@ -1,33 +1,40 @@
-# GET request
+#GET request
 get '/sample07' do
   haml :sample07
 end
 
-# POST request
+#POST request
 post '/sample07' do
-  # Set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   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?
 
-    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
 
-    # 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!('/', {:extended => true}, {:client_id => settings.client_id, :private_key => settings.private_key})
 
-    # Construct result string
+    #Construct result string
     thumbnails = ''
     files_list.each do |element|
       if element.class.name.split('::').last == 'Folder'
@@ -35,7 +42,7 @@ post '/sample07' do
       end
       if element.thumbnail
         name = element.name
-        thumbnails += "<p><img src='data:image/png;base64,#{element.thumbnail}', width='40px', height='40px'> #{name}</p>"
+        thumbnails += "<img src='data:image/png;base64,#{element.thumbnail}', width='40px', height='40px'> #{name}"
       end
     end
 
@@ -47,6 +54,6 @@ post '/sample07' do
     err = e.message
   end
 
-  # Set variables for template
+  #Set variables for template
   haml :sample07, :locals => {:clientId => settings.client_id, :privateKey => settings.private_key, :thumbnailList => thumbnails, :err => err}
 end

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

@@ -1,11 +1,11 @@
-# GET request
+#GET request
 get '/sample08' do
   haml :sample08
 end
 
-# POST request
+#POST request
 post '/sample08' do
-  # Set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   set :guid, params[:guid]
@@ -15,33 +15,40 @@ post '/sample08' do
   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?
 
-    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
 
     file = nil
     doc = nil
     metadata = nil
 
-    # Get document by file GUID
+    #Get document by file GUID
     case settings.source
       when 'guid'
         file = GroupDocs::Storage::File.new({:guid => settings.file_id})
       when 'local'
-        # Construct path
+        #Construct path
         filepath = "#{Dir.tmpdir}/#{params[:file][:filename]}"
-        # Open file
+        #Open file
         File.open(filepath, '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!(filepath, {})
       when 'url'
         file = GroupDocs::Storage::File.upload_web!(settings.url)
@@ -52,10 +59,10 @@ post '/sample08' do
     doc = file.to_document
     metadata = doc.metadata!()
 
-    # Get document page images
+    #Get document page images
     images = doc.page_images!(800, 400, {:first_page => 0, :page_count => metadata.views_count})
 
-    # Result
+    #Result
     unless images.empty?
       image = images[Integer(settings.page_number)]
     end
@@ -64,6 +71,6 @@ post '/sample08' do
     err = e.message
   end
 
-  # Set variables for template
+  #Set variables for template
   haml :sample08, :locals => {:clientId => settings.client_id, :privateKey => settings.private_key, :guid => settings.guid, :pageNumber => settings.page_number, :image => image, :err => err}
 end

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

@@ -1,9 +1,9 @@
-# GET request
+#GET request
 get '/sample09' do
   haml :sample09
 end
 
-# POST request
+#POST request
 post '/sample09' do
   # Set variables
   set :file_id, params[:fileId]
@@ -17,30 +17,37 @@ post '/sample09' do
   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.width.empty? or settings.height.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 document by file GUID
+    #Get document by file GUID
     file = nil
     case settings.source
     when 'guid'
       file = GroupDocs::Storage::File.new({:guid => settings.file_id})
     when 'local'
-      # Construct path
+      #Construct path
       filepath = "#{Dir.tmpdir}/#{params[:file][:filename]}"
-      # Open file
+      #Open file
       File.open(filepath, '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!(filepath, {})
     when 'url'
       file = GroupDocs::Storage::File.upload_web!(settings.url)
@@ -51,33 +58,28 @@ post '/sample09' do
 
     case settings.check
     when 'viewer'
-      case settings.base_path
-      when 'https://stage-api-groupdocs.dynabic.com'
-      url = "http://stage-apps-groupdocs.dynabic.com/document-viewer/embed/#{file.guid}?frameborder='0' width='#{settings.width}' height='#{settings.height}'"
-      when 'https://dev-api-groupdocs.dynabic.com'
-        url = "http://dev-apps-groupdocs.dynabic.com/document-viewer/embed/#{file.guid}?frameborder='0' width='#{settings.width}' height='#{settings.height}'"
-      else
-        url = "https://apps.groupdocs.com/document-viewer/embed/#{file.guid}?frameborder='0' width='#{settings.width}' height='#{settings.height}'"
-      end
-
+      #Prepare to sign url
+      iframe = "/document-viewer/embed/#{file.guid}?frameborder='0' width='#{settings.width}' height='#{settings.height}'"
     when 'annotation'
-      case settings.base_path
+      #Prepare to sign url
+      iframe = "/document-annotation2/embed/#{file.guid}?frameborder='0' width='#{settings.width}' height='#{settings.height}'"
+    end
+     #Sign url
+    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-annotation2/embed/#{file.guid}?frameborder='0' width='#{settings.width}' height='#{settings.height}'"
+        iframe = "https://stage-api-groupdocs.dynabic.com#{url}"
       when 'https://dev-api-groupdocs.dynabic.com'
-        url = "http://dev-apps-groupdocs.dynabic.com/document-annotation2/embed/#{file.guid}?frameborder='0' width='#{settings.width}' height='#{settings.height}'"
+        iframe = "https://dev-apps.groupdocs.com#{url}"
       else
-        url = "https://apps.groupdocs.com/document-annotation2/embed/#{file.guid}?frameborder='0' width='#{settings.width}' height='#{settings.height}'"
-      end
+        iframe = "https://apps.groupdocs.com#{url}"
     end
 
-    # Construct result string
-    url = GroupDocs::Api::Request.new(:path => url).prepare_and_sign_url
-
   rescue Exception => e
     err = e.message
   end
 
   # Set variables for template
-  haml :sample09, :locals => {:guid => file.guid, :width => settings.width, :height => settings.height, :v_url => url, :err => err}
+  haml :sample09, :locals => {:guid => file.guid, :width => settings.width, :height => settings.height, :v_url => iframe, :err => err}
 end

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

@@ -1,11 +1,11 @@
-# GET request
+#GET request
 get '/sample10' do
   haml :sample10
 end
 
-# POST request
+#POST request
 post '/sample10' do
-  # Set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   set :guid, params[:fileId]
@@ -14,32 +14,39 @@ post '/sample10' do
   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.guid.empty? or settings.email.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 document by file GUID
+    #Get document by file GUID
     file = nil
     case settings.source
       when 'guid'
         file = GroupDocs::Storage::File.new({:guid => settings.guid}).to_document.metadata!()
         file = file.last_view.document.file
       when 'local'
-        # Construct path
+        #Construct path
         filepath = "#{Dir.tmpdir}/#{params[:file][:filename]}"
-        # Open file
+        #Open file
         File.open(filepath, '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!(filepath, {})
       when 'url'
         file = GroupDocs::Storage::File.upload_web!(settings.url)
@@ -47,10 +54,10 @@ post '/sample10' do
         raise 'Wrong GUID source.'
     end
 
-    # Share document. Make a request to API using client_id and private_key
+    #Share document. Make a request to API using client_id and private_key
     shared = file.to_document.sharers_set!(settings.email.split(' '))
 
-    # Result
+    #Result
     if shared
       shared_emails = settings.email
     end
@@ -58,6 +65,6 @@ post '/sample10' do
     err = e.message
   end
 
-  # Set variables for template
+  #Set variables for template
   haml :sample10, :locals => {:clientId => settings.client_id, :privateKey => settings.private_key, :guid => settings.guid, :email => settings.email, :shared => shared_emails, :err => err}
 end

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

@@ -1,11 +1,11 @@
-# GET request
+#GET request
 get '/sample11' do
   haml :sample11
 end
 
-# POST request
+#POST request
 post '/sample11' do
-  # Set variables
+  #Set variables
   set :client_id, params[:clientId]
   set :private_key, params[:privateKey]
   set :file_id, params[:fileId]
@@ -15,17 +15,24 @@ post '/sample11' 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.file_id.empty? or settings.annotation_type.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
 
     if settings.annotation_id != ''
@@ -33,92 +40,82 @@ post '/sample11' do
       file = GroupDocs::Storage::File.new({:guid => settings.file_id}).to_document
       annotation = file.annotations!()
 
-      # Remove annotation from document
+      #Remove annotation from document
       remove = annotation.last.remove!()
       message = "You delete the annotation id = #{remove[:guid]} "
     else
-    # Annotation types
-    types = {:text => "0", :area => "1", :point => "2"}
-
-
-    # Required parameters
-    all_params = all_params = ['annotationType', 'boxX', 'boxY', 'text']
-
-    # Added required parameters depends on  annotation type ['text' or 'area']
-    if settings.annotation_type == 'text'
-      all_params = all_params | ['boxWidth', 'boxHeight', 'annotationPositionX', 'annotationPositionY', 'rangePosition', 'rangeLength']
-    elsif settings.annotation_type == 'area'
-      all_params = all_params | ['boxWidth', 'boxHeight']
-    end
-
-    # Checking required parameters
-    all_params.each do |param|
-      raise 'Please enter all required parameters' if params[param].empty?
-    end
-
-    # Make a request to API using client_id and private_key
-    files_list = GroupDocs::Storage::Folder.list!('/', {})
-
-    document = ''
+      #Annotation types
+      types = {:text => "0", :area => "1", :point => "2"}
 
-    # 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
-
-    unless document.instance_of? String
 
-      # Start create new annotation
-      annotation = GroupDocs::Document::Annotation.new(document: document.to_document)
+      #Required parameters
+      all_params = all_params = ['annotationType', 'boxX', 'boxY', 'text']
 
-
-      info = nil
-      # Construct requestBody depends on annotation type
-      # Text annotation
+      #Added required parameters depends on  annotation type ['text' or 'area']
       if settings.annotation_type == 'text'
-        annotation.box = GroupDocs::Document::Rectangle.new ({x: params['boxX'], y: params['boxY'], width: params['boxWidth'], height: params['boxHeight']})
-        annotation.annotationPosition = {x: params['annotationPositionX'], y: params['annotationPositionY']}
-        range = {position: params['rangePosition'], length: params['rangeLength']}
-        info = {:box => annotation_box, :annotationPosition => annotation_annotationPosition, :range => range, :type => types[settings.annotation_type.to_sym], :replies => [{:text => params['text']}]}
-        # Area annotation
+        all_params = all_params | ['boxWidth', 'boxHeight', 'annotationPositionX', 'annotationPositionY', 'rangePosition', 'rangeLength']
       elsif settings.annotation_type == 'area'
-        annotation_box = {x: params['boxX'], y: params['boxY'], width: params['boxWidth'], height: params['boxHeight']}
-        annotation_annotationPosition = {x: 0, y: 0}
-        info = {:box => annotation_box, :annotationPosition => annotation_annotationPosition, :type => types[settings.annotation_type.to_sym], :replies => [{:text => params['text']}]}
-        # Point annotation
-      elsif settings.annotation_type == 'point'
-        annotation_box = {x: params['boxX'], y: params['boxY'], width: 0, height: 0}
-        annotation_annotationPosition = {x: 0, y: 0}
-
-        info = {:box => annotation_box, :annotationPosition => annotation_annotationPosition, :type => types[settings.annotation_type.to_sym], :replies => [{:text => params['text']}] }
+        all_params = all_params | ['boxWidth', 'boxHeight']
       end
 
-
-      # Call create method
-      annotation.create!(info)
-      id = annotation.document.file.id
-      # Get document guid
-      guid = annotation.document.file.guid
-
-      case settings.base_path
-
-        when 'https://stage-api-groupdocs.dynabic.com'
-          url = "http://stage-apps-groupdocs.dynabic.com/document-annotation2/embed/#{guid}"
-        when 'https://dev-api-groupdocs.dynabic.com'
-          url = "http://dev-apps-groupdocs.dynabic.com/document-annotation2/embed/#{guid}"
-        else
-          url = "http://apps.groupdocs.com/document-annotation2/embed/#{guid}"
+      #Checking required parameters
+      all_params.each do |param|
+        raise 'Please enter all required parameters' if params[param].empty?
       end
 
-        #Add the signature in url
-        url = GroupDocs::Api::Request.new(:path => url).prepare_and_sign_url
-        # Set iframe with document GUID
-        iframe = "<iframe src='#{url}' frameborder='0' width='720' height='600'></iframe>"
-
-    end
+      #Create document object
+      document = GroupDocs::Storage::File.new(guid: settings.file_id).to_document
+
+      unless document.instance_of? String
+
+        #Start create new annotation
+        annotation = GroupDocs::Document::Annotation.new(document: document)
+
+        info = nil
+        #Construct requestBody depends on annotation type
+        #Text annotation
+        if settings.annotation_type == 'text'
+          annotation.box = GroupDocs::Document::Rectangle.new ({x: params['boxX'], y: params['boxY'], width: params['boxWidth'], height: params['boxHeight']})
+          annotation.annotationPosition = {x: params['annotationPositionX'], y: params['annotationPositionY']}
+          range = {position: params['rangePosition'], length: params['rangeLength']}
+          info = {:box => annotation_box, :annotationPosition => annotation_annotationPosition, :range => range, :type => types[settings.annotation_type.to_sym], :replies => [{:text => params['text']}]}
+          #Area annotation
+        elsif settings.annotation_type == 'area'
+          annotation_box = {x: params['boxX'], y: params['boxY'], width: params['boxWidth'], height: params['boxHeight']}
+          annotation_annotationPosition = {x: 0, y: 0}
+          info = {:box => annotation_box, :annotationPosition => annotation_annotationPosition, :type => types[settings.annotation_type.to_sym], :replies => [{:text => params['text']}]}
+          #Point annotation
+        elsif settings.annotation_type == 'point'
+          annotation_box = {x: params['boxX'], y: params['boxY'], width: 0, height: 0}
+          annotation_annotationPosition = {x: 0, y: 0}
+
+          info = {:box => annotation_box, :annotationPosition => annotation_annotationPosition, :type => types[settings.annotation_type.to_sym], :replies => [{:text => params['text']}] }
+        end
+
+        #Call create method
+        annotation.create!(info)
+        id = annotation.document.file.id
+        #Get document guid
+        guid = annotation.document.file.guid
+
+        #Prepare to sign url
+        iframe = "/document-annotation2/embed/#{guid}"
+        #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>"
 
+      end
     end
 
   rescue Exception => e