groupdocs 1.5.0 → 1.5.1

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

@@ -1,90 +1,74 @@
-%h3{:style => "text-align:center;"}
-  %a{:href => "/"} GroupDocs Ruby SDK Samples
+%h3{:style => 'text-align:center;'}
+  %a{:href => '/'} GroupDocs Ruby SDK Samples
   \- Sample9
-.samplecontent{:style => "padding:10px;"}
+.samplecontent{:style => 'padding:10px;'}
   %i This sample will show how to generate an embedded Viewer URL for particular Document in the GroupDocs account using Ruby SDK
   %br/
   %i You can find documentation for this sample 
-  %a{:href => "/docs/sample9.html"} here
+  %a{:href => '/docs/sample9.html'} here
   %br/
   %br/
   %p
     You entered:
   %p
-    File GUID = #{(defined? guid) ? guid : ""}
+    File GUID = #{(defined? guid) ? guid : ''}
   %p
-    Height = #{(defined? height) ? height : ""}
+    Height = #{(defined? height) ? height : ''}
   %p
-    Width = #{(defined? width) ? width : ""}
+    Width = #{(defined? width) ? width : ''}
   %p
-    Viewer URL = #{(defined? v_url) ? v_url : ""}
+    Viewer URL = #{(defined? v_url) ? v_url : ''}
   %p
-    %font{:color => "red"} #{(defined? err) ? err : ""}
-  #requestForm{:style => "padding:20px; border:1px solid black;"}
+    %font{:color => 'red'} #{(defined? err) ? err : ''}
+  #requestForm{:style => 'padding:20px; border:1px solid black;'}
     %p Enter data for request and press "Make request" button
-    %form{:action => "/sample9", :enctype => "multipart/form-data", :method => "post"}
-      %label{:for => "private_key"} GroupDocs File GUID
+    %form{:action => '/sample9', :enctype => 'multipart/form-data', :method => 'post'}
+      %div.guid_radio
+        %input{:type=>'radio', :name=>'source', :value=>'guid', :checked=>'checked'} File ID (GUID)
+        %br/
+        %input{:type=>'radio', :name=>'source', :value=>'local'}Upload local file
+        %br/
+        %input{:type=>'radio', :name=>'source', :value=>'url'} Upload file from URL
+        %br/
+
+      %div.guid_field
+        %label{:for=>'fileId', :id=>'guid'} File ID (GUID)
+        %br/
+        %input{:type=>'text', :name=>'fileId'}
+        
+      %div.guid_field{:style=>'display:none;'}
+        %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/
-      %input{:type=>"text", :name=>"guid"}
+      %label{:for => 'private_key'} Width
       %br/
-      %label{:for => "private_key"} Width
+      %input{:type=>'text', :name=>'width'}
       %br/
-      %input{:type=>"text", :name=>"width"}
+      %label{:for => 'private_key'} Height
       %br/
-      %label{:for => "private_key"} Height
+      %input{:type=>'text', :name=>'height'}
       %br/
-      %input{:type=>"text", :name=>"height"}
-      %br/
-      %input{:type => "submit", :value => "Make Request"}/
-  %div{:style => "padding:20px; border:1px solid black;"}
-    %iframe{:src => "#{(defined? v_url) ? v_url : ""}", :width=> "#{(defined? width) ? width : ""}", :height=>"#{(defined? height) ? height : ""}"}
+      %input{:type => 'submit', :value => 'Make Request'}/
+  %div{:style => 'padding:20px; border:1px solid black;'}
+    %iframe{:src => "#{(defined? v_url) ? v_url : ''}", :width=> "#{(defined? width) ? width : ''}", :height=>"#{(defined? height) ? height : ''}"}
   %br/
-%div{:style => "padding:10px;"}
-  Choose another one sample:
-  %ul
-    %li
-      %a{:href => "/sample1"} Sample1 - How to login to GroupDocs using the API
-    %li
-      %a{:href => "/sample2"} Sample2 - How to list files within GroupDocs Storage using the Storage API
-    %li
-      %a{:href => "/sample3"} Sample3 - How to upload a file to GroupDocs using the Storage API
-    %li
-      %a{:href => "/sample4"} Sample4 - How to download a file from GroupDocs Storage using the Storage API
-    %li
-      %a{:href => "/sample5"} Sample5 - How to copy / move a file using the GroupDocs Storage API
-    %li
-      %a{:href => "/sample6"} Sample6 - How to add a Signature to a document in GroupDocs Signature
-    %li
-      %a{:href => "/sample7"} Sample7 - How to create a list of thumbnails for a document
-    %li
-      %a{:href => "/sample8"} Sample8 - How to return a URL representing a single page of a Document
-    %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
-    %li
-      %a{:href => "/sample11"}Sample11 - How programmatically create and post an annotation into document. How to delete the annotation
-    %li
-      %a{:href => "/sample12"}Sample12 - How to list all annotations from document
-    %li
-      %a{:href => "/sample13"}Sample13 - How to add collaborator to doc with annotations
-    %li
-      %a{:href => "/sample14"}Sample14 - How to check the list of shares for a folder
-    %li
-      %a{:href => "/sample15"}Sample15 - How to check the number of document's views
-    %li
-      %a{:href => "/sample16"}Sample16 - How to insert Assembly questionary into webpage
-    %li
-      %a{:href => "/sample17"}Sample17 - How to upload a file into the storage and compress it into zip archive
-    %li
-      %a{:href => "/sample18"}Sample18 - How to convert Doc to Docx, Docx to Doc, Docx to PDF, PPT to PDF
-    %li
-      %a{:href => "/sample19"}Sample19 - How to Compare documents using Ruby SDK
-    %li
-      %a{:href => "/sample20"}Sample20 - How to Get Compare Change list for document using Ruby SDK
-    %li
-      %a{:href => "/sample21"}Sample21 - How to Create and Upload Envelop to GroupDocs account using Ruby SDK
-    %li
-      %a{:href => "/sample22"}Sample22 - How create or update user and add him to collaborators using PHP SDK
-    %li
-      %a{:href => "/envelope-sample"}Envelope sample - How to use envelope and signature API
+
+= 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/examples/api-samples/web.rb

@@ -0,0 +1,20 @@
+require 'sinatra'
+require 'groupdocs'
+require 'haml'
+require 'pp'
+
+GroupDocs.api_version = '2.0'
+
+get '/' do
+  haml :index
+end
+
+get '/style.css' do
+  sass :style
+end
+
+Dir['samples/*.rb'].each {|file| require_relative file }
+
+def partial(page, options={})
+  haml page, options.merge!(:layout => false)
+end

data/lib/groupdocs/api/request.rb

@@ -30,7 +30,8 @@ module GroupDocs
       # @option options [Hash] :headers Additional HTTP headers
       # @option options [Hash] :access Access credentials hash
       # @option options [Hash, String, Array, File] :request_body payload
-      # @option options [Boolean] :plain Send payload as plain text (i.e. do not convert to JSON)
+      # @option options [Boolean] :plain Send payload as plain text (i.e. do not convert to JSON). Defaults to false.
+      # @option options [Boolean] :sign Should URL be signed. Defaults to true.
       #
       # @yieldparam [Hash] options
       #
@@ -38,6 +39,7 @@ module GroupDocs
         @options = options
         yield @options if block_given?
         @options[:access] ||= {}
+        @options[:sign] = true if @options[:sign].nil?
         @resource = RestClient::Resource.new(GroupDocs.api_server)
       end
 
@@ -55,7 +57,7 @@ module GroupDocs
         unless @signed
           parse_path
           url_encode_path
-          sign_url
+          sign_url if @options[:sign]
           @signed = true
         end
 

data/lib/groupdocs/version.rb

@@ -1,3 +1,3 @@
 module GroupDocs
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end # GroupDocs

data/spec/groupdocs/api/request_spec.rb

@@ -16,11 +16,13 @@ describe GroupDocs::Api::Request do
     end
 
     it 'allows passing block to configure options' do
-      described_class.new do |request|
+      api = described_class.new do |request|
         request[:access] = { :client_id => 'client_id', :private_key => 'private_key' }
         request[:method] = :GET
         request[:path] = '/folders'
-      end.options.should == { :method => :GET, :path => '/folders', :access => { :client_id => 'client_id', :private_key => 'private_key' }}
+        request[:sign] = false
+      end
+      api.options.should == { :method => :GET, :path => '/folders', :sign => false, :access => { :client_id => 'client_id', :private_key => 'private_key' }}
     end
 
     it 'sets access hash to empty if it was not passed' do
@@ -46,6 +48,12 @@ describe GroupDocs::Api::Request do
       subject.prepare_and_sign_url
     end
 
+    it 'does not sign url if sign options is passed' do
+      subject.options[:sign] = false
+      subject.should_not_receive(:sign_url)
+      subject.prepare_and_sign_url
+    end
+
     it 'signs url' do
       subject.should_receive(:sign_url)
       subject.prepare_and_sign_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groupdocs
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -185,9 +185,9 @@ files:
 - examples/README.md
 - examples/api-samples/Gemfile
 - examples/api-samples/README.md
-- examples/api-samples/app.rb
 - examples/api-samples/public/GroupDocs_Signature_Demo.pdf
 - examples/api-samples/public/css/style.css
+- examples/api-samples/public/docs/annotation-sample.html
 - examples/api-samples/public/docs/docco.css
 - examples/api-samples/public/docs/envelope-sample.html
 - examples/api-samples/public/docs/sample1.html
@@ -200,7 +200,11 @@ files:
 - examples/api-samples/public/docs/sample16.html
 - examples/api-samples/public/docs/sample17.html
 - examples/api-samples/public/docs/sample18.html
+- examples/api-samples/public/docs/sample19.html
 - examples/api-samples/public/docs/sample2.html
+- examples/api-samples/public/docs/sample20.html
+- examples/api-samples/public/docs/sample21.html
+- examples/api-samples/public/docs/sample22.html
 - examples/api-samples/public/docs/sample3.html
 - examples/api-samples/public/docs/sample4.html
 - examples/api-samples/public/docs/sample5.html
@@ -211,6 +215,7 @@ files:
 - examples/api-samples/public/images/help.png
 - examples/api-samples/public/images/info.png
 - examples/api-samples/public/templates/base-simple_source.html
+- examples/api-samples/public/templates/merge_feid_doc.docx
 - examples/api-samples/public/templates/testdocument.html
 - examples/api-samples/public/templates/welcome.htm
 - examples/api-samples/samples/annotation-sample.rb
@@ -230,6 +235,9 @@ files:
 - examples/api-samples/samples/sample20.rb
 - examples/api-samples/samples/sample21.rb
 - examples/api-samples/samples/sample22.rb
+- examples/api-samples/samples/sample23.rb
+- examples/api-samples/samples/sample24.rb
+- examples/api-samples/samples/sample25.rb
 - examples/api-samples/samples/sample3.rb
 - examples/api-samples/samples/sample4.rb
 - examples/api-samples/samples/sample5.rb
@@ -237,6 +245,7 @@ files:
 - examples/api-samples/samples/sample7.rb
 - examples/api-samples/samples/sample8.rb
 - examples/api-samples/samples/sample9.rb
+- examples/api-samples/views/_others_samples.haml
 - examples/api-samples/views/annotation_sample.haml
 - examples/api-samples/views/envelope_sample.haml
 - examples/api-samples/views/index.haml
@@ -256,6 +265,9 @@ files:
 - examples/api-samples/views/sample20.haml
 - examples/api-samples/views/sample21.haml
 - examples/api-samples/views/sample22.haml
+- examples/api-samples/views/sample23.haml
+- examples/api-samples/views/sample24.haml
+- examples/api-samples/views/sample25.haml
 - examples/api-samples/views/sample3.haml
 - examples/api-samples/views/sample4.haml
 - examples/api-samples/views/sample5.haml
@@ -263,6 +275,7 @@ files:
 - examples/api-samples/views/sample7.haml
 - examples/api-samples/views/sample8.haml
 - examples/api-samples/views/sample9.haml
+- examples/api-samples/web.rb
 - examples/viewer/Gemfile
 - examples/viewer/app.rb
 - groupdocs.gemspec
@@ -501,7 +514,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2302864106414593407
+      hash: -2320270531511539670
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -510,7 +523,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2302864106414593407
+      hash: -2320270531511539670
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/examples/api-samples/app.rb

@@ -1,15 +0,0 @@
-require 'sinatra'
-require 'groupdocs'
-require 'haml'
-require 'pp'
-
-get '/' do
-  haml :index
-end
-
-get '/style.css' do
-  sass :style
-end
-
-Dir["samples/*.rb"].each {|file| require_relative file }
-