groupdocs 1.5.5 → 1.5.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDQxMzhjNGEyYjliMTRmNDdhMDBkN2ZiODg4MGYwZDYxNTkxMzJmMw==
+    OTM5YTU3Y2Q2MTY1M2RmMjdhODZkMTZhNDdmZGE5YjdlZWY1ZDc5Mw==
   data.tar.gz: !binary |-
-    ODVkNmY0ODYwMTIzMWEyNzM1ZjFlNTQ2MDA0YjZhMzkyMTgwZmM3ZQ==
+    ZmUwM2M1N2Y5ZmJiYTFkNGYyNDQ5NzcyOGY4ZWVhNDQwODRlMTEzMQ==
 SHA512:
   metadata.gz: !binary |-
-    NjEzYzQ5YjAwMmEzNDgwMmQ0NmRlNzAwNDU0NTk5MDRlOGRiMzM1NWIxMmRk
-    NDk1NDE3ZGNmMmYzNTM3MWNiOTMzMDkzMmZlY2JkM2MzNzU3ZDMxMmVhODEw
-    OGVlMjE2MzM2NjdjNjBkNWNkYWZmM2E3ZjhjYmJhYjQ2NmFkMjg=
+    OWY0NTg5N2I3YTQzNjJhOGI5NTYzYjk5M2FlODRhNDJmMjllM2EwYTg0M2Mx
+    MWNmMWRhMjc5NjNhZjRkOGNjY2E0MWU1ZDRkY2JmNWY1N2Q1MmNlMzg5ZTNk
+    Mzc2NDgwOWVjMTlkOWQ0NzMxM2E4MTExZTQyNjNlOTM0NGMwZjg=
   data.tar.gz: !binary |-
-    MjBmMTU5MTU1YjE4YjMwMzZlZGU4NjQzMzY4MDBlMzQyMWQxNTU0YmJiMzJi
-    N2UwNWJmM2Q3NDI0ZTE1MWM5ZGU5NDFmMGM0YTdjMDUxZjM2MWJiMjE4ZTkw
-    ZmJhYjFmODkxMDBiZTI3YTk1OTQ2OGExYThhOWMwMDFhNTdkYjY=
+    YjMwNmYxNzU4YWQ2N2RmN2MwZGU1NDYwODlmYTdkYmVmNjBmN2VmN2M4MWY1
+    NjI1ODQyZTVhNGYwZjFhMTQzYmEyNDZhYTA5MTJmMzNjOWFkZDc0NmNmODk5
+    MWMwY2UxNGNkMDMzYTlmYjkyMzcyNjRiNjFmYTA4OWQ3MGM4MDc=

data/lib/groupdocs/datasource.rb

@@ -97,7 +97,7 @@ module GroupDocs
     # Adds datasource.
     #
     # @example
-    #   field = GroupDocs::DataSource::Field.new(field: 'test', values: %w(test test))
+    #   field = GroupDocs::DataSource::Field.new(name: 'test', values: %w(test test))
     #   datasource = GroupDocs::DataSource.new
     #   datasource.add_field(field)
     #   datasource.add!
@@ -179,5 +179,70 @@ module GroupDocs
       nil
     end
 
+    #
+    # Add job document datasource.
+    #
+    # @example
+    # file = GroupDocs::Storage::File.new(guid => "(file guid)").to_document
+    # field = GroupDocs::DataSource::Field.new(:name => "test")
+    # datasource = GroupDocs::DataSource.new
+    # datasource.add_field(field).add!()
+    # job = GroupDocs::Job.create!()
+    # file_id = job.add_document!(file)
+    # datasource = add_datasourse!(job, file_id, datasource)
+    #
+    # @param [GroupDocs::DataSource] datasource
+    # @param [String] jobId Job identifier
+    # @param [String] fileId File identifier
+    # @param [String] datasourceId
+    # @param [Hash] access Access credentials
+    # @option access [String] :client_id
+    # @option access [String] :private_key
+    #
+    def add_datasource!(job, file_id, datasource, access = {})
+      datasource.is_a?(GroupDocs::DataSource) or raise ArgumentError,
+                                                       "Datasource should be GroupDocs::DataSource object, received: #{datasource.inspect}"
+
+      Api::Request.new do |request|
+        request[:access] = access
+        request[:method] = :PUT
+        request[:path] = "/merge/{{client_id}}/jobs/#{job.id}/files/#{file_id}/datasources/#{datasource.id}"
+      end.execute!
+    end
+
+    #
+    # Add job document datasource fields.
+    #
+    #
+    # @example
+    # file = GroupDocs::Storage::File.new(guid => "(file guid)").to_document
+    # field = GroupDocs::DataSource::Field.new(:name => "test")
+    # datasource = GroupDocs::DataSource.new
+    # datasource.add_field(field)
+    # job = GroupDocs::Job.create!()
+    # file_id = job.add_document!(file)
+    # datasource = add_datasourse!(job, file_id, datasource)
+    #
+    #
+    #
+    # @param [String] jobId Job identifier
+    # @param [String] fileId File identifier
+    # @param [Array] datasourceFields
+    # @param [Hash] access Access credentials
+    # @option access [String] :client_id
+    # @option access [String] :private_key
+    #
+    def add_datasource_fields!(job, file_id, datasource, access = {})
+      datasource.is_a?(GroupDocs::DataSource) or raise ArgumentError,
+                                                       "Datasource should be GroupDocs::DataSource object, received: #{datasource.inspect}"
+      Api::Request.new do |request|
+        request[:access] = access
+        request[:method] = :PUT
+        request[:path] = "/merge/{{client_id}}/jobs/#{job.id}/files/#{file_id}/datasources"
+        request[:request_body] = datasource.fields
+      end.execute!
+
+    end
+
   end # DataSource
 end # GroupDocs

data/lib/groupdocs/document.rb

@@ -106,16 +106,17 @@ module GroupDocs
       documents_to_sign = []
       documents.map(&:file).each do |file|
         document = { :name => file.name }
-        contents = File.read(file.local_path)
+        contents = File.open(file.local_path, 'rb').read
         contents = Base64.strict_encode64(contents)
         document.merge!(:data => "data:#{mime_type(file.local_path)};base64,#{contents}")
 
         documents_to_sign << document
+
       end
 
       signers = []
       signatures.each do |signature|
-        contents = File.read(signature.image_path)
+        contents = File.open(signature.image_path, 'rb').read
         contents = Base64.strict_encode64(contents)
         signer = { :name => signature.name, :data => "data:#{mime_type(signature.image_path)};base64,#{contents}" }
         signer.merge!(signature.position)
@@ -123,6 +124,7 @@ module GroupDocs
         signer.merge!(:placeSignatureOn => nil)
 
         signers << signer
+
       end
 
       json = Api::Request.new do |request|
@@ -131,14 +133,8 @@ module GroupDocs
         request[:path] = '/signature/{{client_id}}/sign'
         request[:request_body] = { :documents => documents_to_sign, :signers => signers }
       end.execute!
+      json[:jobId]
 
-      signed_documents = []
-      json[:documents].each_with_index do |document, i|
-        file = Storage::File.new(:guid => document[:documentId], :name => "#{documents[i].file.name}_signed.pdf")
-        signed_documents << Document.new(:file => file)
-      end
-
-      signed_documents
     end
 
     #
@@ -182,7 +178,7 @@ module GroupDocs
         metadata.views_count = json[:views_count]
         if json[:last_view]
           metadata.last_view = json[:last_view]
-          metadata.last_view.document = new(:file => Storage::File.new(json))
+
         end
       end
     end
@@ -301,7 +297,10 @@ module GroupDocs
     #
     #  Returns a stream of bytes representing a particular document page image.
     #
-    #
+    # @param [String] path Document path
+    # @param [String] name Name document (format - jpg)
+    # @example path = "#{File.dirname(__FILE__)}"
+    #          name = "test.jpg"
     # @param [Integer] page_number Document page number to get image for
     # @param [Integer] dimension Image dimension "<width>x<height>"(500x600)
     # @param [Hash] options
@@ -431,7 +430,7 @@ module GroupDocs
     # @example
     #   file = GroupDocs::Storage::Folder.list!.last
     #   document = file.to_document
-    #   document.page_html_urls! 1024, 768, first_page: 0, page_count: 1
+    #   document.page_html_urls!  first_page: 0, page_count: 1
     #
     # @param [Hash] options
     # @option options [Integer] :first_page Start page to return image for (starting with 0)
@@ -461,13 +460,11 @@ module GroupDocs
     # @option access [String] :private_key
     #
     def editlock!(access = {})
-      json = Api::Request.new do |request|
+      Api::Request.new do |request|
         request[:access] = access
         request[:method] = :GET
         request[:path] = "/doc/{{client_id}}/files/#{file.guid}/editlock"
       end.execute!
-
-      json[:edit_url]
     end
 
     #
@@ -487,7 +484,6 @@ module GroupDocs
         request[:path] = "/doc/{{client_id}}/files/#{file.guid}/editlock"
       end
       api.add_params(options).execute!
-
     end
 
     #
@@ -504,7 +500,6 @@ module GroupDocs
         request[:method] = :GET
         request[:path] = "/doc/{{client_id}}/files/#{file.guid}/tags"
       end.execute!
-
     end
 
     #
@@ -516,13 +511,11 @@ module GroupDocs
     # @return [String]
     #
     def tags_set!(access = {})
-      json = Api::Request.new do |request|
+      Api::Request.new do |request|
         request[:access] = access
         request[:method] = :PUT
         request[:path] = "/doc/{{client_id}}/files/#{file.guid}/tags"
       end.execute!
-
-      json[:document_id]
     end
 
     #
@@ -534,13 +527,11 @@ module GroupDocs
     # @return [String]
     #
     def tags_clear!(access = {})
-      json = Api::Request.new do |request|
+      Api::Request.new do |request|
         request[:access] = access
         request[:method] = :DELETE
         request[:path] = "/doc/{{client_id}}/files/#{file.guid}/tags"
       end.execute!
-
-      json[:document_id]
     end
 
     #
@@ -706,7 +697,6 @@ module GroupDocs
         metadata.views_count = json[:views_count]
         if json[:last_view]
           metadata.last_view = json[:last_view]
-          metadata.last_view.document = self
         end
       end
     end
@@ -940,15 +930,15 @@ module GroupDocs
     #
     # @raise [ArgumentError] if datasource is not GroupDocs::DataSource object
     #
-    def datasource_fields!(datasource, datasourceFields, options = {}, access = {})
+    def datasource_fields!(datasource, options = {}, access = {})
       datasource.is_a?(GroupDocs::DataSource) or raise ArgumentError,
                                                        "Datasource should be GroupDocs::DataSource object, received: #{datasource.inspect}"
 
       api = Api::Request.new do |request|
         request[:access] = access
         request[:method] = :POST
-        request[:path] = "/merge/{{client_id}}/files/#{file.guid}/datasources/"
-        request[:request_body] = datasourceFields
+        request[:path] = "/merge/{{client_id}}/files/#{file.guid}/datasources"
+        request[:request_body] = datasource.fields
       end
       api.add_params(options)
       json = api.execute!
@@ -1099,7 +1089,7 @@ module GroupDocs
     #
     # @raise [ArgumentError] if document is not GroupDocs::Document object
     #
-    def compare!(document, access = {})
+    def compare!(document, callback, access = {})
       document.is_a?(GroupDocs::Document) or raise ArgumentError,
                                                    "Document should be GroupDocs::Document object, received: #{document.inspect}"
 
@@ -1108,7 +1098,7 @@ module GroupDocs
         request[:method] = :GET
         request[:path] = "/comparison/{{client_id}}/comparison/compare"
       end
-      api.add_params(:source => file.guid, :target => document.file.guid)
+      api.add_params(:source => file.guid, :target => document.file.guid, :callback => callback)
       json = api.execute!
 
       Job.new(:id => json[:job_id])
@@ -1185,7 +1175,7 @@ module GroupDocs
     # @option access [String] :private_key
     #
     #
-    def download!( path, name, options = {}, access = {})
+    def download!( path, options = {}, access = {})
       api = Api::Request.new do |request|
         request[:access] = access
         request[:method] = :DOWNLOAD
@@ -1194,7 +1184,7 @@ module GroupDocs
       api.add_params(options)
       response = api.execute!
 
-      filepath = "#{path}/#{name}"
+      filepath = "#{path}/#{file.name}"
       Object::File.open(filepath, 'wb') do |file|
         file.write(response)
       end

data/lib/groupdocs/document/annotation.rb

@@ -166,19 +166,22 @@ module GroupDocs
     #
     # @example
     #   document = GroupDocs::Storage::Folder.list!.first.to_document
-    #   annotation = GroupDocs::Document::Annotation.new(document: document)
+    #   annotation = GroupDocs::Document::Annotation.new(document: document)     #
     #   annotation.create!
     #
+    # @param [Hash] info Annotation info
+    # @option info [Array] :box
+    # @option info [Array] :annotationPosition
     # @param [Hash] access Access credentials
     # @option access [String] :client_id
     # @option access [String] :private_key
     #
-    def create!(access = {})
+    def create!(info, access = {})
       json = Api::Request.new do |request|
         request[:access] = access
         request[:method] = :POST
         request[:path] = "/ant/{{client_id}}/files/#{document.file.guid}/annotations"
-        request[:request_body] = to_hash
+        request[:request_body] = info
       end.execute!
 
       json.each do |field, value|
@@ -193,7 +196,7 @@ module GroupDocs
     # @option access [String] :client_id
     # @option access [String] :private_key
     #
-    def remove!(access = {})
+    def self.remove!(guid, access = {})
       Api::Request.new do |request|
         request[:access] = access
         request[:method] = :DELETE
@@ -295,7 +298,7 @@ module GroupDocs
         request[:access] = access
         request[:method] = :PUT
         request[:path] = "/ant/{{client_id}}/annotations/#{guid}/size"
-        request[:request_body] = { :x => x, :y => y }
+        request[:request_body] = { :width => x, :height => y }
       end.execute!
 
       self.width = x

data/lib/groupdocs/job.rb

@@ -89,16 +89,17 @@ module GroupDocs
     #
     # Returns job by its identifier.
     #
-    # @param [String] options
+    # @param [Hash] options
     # @option statusIds [String] :statusIds (required)
-    # @option actions [String] :actions
+    # @option actions [Integer] :actions
     # @option excluded_actions [String] :excluded_actions
     # @param [Hash] access Access credentials
     # @option access [String] :client_id
     # @option access [String] :private_key
     # @return [GroupDocs::Job]
     #
-    def self.get_resources!(options = {}, access = {})
+    def self.get_resources!(options = {} , access = {})
+      options[:actions] = convert_actions_to_byte(options[:actions])
       api = Api::Request.new do |request|
         request[:access] = access
         request[:method] = :GET

data/lib/groupdocs/post.rb

@@ -16,9 +16,7 @@ module GroupDocs
         request[:path] = '/post/file.rename'
       end
       api.add_params(options)
-      json = api.execute!
-
-      new(json)
+      api.execute!
     end
 
     # Delete by post.
@@ -34,9 +32,7 @@ module GroupDocs
         request[:path] = '/post/file.delete'
       end
       api.add_params(options)
-      json = api.execute!
-
-      new(json)
+      api.execute!
     end
 
     #  Delete from folder by post.
@@ -52,9 +48,7 @@ module GroupDocs
         request[:path] = '/post/file.delete.in'
       end
       api.add_params(options)
-      json = api.execute!
-
-      new(json)
+      api.execute!
     end
 
     #  Compress by post.
@@ -71,9 +65,7 @@ module GroupDocs
         request[:path] = '/post/file.compress'
       end
       api.add_params(options)
-      json = api.execute!
-
-      new(json)
+      api.execute!
     end
 
 

data/lib/groupdocs/questionnaire.rb

@@ -15,6 +15,8 @@ module GroupDocs
     # @option options [Symbol] :status Filter questionnaires by status
     # @option options [Integer] :page_number Page to start with
     # @option options [Integer] :page_size How many items to list
+    # @option options [String] :orderBy Order by column (optional)
+    # @option options [Bool] :isAscending Order by ascending or descending (optional)
     # @param [Hash] access Access credentials
     # @option access [String] :client_id
     # @option access [String] :private_key
@@ -128,46 +130,6 @@ module GroupDocs
       @pages << page
     end
 
-    #
-    # Add job document datasource.
-    #
-    # @param [GroupDocs::DataSource] datasource
-    # @param [String] jobId Job identifier
-    # @param [String] fileId File identifier
-    # @param [String] datasourceId
-    # @param [Hash] access Access credentials
-    # @option access [String] :client_id
-    # @option access [String] :private_key
-    #
-    def self.add_datasource!(jobId, datasource, access = {})
-      json = Api::Request.new do |request|
-        request[:access] = access
-        request[:method] = :PUT
-        request[:path] = "/merge/{{client_id}}/jobs/#{jobId}/files/#{file.guid}/datasources/#{datasource.id}"
-      end.execute!
-
-      json[:datasource_id]
-    end
-
-    #
-    # Add job document datasource fields.
-    #
-    # @param [String] jobId Job identifier
-    # @param [String] fileId File identifier
-    # @param [Array] datasourceFields
-    # @param [Hash] access Access credentials
-    # @option access [String] :client_id
-    # @option access [String] :private_key
-    #
-    def self.add_datasource_fields!(jobId, fileId, datasourceFields, access = {})
-      Api::Request.new do |request|
-        request[:access] = access
-        request[:method] = :PUT
-        request[:path] = "/merge/{{client_id}}/jobs/#{jobId}/files/#{fileId}/datasources/"
-        request[:request_body] = datasourceFields
-      end.execute!
-
-    end
 
     #
     # Creates questionnaire.
@@ -263,20 +225,26 @@ module GroupDocs
       end
     end
 
-    #
+   #
     # Returns an array of questionnaire collectors.
     #
+    #
+    # @param [Hash] options Options
+    # @option options [String] :orderBy Order by column (required)
+    # @option options [Boolean] :isAsc Order by ascending or descending (required)
     # @param [Hash] access Access credentials
     # @option access [String] :client_id
     # @option access [String] :private_key
     # @return [Array<GroupDocs::Questionnaire::Collector>]
     #
-    def collectors!(access = {})
-      json = Api::Request.new do |request|
+    def collectors!(options = {}, access = {})
+      api = Api::Request.new do |request|
         request[:access] = access
         request[:method] = :GET
         request[:path] = "/merge/{{client_id}}/questionnaires/#{guid}/collectors"
-      end.execute!
+      end
+        api = add_params(options)
+        json = api.execute!
 
       json[:collectors].map do |collector|
         collector.merge!(:questionnaire => self)
@@ -349,6 +317,34 @@ module GroupDocs
         Document::Field.new(field)
       end
     end
+	
+	#
+    # Copy file to given path.
+    #
+    # @param [String] path (required)
+    # @param [String] mode Mode (optional)
+    # @param [Hash] options
+    # @option options [String] name
+    # @param [Hash] access Access credentials
+    # @option access [String] :client_id
+    # @option access [String] :private_key
+    # @return [Array] Templates
+    #
+    def copy_to_templates!(path, mode, options = {}, access = {})
+      options[:name] ||= name
+      path = prepare_path("#{path}/#{options[:name]}")
+
+      api = Api::Request.new do |request|
+        request[:access] = access
+        request[:method] = :PUT
+        request[:headers] = { :'Groupdocs-Copy' => id }
+        request[:path] = "/merge/{{client_id}}/files/#{path}"
+      end
+      api = add_params(:mode => mode)
+      json = api.execute!
+
+      json[:templates]
+    end
 
   end # Questionnaire
 end # GroupDocs