groupdocs 1.5.8 → 1.5.9

data/examples/api-samples/views/_others_samples.haml

@@ -82,6 +82,8 @@
     %li
       %a{:href => '/sample40'} Sample40 - How to set callback for signature form and re-direct when it was signed
     %li
-      %a{:href => '/sample41'} Sample41 - How to add numeration in the doc file using GroupDocs Ruby SDK
+      %a{:href => '/sample41'} Sample41 - How to set callback for Annotation and manage user rights using Ruby SDK
     %li
-      %a{:href => '/sample42'} Sample42 - How to download document with annotations using GroupDocs Ruby SDK
+      %a{:href => '/sample42'} Sample42 - How to download document with annotations using GroupDocs Ruby SDK
+    %li
+      %a{:href => '/sample43'} Sample43 - How to add numeration in the doc file using GroupDocs Ruby SDK

data/examples/api-samples/views/index.haml

@@ -62,7 +62,7 @@
     %li
       %a{:href => '/sample30'} Sample30 - How to delete file from GroupDocs Storage
     %li
-      %a{:href => '/sample31'} Sample31 - How to dinamically create Signature Form using data from HTML form
+      %a{:href => '/sample31'} Sample31 - How to dynamically create Signature Form using data from HTML form
     %li
       %a{:href => '/sample32'} Sample32 - How to create signature form, publish it and configure notification via callback
     %li
@@ -80,6 +80,8 @@
     %li
       %a{:href => '/sample39'} Sample39 - How to add a Signature to a document and re-direct after signing with GroupDocs widget
     %li
-      %a{:href => '/sample41'} Sample41 - How to add numeration in the doc file using GroupDocs Ruby SDK
+      %a{:href => '/sample41'} Sample41 - How to set callback for Annotation and manage user rights using Ruby SDK
     %li
       %a{:href => '/sample42'} Sample42 - How to download document with annotations using GroupDocs Ruby SDK
+    %li
+      %a{:href => '/sample43'} Sample43 - How to add numeration in the doc file using GroupDocs Ruby SDK

data/examples/api-samples/views/sample11.haml

@@ -15,7 +15,7 @@
   %p
     UserId = #{(defined? clientId) ? clientId : ''}
   %p
-    PrivateKey = #{(defined? privatKey) ? privateKey : ''}
+    PrivateKey = #{(defined? privateKey) ? privateKey : ''}
   %p
     FileId = #{(defined? fileId) ? fileId : ''}
   %p

data/examples/api-samples/views/sample28.haml

@@ -43,11 +43,19 @@
       %br/
       %input{:type => 'submit', :value => 'Delete all annotations'}/
   %div{:style => 'padding:20px; border:1px solid black;'}
+<<<<<<< HEAD
     %p
       Results:
       %br/
       %font{:color => 'green'}#{(defined? messages) ? messages : ''}
       #{(defined? iframe) ? iframe : ''}
       %br/
+=======
+    Results:
+    %br/
+    %span{:style => 'color:green'}#{(defined? messages) ? messages : ''}
+    #{(defined? iframe) ? iframe : ''}
+    %br/
+>>>>>>> samples-dev
 
 = partial :_others_samples

data/examples/api-samples/views/sample31.haml

@@ -18,7 +18,7 @@
   %p
     PrivateKey = #{(defined? privateKey) ? privateKey : ''}
   %p
-    Template file GUID = #{(defined? template_guid) ? template_guid : ''}
+    Template file GUID = #{(defined? templateGuid) ? templateGuid : ''}
   %p
     Name = #{(defined? name) ? name : ''}
   %p
@@ -57,10 +57,6 @@
         %input{:type=>'text', :name=>'name'}
         %br/
         %br/
-        %label{:for => 'lastName'} What is your last name?
-        %input{:type=>'text', :name=>'lastName'}
-        %br/
-        %br/
         %label{:for => 'country'} What is your country?
         %input{:type=>'text', :name=>'country'}
         %br/
@@ -96,7 +92,6 @@
       %br/
   %div{:style => 'padding:20px; border:1px solid black;'}
     %p Results:
-    %iframe{:id=>'downloadframe', :style=>'display:none'}
     #{(defined? iframe) ? iframe : ''}
 
 = partial :_others_samples

data/examples/api-samples/views/sample39.haml

@@ -194,7 +194,7 @@
         %br/
         %input{:type=>'text', :name=>'privateKey', :id=>'privateKey'}
         %br/
-        %input{:type=>'checkbox', :name=>'useWidget', :value=>'use', :id=>'useWidget', :onclick=> 'setLogic();'}
+        %input{:type=>'checkbox', :name=>'useWidget', :value=>'use', :id=>'useWidget', :onclick=> 'setLogic();'}    Sign document with Widget
         %br/
         %label{:for => 'email', :id=>"emailLabel"} Email
         %br/
@@ -222,11 +222,16 @@
           %span{:class => 'optional'} (Optional) <br/> (For test Callback you can use this URL: http://groupdocs-ruby-samples.herokuapp.com/sample39/signature_callback)
         %input{:type=>'text', :size=>'70', :value=>"#{(defined? callback) ? callback : ''}", :name=>'callbackUrl', :id=>'callbackUrl'}
         %br/
+        %label{:for => 'basePath'} Base Path
+        %font{:color=>'grey'} (Optional)
+        %br/
+        %input{:type=>'text', :name=>'basePath', :id=>'base_path', :value=>"#{(defined? base_path) ? base_path : ''}"}
+        %br/
+        %br/
         %br/
         %input{:type => 'submit', :id=>'btnLoad', :value => 'Upload and sign the document'}
         %span{:id=>'resultsStatus', :style=>'color:red;display:none;'} (Please wait for ajax response)
         %br/
-      %iframe{:id=>'downloadframe', :style=>'display:none'}
     %div{:style => 'padding:20px; border:1px solid black;', :id=>'result'}
       %p
         Results:

data/examples/api-samples/views/sample41.haml

@@ -3,9 +3,7 @@
   \- Sample41
 .samplecontent{:style => 'padding:10px;'}
   %span.description
-    %i
-      This sample will show how to add numeration in the doc file using GroupDocs Ruby SDK.
-
+    This sample will show how to set callback for Annotation and manage user rights using Ruby SDK.
   %br/
   %br/
   /
@@ -20,23 +18,26 @@
     ClientID = #{(defined? userId) ? userId : ''}
   %p
     PrivateKey = #{(defined? privateKey) ? privateKey : ''}
+  %p
+    FileID = #{(defined? fileId) ? fileId : ''}
   %p
     %font{:color => 'red'} #{(defined? err) ? err : ''}
   %br/
   #requestForm{:style => 'padding:20px; border:1px solid black;'}
     %p Enter data for request and press "Make request" button
-    %form{:action => '/sample41', :enctype => 'multipart/form-data', :method => 'post'}
+
+    %form{:action => "/sample41", :enctype => 'multipart/form-data', :method => 'post', :id=>'form'}
       %label{:for => 'clientId'} GroupDocs ClientID
       %br/
-      %input{:type=>'text', :name=>'clientId'}
+      %input{:type=>'text', :name=>'clientId', :id=>'client_id', :value=>"#{(defined? userId) ? userId : ''}"}
       %br/
       %label{:for => 'privateKey'} GroupDocs PrivateKey
       %br/
-      %input{:type=>'text', :name=>'privateKey'}
+      %input{:type=>'text', :name=>'privateKey', :id=>'private_key', :value=>"#{(defined? privateKey) ? privateKey : ''}"}
       %br/
 
 
-      %div.guid_radio
+      %div.guid_radio{:style=>"#{(defined? userId) ? 'display:none' : 'display:block'}"}
         %input{:type=>'radio', :name=>'source', :value=>'guid'} File ID (GUID)
         %br/
         %input{:type=>'radio', :name=>'source', :value=>'local', :checked=>'checked'}Upload local file
@@ -44,48 +45,92 @@
         %input{:type=>'radio', :name=>'source', :value=>'url'} Upload file from URL
         %br/
 
-      %div.guid_field{:style=>'display:none;'}
-        %label{:for=>'fileId', :id=>'guid'} File ID (GUID)
-        %br/
-        %input{:type=>'text', :name=>'fileId'}
+      %div.fields{:style=>"#{(defined? userId) ? 'display:none' : 'display:block'}"}
+        %div.guid_field{:style=>'display:none;'}
+          %label{:for=>'fileId', :id=>'guid'} File ID (GUID)
+          %br/
+          %input{:type=>'text', :name=>'fileId', :id=>'guid', :value=>"#{(defined? fileId) ? fileId : ''}"}
 
-      %div.guid_field
-        %label{:for=>'file'} Upload local file
-        %br/
-        %input{:type=>'file', :name=>'file'}
-
-      %div.guid_field{:style=>'display:none;'}
-        %label{:for=>'url', :id=>'url'} Upload file from URL
-        %br/
-        %input{:type=>'text', :name=>'url'}
+        %div.guid_field
+          %label{:for=>'file'} Upload local file
+          %br/
+          %input{:type=>'file', :name=>'file', :id=>'file'}
 
+        %div.guid_field{:style=>'display:none;'}
+          %label{:for=>'url', :id=>'url'} Upload file from URL
+          %br/
+          %input{:type=>'text', :name=>'url', :id=>'url'}
+      %label First collaborator email
       %br/
-      %label{:for => 'basePath'} Base Path
-      %span{:class => 'optional'} (Optional)
+      %input{:type=>'text', :name=>'email[]', :value=>""}
       %br/
-      %input{:type=>'text', :name=>'basePath'}
+      %label Second collaborator email
       %br/
+      %input{:type=>'text', :name=>'email[]', :value=>""}
       %br/
-
-      %input{:type => 'submit', :value => 'Make request'}
-
+      %label callbackUrl
+      %span{:class => 'optional'} (Optional) <br/> (For test Callback you can use this URL: http://groupdocs-ruby-samples.herokuapp.com/sample41/callback)
+      %br/
+      %input{:type=>'text', :name=>'callbackUrl', :id => 'callbackUrl', :value=>"#{(defined? callbackUrl) ? callbackUrl : ''}"}
+      %br/
+      %label{:for => 'basePath'} Base Path
+      %font{:color=>'grey'} (Optional)
+      %br/
+      %input{:type=>'text', :name=>'basePath', :id=>'base_path', :value=>"#{(defined? base_path) ? base_path : ''}"}
       %br/
       %br/
+      %input{:type => 'submit', :id => 'button', :value => 'Make request'}
       %br/
-  %div{:style => 'padding:20px; border:1px solid black;'}
-    %p
-      Results:
-      #{(defined? iframe) ? iframe : ''}
+      %span{:id=>'resultsStatus', :style=>'color:red;display:none;'} (Please wait for ajax response)
+      %br/
+    %div{:style => 'padding:20px; border:1px solid black;'}
+      %p
+        Results:
+        #rights
+          %p
+        #result
+          %p
+            #{(defined? iframe) ? iframe : ''}
 
-= partial :_others_samples
 
+
+= partial :_others_samples
 %script{:src=>'//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js'}
+
 :javascript
   $(function($){
-
     $('.guid_radio input').change(function(){
       var elementIndex = $(this).parent().children('input').index($(this));
       $('.guid_field').hide();
       $('.guid_field').eq(elementIndex).show();
     });
-  });
+  });
+
+  $(document).ready(setTimeout(check, 5000));
+
+      function check() {
+          if (($("input[name=callbackUrl]").val() != "") && (document.getElementById("result") != null)) {
+              $('#resultsStatus').fadeIn("slow");
+              $.ajax({
+                  type: 'POST',
+                  url: '/sample41/check_guid',
+                  success: function (data) {
+                      $('#resultsStatus').fadeOut("slow");
+                      var result = null;
+                      result = data;
+                      if (result) {
+                          var message = result;
+                          $("#rights").append('<span style="color:red"><i>' + message + '</i></span>')
+                          var url = $('#iframe').attr('src');
+                          $('#iframe').attr('src', url);
+                      }
+                  },
+                  dataType: "text"
+              });
+          }
+      }
+
+
+
+
+

data/examples/api-samples/views/sample42.haml

@@ -52,7 +52,6 @@
   %div{:style => 'padding:20px; border:1px solid black;'}
     %p
       Results:
-      %br/
       #{(defined? message)? message : ''}
       #{(defined? iframe) ? iframe : ''}
 

data/examples/api-samples/views/sample43.haml

@@ -0,0 +1,91 @@
+%h3{:style => 'text-align:center;'}
+  %a{:href => '/'} GroupDocs Ruby SDK Samples
+  \- Sample41
+.samplecontent{:style => 'padding:10px;'}
+  %span.description
+    %i
+      This sample will show how to add numeration in the doc file using GroupDocs Ruby SDK.
+
+  %br/
+  %br/
+  /
+  %span.documentation
+    %a{:href => '/docs/sample43.html'} Builtin documentation for this sample
+
+  %br/
+  %br/
+  %p
+    You entered:
+  %p
+    ClientID = #{(defined? userId) ? userId : ''}
+  %p
+    PrivateKey = #{(defined? privateKey) ? privateKey : ''}
+  %p
+    %font{:color => 'red'} #{(defined? err) ? err : ''}
+  %br/
+  #requestForm{:style => 'padding:20px; border:1px solid black;'}
+    %p Enter data for request and press "Make request" button
+    %form{:action => '/sample43', :enctype => 'multipart/form-data', :method => 'post'}
+      %label{:for => 'clientId'} GroupDocs ClientID
+      %br/
+      %input{:type=>'text', :name=>'clientId'}
+      %br/
+      %label{:for => 'privateKey'} GroupDocs PrivateKey
+      %br/
+      %input{:type=>'text', :name=>'privateKey'}
+      %br/
+
+
+      %div.guid_radio
+        %input{:type=>'radio', :name=>'source', :value=>'guid'} File ID (GUID)
+        %br/
+        %input{:type=>'radio', :name=>'source', :value=>'local', :checked=>'checked'}Upload local file
+        %br/
+        %input{:type=>'radio', :name=>'source', :value=>'url'} Upload file from URL
+        %br/
+
+      %div.guid_field{:style=>'display:none;'}
+        %label{:for=>'fileId', :id=>'guid'} File ID (GUID)
+        %br/
+        %input{:type=>'text', :name=>'fileId'}
+
+      %div.guid_field
+        %label{:for=>'file'} Upload local file
+        %br/
+        %input{:type=>'file', :name=>'file'}
+
+      %div.guid_field{:style=>'display:none;'}
+        %label{:for=>'url', :id=>'url'} Upload file from URL
+        %br/
+        %input{:type=>'text', :name=>'url'}
+
+      %br/
+      %label{:for => 'basePath'} Base Path
+      %span{:class => 'optional'} (Optional)
+      %br/
+      %input{:type=>'text', :name=>'basePath'}
+      %br/
+      %br/
+
+      %input{:type => 'submit', :value => 'Make request'}
+
+      %br/
+      %br/
+      %br/
+  %div{:style => 'padding:20px; border:1px solid black;'}
+    %p
+      Results:
+      #{(defined? iframe) ? iframe : ''}
+
+= partial :_others_samples
+
+%script{:src=>'//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js'}
+:javascript
+  $(function($){
+
+    $('.guid_radio input').change(function(){
+      var elementIndex = $(this).parent().children('input').index($(this));
+      $('.guid_field').hide();
+      $('.guid_field').eq(elementIndex).show();
+    });
+  });

data/lib/groupdocs/api/helpers/access_rights_helper.rb

@@ -4,12 +4,13 @@ module GroupDocs
       module AccessRights
 
         include Api::Helpers::ByteFlag
-
+        #Changed in release 1.5.9
         ACCESS_RIGHTS = {
-          :export   => 1,
-          :download => 2,
-          :proof    => 4,
-          :view     => 8,
+          :view     => 1,
+          :annotate => 2,
+          :download => 4,
+          :export   => 8,
+          :all => 31
         }
 
         private

data/lib/groupdocs/api/helpers/url_helper.rb

@@ -52,6 +52,7 @@ module GroupDocs
           options[:path].sub!(/\{\{client_id\}\}/, client_id)
         end
 
+
         #
         # Adds signature to path.
         #
@@ -59,7 +60,7 @@ module GroupDocs
         #
         def sign_url
           # calculate a hash of the path with private key
-          hash = OpenSSL::Digest::Digest.new('sha1')
+          hash = OpenSSL::Digest.new('sha1')  # Changed in release 1.5.9
           hash = OpenSSL::HMAC.digest(hash, private_key, options[:path])
           # convert hash to base64
           hash = Base64.strict_encode64(hash)

data/lib/groupdocs/document.rb

@@ -1136,7 +1136,7 @@ module GroupDocs
     end
 
     #
-    # @Changed in realese 1.5.8
+    # @Changed in release 1.5.9
     # Returns an array of changes in document.
     #
     # @example
@@ -1155,7 +1155,7 @@ module GroupDocs
       api = Api::Request.new do |request|
         request[:access] = access
         request[:method] = :GET
-        request[:path] = '/comparison/public/#{file.guid}/changes'
+        request[:path] = "/comparison/public/#{file.guid}/changes"
       end
       json = api.execute!
 
@@ -1165,7 +1165,7 @@ module GroupDocs
     end
 
     #
-    # Changed in realese 1.5.8
+    # Changed in release 1.5.8
     # Download comparison result file.
     #
     # @example

data/lib/groupdocs/version.rb

@@ -1,3 +1,3 @@
 module GroupDocs
-  VERSION = '1.5.8'
+  VERSION = '1.5.9'
 end # GroupDocs