groupdocs 0.2 → 0.2.1

data/lib/groupdocs/storage/folder.rb

@@ -2,8 +2,8 @@ module GroupDocs
   module Storage
     class Folder < GroupDocs::Api::Entity
 
-      extend GroupDocs::Api::Sugar::Lookup
-      include GroupDocs::Api::Helpers::Access
+      extend Extensions::Lookup
+      include Api::Helpers::AccessMode
 
       #
       # Creates folder on server.
@@ -14,18 +14,16 @@ module GroupDocs
       # @option access [String] :private_key
       # @return [GroupDocs::Storage::Folder] Created folder
       #
-      # @raise [ArgumentError] If path does not start with /
-      #
       def self.create!(path, access = {})
-        path.chars.first == '/' or raise ArgumentError, "Path should start with /: #{path.inspect}"
+        Api::Helpers::Path.verify_starts_with_root(path)
 
-        json = GroupDocs::Api::Request.new do |request|
+        json = Api::Request.new do |request|
           request[:access] = access
           request[:method] = :POST
           request[:path] = "/storage/{{client_id}}/paths#{path}"
         end.execute!
 
-        GroupDocs::Storage::Folder.new(json)
+        Storage::Folder.new(json)
       end
 
       #
@@ -64,10 +62,8 @@ module GroupDocs
       # @option access [String] :private_key
       # @return [Array<GroupDocs::Storage::Folder, GroupDocs::Storage::File>]
       #
-      # @raise [ArgumentError] If path does not start with /
-      #
       def self.list!(path = '/', options = {}, access = {})
-        path.chars.first == '/' or raise ArgumentError, "Path should start with /: #{path.inspect}"
+        Api::Helpers::Path.verify_starts_with_root(path)
         new(path: path).list!(options, access)
       end
 
@@ -132,12 +128,10 @@ module GroupDocs
       # @option access [String] :private_key
       # @return [String] Moved to folder path
       #
-      # @raise [ArgumentError] If path does not start with /
-      #
       def move!(path, access = {})
-        path.chars.first == '/' or raise ArgumentError, "Path should start with /: #{path.inspect}"
+        Api::Helpers::Path.verify_starts_with_root(path)
 
-        GroupDocs::Api::Request.new do |request|
+        Api::Request.new do |request|
           request[:access] = access
           request[:method] = :PUT
           request[:headers] = { :'Groupdocs-Move' => name }
@@ -169,12 +163,10 @@ module GroupDocs
       # @option access [String] :private_key
       # @return [String] Copied to folder path
       #
-      # @raise [ArgumentError] If path does not start with /
-      #
       def copy!(path, access = {})
-        path.chars.first == '/' or raise ArgumentError, "Path should start with /: #{path.inspect}"
+        Api::Helpers::Path.verify_starts_with_root(path)
 
-        GroupDocs::Api::Request.new do |request|
+        Api::Request.new do |request|
           request[:access] = access
           request[:method] = :PUT
           request[:headers] = { :'Groupdocs-Copy' => name }
@@ -200,7 +192,7 @@ module GroupDocs
       def list!(options = {}, access = {})
         options[:order_by].capitalize! if options[:order_by]
 
-        api = GroupDocs::Api::Request.new do |request|
+        api = Api::Request.new do |request|
           request[:access] = access
           request[:method] = :GET
           request[:path] = "/storage/{{client_id}}/folders#{path}/#{name}"
@@ -211,9 +203,9 @@ module GroupDocs
         json[:entities].map do |entity|
           entity.merge!(path: path)
           if entity[:dir]
-            GroupDocs::Storage::Folder.new(entity)
+            Storage::Folder.new(entity)
           else
-            GroupDocs::Storage::File.new(entity)
+            Storage::File.new(entity)
           end
         end
       end
@@ -237,7 +229,7 @@ module GroupDocs
       # @option access [String] :private_key
       #
       def delete!(access = {})
-        GroupDocs::Api::Request.new do |request|
+        Api::Request.new do |request|
           request[:access] = access
           request[:method] = :DELETE
           request[:path] = "/storage/{{client_id}}/folders/#{name}"
@@ -253,14 +245,14 @@ module GroupDocs
       # @return [Array<GroupDocs::User>]
       #
       def sharers!(access = {})
-        json = GroupDocs::Api::Request.new do |request|
+        json = Api::Request.new do |request|
           request[:access] = access
           request[:method] = :GET
           request[:path] = "/doc/{{client_id}}/folders/#{id}/sharers"
         end.execute!
 
         json[:shared_users].map do |user|
-          GroupDocs::User.new(user)
+          User.new(user)
         end
       end
 
@@ -279,7 +271,7 @@ module GroupDocs
         if emails.nil? || emails.empty?
           sharers_clear!(access)
         else
-          json = GroupDocs::Api::Request.new do |request|
+          json = Api::Request.new do |request|
             request[:access] = access
             request[:method] = :PUT
             request[:path] = "/doc/{{client_id}}/folders/#{id}/sharers"
@@ -287,7 +279,7 @@ module GroupDocs
           end.execute!
 
           json[:shared_users].map do |user|
-            GroupDocs::User.new(user)
+            User.new(user)
           end
         end
       end
@@ -301,7 +293,7 @@ module GroupDocs
       # @return nil
       #
       def sharers_clear!(access = {})
-        GroupDocs::Api::Request.new do |request|
+        Api::Request.new do |request|
           request[:access] = access
           request[:method] = :DELETE
           request[:path] = "/doc/{{client_id}}/folders/#{id}/sharers"

data/lib/groupdocs/storage/package.rb

@@ -27,7 +27,7 @@ module GroupDocs
       # @return [String] URL of package for downloading
       #
       def create!(access = {})
-        json = GroupDocs::Api::Request.new do |request|
+        json = Api::Request.new do |request|
           request[:access] = access
           request[:method] = :POST
           request[:path] = "/storage/{{client_id}}/packages/#{name}.zip"

data/lib/groupdocs/version.rb

@@ -1,3 +1,3 @@
 module GroupDocs
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end # GroupDocs

data/spec/groupdocs/api/helpers/access_mode_helper_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe GroupDocs::Api::Helpers::AccessMode do
+
+  subject do
+    GroupDocs::Storage::Folder.new
+  end
+
+  describe 'MODES' do
+    it 'contains hash of access modes' do
+      described_class::MODES.should == {
+        private:    0,
+        restricted: 1,
+        public:     2,
+      }
+    end
+  end
+
+  describe '#parse_access_mode' do
+    it 'raise error if mode is unknown' do
+      -> { subject.send(:parse_access_mode, 3)        }.should raise_error(ArgumentError)
+      -> { subject.send(:parse_access_mode, :unknown) }.should raise_error(ArgumentError)
+    end
+
+    it 'returns :private if passed mode is 0' do
+      subject.send(:parse_access_mode, 0).should == :private
+    end
+
+    it 'returns :restricted if passed mode is 1' do
+      subject.send(:parse_access_mode, 1).should == :restricted
+    end
+
+    it 'returns :public if passed mode is 2' do
+      subject.send(:parse_access_mode, 2).should == :public
+    end
+
+    it 'returns 0 if passed mode is :private' do
+      subject.send(:parse_access_mode, :private).should == 0
+    end
+
+    it 'returns 1 if passed mode is :restricted' do
+      subject.send(:parse_access_mode, :restricted).should == 1
+    end
+
+    it 'returns 2 if passed mode is :public' do
+      subject.send(:parse_access_mode, :public).should == 2
+    end
+  end
+end

data/spec/groupdocs/api/helpers/{access_helper_spec.rb → credentials_helpers_spec.rb}

@@ -1,21 +1,11 @@
 require 'spec_helper'
 
-describe GroupDocs::Api::Helpers::Access do
+describe GroupDocs::Api::Helpers::Credentials do
 
   subject do
     GroupDocs::Api::Request.new(method: :GET)
   end
 
-  describe 'MODES' do
-    it 'contains hash of access modes' do
-      described_class::MODES.should == {
-        private:    0,
-        restricted: 1,
-        public:     2,
-      }
-    end
-  end
-
   describe '#client_id' do
     it 'returns passed to method client ID' do
       subject.options[:access] = { client_id: 'method_client_id' }
@@ -55,35 +45,4 @@ describe GroupDocs::Api::Helpers::Access do
       -> { subject.send(:private_key) }.should raise_error(GroupDocs::NoPrivateKeyError)
     end
   end
-
-  describe '#parse_access_mode' do
-    it 'raise error if mode is unknown' do
-      -> { subject.send(:parse_access_mode, 3)        }.should raise_error(ArgumentError)
-      -> { subject.send(:parse_access_mode, :unknown) }.should raise_error(ArgumentError)
-    end
-
-    it 'returns :private if passed mode is 0' do
-      subject.send(:parse_access_mode, 0).should == :private
-    end
-
-    it 'returns :restricted if passed mode is 1' do
-      subject.send(:parse_access_mode, 1).should == :restricted
-    end
-
-    it 'returns :public if passed mode is 2' do
-      subject.send(:parse_access_mode, 2).should == :public
-    end
-
-    it 'returns 0 if passed mode is :private' do
-      subject.send(:parse_access_mode, :private).should == 0
-    end
-
-    it 'returns 1 if passed mode is :restricted' do
-      subject.send(:parse_access_mode, :restricted).should == 1
-    end
-
-    it 'returns 2 if passed mode is :public' do
-      subject.send(:parse_access_mode, :public).should == 2
-    end
-  end
 end

data/spec/groupdocs/api/helpers/path_helper_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe GroupDocs::Api::Helpers::Path do
+
+  describe '.verify_starts_with_root' do
+    it 'does not raise error if path starts with /' do
+      -> { described_class.verify_starts_with_root('/Test') }.should_not raise_error(ArgumentError)
+    end
+
+    it 'raises error if path does not start with /' do
+      -> { described_class.verify_starts_with_root('Test') }.should raise_error(ArgumentError)
+    end
+  end
+
+  describe '.append_file_name' do
+    it 'does not change path if filename is present' do
+      path = '/upload_path/test.pdf'
+      described_class.append_file_name(path, __FILE__)
+      path.should == '/upload_path/test.pdf'
+    end
+
+    it 'appends filename to path if it is not passed' do
+      path = '/upload_path'
+      described_class.append_file_name(path, __FILE__)
+      path.should == "/upload_path/#{File.basename(__FILE__)}"
+    end
+  end
+end

data/spec/groupdocs/document_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe GroupDocs::Document do
 
   it_behaves_like GroupDocs::Api::Entity
-  include_examples GroupDocs::Api::Sugar::Lookup
+  include_examples GroupDocs::Extensions::Lookup
   include_examples GroupDocs::Api::Helpers::Status
 
   subject do

data/spec/groupdocs/storage/file_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe GroupDocs::Storage::File do
 
   it_behaves_like GroupDocs::Api::Entity
-  include_examples GroupDocs::Api::Sugar::Lookup
+  include_examples GroupDocs::Extensions::Lookup
+  include_examples GroupDocs::Api::Helpers::AccessMode
 
   describe 'DOCUMENT_TYPES' do
     it 'contains hash of document types' do
@@ -30,14 +31,14 @@ describe GroupDocs::Storage::File do
       end.should_not raise_error(ArgumentError)
     end
 
-    it 'raises error if upload path does not start with /' do
-      -> { described_class.upload!('test', 'upload_path') }.should raise_error(ArgumentError)
+    it 'checks that upload path starts with /' do
+      GroupDocs::Api::Helpers::Path.should_receive(:verify_starts_with_root).with('/upload_path')
+      described_class.upload!(__FILE__, '/upload_path')
     end
 
     it 'appends filename to upload path if it is not passed' do
-      upload_path = '/upload_path'
-      upload_path.should_receive(:<<).with("/#{File.basename(__FILE__)}")
-      described_class.upload!(__FILE__, upload_path)
+      GroupDocs::Api::Helpers::Path.should_receive(:append_file_name).with('/upload_path', __FILE__)
+      described_class.upload!(__FILE__, '/upload_path')
     end
 
     it 'returns GroupDocs::Storage::File object' do
@@ -69,8 +70,6 @@ describe GroupDocs::Storage::File do
   it { should respond_to(:type=)        }
   it { should respond_to(:file_type)    }
   it { should respond_to(:file_type=)   }
-  it { should respond_to(:access)       }
-  it { should respond_to(:access=)      }
   it { should respond_to(:path)         }
   it { should respond_to(:path=)        }
 
@@ -153,8 +152,14 @@ describe GroupDocs::Storage::File do
       end.should_not raise_error(ArgumentError)
     end
 
-    it 'raises error if path does not start with /' do
-      -> { subject.move!('resume2.pdf') }.should raise_error(ArgumentError)
+    it 'checks that path starts with /' do
+      GroupDocs::Api::Helpers::Path.should_receive(:verify_starts_with_root).with('/resume.pdf')
+      subject.move!('/resume.pdf')
+    end
+
+    it 'appends filename to move to path if it is not passed' do
+      GroupDocs::Api::Helpers::Path.should_receive(:append_file_name).with('/Folder', subject.name)
+      subject.move!('/Folder')
     end
 
     it 'sends "Groupdocs-Move" header' do
@@ -166,14 +171,6 @@ describe GroupDocs::Storage::File do
     it 'returns moved to file' do
       subject.move!('/resume2.pdf').should be_a(GroupDocs::Storage::File)
     end
-
-    it 'appends filename to move to path if it is not passed' do
-      path = '/Folder'
-      name = File.basename(__FILE__)
-      subject.stub(name: name)
-      path.should_receive(:<<).with("/#{name}")
-      subject.move!(path)
-    end
   end
 
   describe '#rename!' do
@@ -204,8 +201,14 @@ describe GroupDocs::Storage::File do
       end.should_not raise_error(ArgumentError)
     end
 
-    it 'raises error if path does not start with /' do
-      -> { subject.copy!('resume2.pdf') }.should raise_error(ArgumentError)
+    it 'checks that path starts with /' do
+      GroupDocs::Api::Helpers::Path.should_receive(:verify_starts_with_root).with('resume.pdf')
+      subject.copy!('resume.pdf')
+    end
+
+    it 'appends filename to move to path if it is not passed' do
+      GroupDocs::Api::Helpers::Path.should_receive(:append_file_name).with('/Folder', subject.name)
+      subject.copy!('/Folder')
     end
 
     it 'sends "Groupdocs-Copy" header' do
@@ -217,14 +220,6 @@ describe GroupDocs::Storage::File do
     it 'returns copied to file' do
       subject.copy!('/resume2.pdf').should be_a(GroupDocs::Storage::File)
     end
-
-    it 'appends filename to copy to path if it is not passed' do
-      path = '/Folder'
-      name = File.basename(__FILE__)
-      subject.stub(name: name)
-      path.should_receive(:<<).with("/#{name}")
-      subject.copy!(path)
-    end
   end
 
   describe '#compress!' do

data/spec/groupdocs/storage/folder_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe GroupDocs::Storage::Folder do
 
   it_behaves_like GroupDocs::Api::Entity
-  include_examples GroupDocs::Api::Sugar::Lookup
+  include_examples GroupDocs::Extensions::Lookup
+  include_examples GroupDocs::Api::Helpers::AccessMode
 
   describe '.create!' do
     before(:each) do
@@ -16,8 +17,9 @@ describe GroupDocs::Storage::Folder do
       end.should_not raise_error(ArgumentError)
     end
 
-    it 'raises error if path does not start with /' do
-      -> { described_class.create!('Test') }.should raise_error(ArgumentError)
+    it 'checks that path starts with /' do
+      GroupDocs::Api::Helpers::Path.should_receive(:verify_starts_with_root).with('Test')
+      described_class.create!('Test')
     end
 
     it 'returns GroupDocs::Storage::Folder object' do
@@ -74,8 +76,6 @@ describe GroupDocs::Storage::Folder do
   it { should respond_to(:version=)      }
   it { should respond_to(:type)          }
   it { should respond_to(:type=)         }
-  it { should respond_to(:access)        }
-  it { should respond_to(:access=)       }
 
   describe '#created_on' do
     it 'returns converted to Time object Unix timestamp' do
@@ -91,23 +91,20 @@ describe GroupDocs::Storage::Folder do
     end
   end
 
-  describe '#access' do
-    it 'returns converted to human-readable format access mode' do
-      subject.should_receive(:parse_access_mode).with(0).and_return(:private)
-      subject.access = 0
-      subject.access.should == :private
+  describe '#move!' do
+    before(:each) do
+      mock_api_server(load_json('folder_move'))
     end
-  end
 
-  describe '#move!' do
     it 'accepts access credentials hash' do
       lambda do
         subject.move!('/Test', client_id: 'client_id', private_key: 'private_key')
       end.should_not raise_error(ArgumentError)
     end
 
-    it 'raises error if path does not start with /' do
-      -> { subject.move!('Test2') }.should raise_error(ArgumentError)
+    it 'checks that path starts with /' do
+      GroupDocs::Api::Helpers::Path.should_receive(:verify_starts_with_root).with('Test1')
+      subject.move!('Test1')
     end
 
     it 'sends "Groupdocs-Move" header' do
@@ -117,7 +114,6 @@ describe GroupDocs::Storage::Folder do
     end
 
     it 'returns moved to folder path' do
-      mock_api_server(load_json('folder_move'))
       moved = subject.move!('/Test2')
       moved.should be_a(String)
       moved.should == '/Test2'
@@ -145,14 +141,19 @@ describe GroupDocs::Storage::Folder do
   end
 
   describe '#copy!' do
+    before(:each) do
+      mock_api_server(load_json('folder_move'))
+    end
+
     it 'accepts access credentials hash' do
       lambda do
         subject.copy!('/Test2', client_id: 'client_id', private_key: 'private_key')
       end.should_not raise_error(ArgumentError)
     end
 
-    it 'raises error if path does not start with /' do
-      -> { subject.copy!('Test2') }.should raise_error(ArgumentError)
+    it 'checks that path starts with /' do
+      GroupDocs::Api::Helpers::Path.should_receive(:verify_starts_with_root).with('Test2')
+      subject.copy!('Test2')
     end
 
     it 'sends "Groupdocs-Copy" header' do
@@ -162,7 +163,6 @@ describe GroupDocs::Storage::Folder do
     end
 
     it 'returns moved to folder path' do
-      mock_api_server(load_json('folder_move'))
       moved = subject.copy!('/Test2')
       moved.should be_a(String)
       moved.should == '/Test2'