groupdocs 1.2.0 → 1.2.1

data/examples/api-samples/Gemfile

@@ -1,5 +1,5 @@
 source :rubygems
 
 gem 'sinatra'
-gem 'groupdocs', :git => 'git://github.com/p0deje/groupdocs-ruby.git'
+gem 'groupdocs', "1.2"
 gem 'haml'

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

@@ -1,3 +1,35 @@
 get '/sample6' do
   haml :sample6
 end
+
+post '/sample6' do
+  set :client_id, params[:client_id]
+  set :private_key, params[:private_key]
+   
+  begin
+    raise "Please enter all required parameters" if settings.client_id.empty? or settings.private_key.empty?
+
+	file_one_path = "#{Dir.tmpdir}/#{params[:document][:filename]}"
+    File.open(file_one_path, 'wb') { |f| f.write(params[:document][:tempfile].read) }
+
+    
+	file_one = GroupDocs::Storage::File.new(name: params[:document][:filename], local_path: file_one_path)
+    document_one = file_one.to_document
+
+	signature_one_path = "#{Dir.tmpdir}/#{params[:signature][:filename]}"
+    File.open(signature_one_path, 'wb') { |f| f.write(params[:signature][:tempfile].read) }
+
+    signature_one = GroupDocs::Signature.new(name: 'Test', image_path: signature_one_path)
+    signature_one.position = { top: 0.1, left: 0.07, width: 50, height: 50}
+
+    signed_documents = GroupDocs::Document.sign_documents!([document_one], [signature_one], {}, { :client_id => settings.client_id, :private_key => settings.private_key })
+    if signed_documents
+    	iframe = "<iframe src='https://apps.groupdocs.com/document-viewer/Embed/#{signed_documents}' frameborder='0' width='720' height='600'></iframe>"
+    end
+  rescue Exception => e
+  	pp e
+    err = e.message
+  end
+
+  haml :sample6, :locals => { :userId => settings.client_id, :privateKey => settings.private_key, :iframe => iframe, :err => err }
+end

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

@@ -1,41 +1,47 @@
-%script{:src => "http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js", :type => "text/javascript"}
-%script{:src => "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js", :type => "text/javascript"}
-%script{:src => "http://dev-apps.groupdocs.com/content/signaturewidgets/groupdocs.sign.js", :type => "text/javascript"}
-
 %h3{:style => "text-align:center;"}
   %a{:href => "/"} GroupDocs Ruby SDK Samples
   \- Sample6
 .samplecontent{:style => "padding:10px;"}
   %i This sample will show how to add provided signature to provided document using Ruby SDK. Signed file will be uploaded to GroupDocs account and its GUID will be returned and embed into webpage with GroupDocs Ebedded Viewer.
   %br/
+  %br/
+  %p
+    You entered:
+  %p
+    UserId = #{(defined? userId) ? userId : ""}
+  %p
+    PrivateKey = #{(defined? privateKey) ? privateKey : ""}
+  %p
+    %font{:color => "red"} #{(defined? err) ? err : ""}
   #files_form
-    %form{:action => "#", :onsubmit => "return false;"}
+    %form{:action => "/sample6", :enctype => "multipart/form-data", :method => "post"}
       %br/
       %label{:for => "client_id"} GroupDocs ClientID
       %br/
-      %input{:type=>'text', :id=>'client_id'}
+      %input{:type=>'text', :id=>'client_id', :name => "client_id"}
       %br/
       %label{:for => "private_key"} GroupDocs PrivateKey
       %br/
-      %input{:type=>'text', :id=>'private_key'}
+      %input{:type=>'text', :id=>'private_key', :name => "private_key"}
       %br/
       %label{:for => "file_document"} Document to sign
       %br/
-      %input#fi_document{:type => "file"}/
+      %input#fi_document{:type => "file", :name => "document"}/
       %br/
       %label{:for => "file_signature"} Signature
       %br/
-      %input#fi_signature{:type => "file"}/
+      %input#fi_signature{:type => "file", :name => "signature"}/
       %br/
       %br/
-      %input#btnLoad{:onclick => "load();", :type => "button", :value => "Upload and sign the document"}
+      %input{:type => "submit", :value => "Upload and sign the document"}/
       %br/
       %br/
   %div{:style => "padding:20px; border:1px solid black;"}
     %p
       Results:
       %span#results_status{:style => "color:red;display:none;"} (Please wait for ajax response)
-    %iframe#viewer{:frameborder => "0", :height => "500", :src => "", :width => "600"}
+    #{(defined? iframe) ? iframe : ""}
+    
 %div{:style => "padding:10px;"}
   Choose another one sample:
   %ul
@@ -58,88 +64,4 @@
     %li
       %a{:href => "/sample9"} Sample9 - How to generate an embedded Viewer URL for a Document
     %li
-      %a{:href => "/sample10"} Sample10 - How to share a document to other users
-:javascript
-  function load() {
-      var inputDocument, inputSignature, fileDocument, fileSignature, frDocument, frSignature;
-
-      if (typeof window.FileReader !== 'function') {
-          $("body").append("p", "The file API isn't supported on this browser yet.");
-          return;
-      }
-
-      inputDocument = document.getElementById('fi_document');
-      if (!inputDocument) {
-          $("body").append("p", "Um, couldn't find the fileinput element.");
-      }
-      else if (!inputDocument.files) {
-          $("body").append("p", "This browser doesn't seem to support the `files` property of file inputs.");
-      }
-      else if (!inputDocument.files[0]) {
-          $("#files_form").append("Please select a file before clicking 'Load'");
-      }
-      else {
-          $('#results_status').fadeIn("slow");
-          $('#sample6').fadeOut("slow");
-
-          fileDocument = inputDocument.files[0];
-          frDocument = new FileReader();
-          frDocument.onload = receivedDocument;
-          frDocument.readAsDataURL(fileDocument);
-      }
-
-      function receivedDocument() {
-
-          inputSignature = document.getElementById('fi_signature');
-          if (!inputSignature) {
-              $("body").append("Um, couldn't find the fileinput element.");
-          }
-          else if (!inputSignature.files) {
-              $("body").append("p", "This browser doesn't seem to support the `files` property of file inputs.");
-          }
-          else if (!inputSignature.files[0]) {
-              $("body").append("Please select a file before clicking 'Load'");
-          }
-          else {
-              fileSignature = inputSignature.files[0];
-              frSignature = new FileReader();
-              frSignature.onload = receivedSignature;
-              frSignature.readAsDataURL(fileSignature);
-          }
-      }
-
-      function receivedSignature() {
-          var span = document.createElement('span');
-          span.innerHTML = [''].join('');
-          signDocument();
-      }
-
-      function signDocument() {
-          $("body").sign({
-              userId: $('#client_id').val(),
-              privateKey: $('#private_key').val(),
-              signMethod: "/sample6",
-              onerr: function (e, data) {
-                  alert(data);
-              },
-              onSigned: function (e, data) {
-                  $("#viewer").attr("src", "https://apps.groupdocs.com/document-viewer/Embed/" + data.documentId);
-                  $('#results_status').fadeOut("slow");
-                  $('#viewer').fadeIn("slow");
-              }
-          });
-          $("body").sign("addDocument", {
-              name: fileDocument.name,
-              data: frDocument.result
-          });
-          $("body").sign("addSigner", {
-              name: 'Marketplace Team',
-              top: 0.03319,
-              left: 0.52171,
-              width: 100,
-              height: 40,
-              data: frSignature.result
-          });
-          $("body").sign("sign");
-      }
-  }
+      %a{:href => "/sample10"} Sample10 - How to share a document to other users

data/lib/groupdocs/api/request.rb

@@ -41,6 +41,22 @@ module GroupDocs
         @resource = RestClient::Resource.new(GroupDocs.api_server)
       end
 
+      #
+      # Prepares, signs and returns absolute URL.
+      # @return [String]
+      #
+      def prepare_and_sign_url
+        unless @signed
+          parse_path
+          prepend_version
+          url_encode_path
+          sign_url
+          @signed = true
+        end
+
+        "%s%s" % [GroupDocs.api_server, options[:path]]
+      end
+
       #
       # Executes API request to server.
       #
@@ -56,10 +72,7 @@ module GroupDocs
       # @return [Hash, String] Parsed response
       #
       def execute!
-        parse_path
-        prepend_version
-        url_encode_path
-        sign_url
+        prepare_and_sign_url
         prepare_request
         send_request
         parse_response

data/lib/groupdocs/version.rb

@@ -1,3 +1,3 @@
 module GroupDocs
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end # GroupDocs

data/spec/groupdocs/api/request_spec.rb

@@ -35,32 +35,47 @@ describe GroupDocs::Api::Request do
     end
   end
 
-  describe '#execute!' do
-    before(:each) do
-      GroupDocs.stub(private_key: 'private_key')
-      subject.options[:method]  = :get
-      subject.options[:path]    = '/folders'
-      subject.options[:headers] = {}
-      mock_api_server('{"status":"Ok"}')
-    end
-
+  describe '#prepare_and_sign_url' do
     it 'parses path' do
       subject.should_receive(:parse_path)
-      subject.execute!
+      subject.prepare_and_sign_url
     end
 
     it 'prepends path with version' do
       subject.should_receive(:prepend_version)
-      subject.execute!
+      subject.prepare_and_sign_url
     end
 
     it 'URL encodes path' do
       subject.should_receive(:url_encode_path)
-      subject.execute!
+      subject.prepare_and_sign_url
     end
 
     it 'signs url' do
       subject.should_receive(:sign_url)
+      subject.prepare_and_sign_url
+    end
+
+    it 'returns prepared and signed url' do
+      subject.prepare_and_sign_url.should be_a(String)
+    end
+
+    it 'does nothing if url is already signed' do
+      subject.prepare_and_sign_url.should == subject.prepare_and_sign_url
+    end
+  end
+
+  describe '#execute!' do
+    before(:each) do
+      GroupDocs.stub(private_key: 'private_key')
+      subject.options[:method]  = :get
+      subject.options[:path]    = '/folders'
+      subject.options[:headers] = {}
+      mock_api_server('{"status":"Ok"}')
+    end
+
+    it 'prepares and signs url' do
+      subject.should_receive(:prepare_and_sign_url)
       subject.execute!
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groupdocs
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -168,7 +168,6 @@ files:
 - Rakefile
 - examples/README.md
 - examples/api-samples/Gemfile
-- examples/api-samples/Gemfile.lock
 - examples/api-samples/README.md
 - examples/api-samples/app.rb
 - examples/api-samples/public/css/style.css
@@ -423,7 +422,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3978014780066540379
+      hash: -2334837121037252250
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -432,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3978014780066540379
+      hash: -2334837121037252250
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/examples/api-samples/Gemfile.lock

@@ -1,27 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    groupdocs (1.1.0)
-      json (~> 1.7)
-      rest-client (~> 1.6)
-    haml (3.1.7)
-    json (1.7.5)
-    mime-types (1.19)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  groupdocs
-  haml
-  sinatra