repository-manager 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf4767c19280879648bb81c83442854d471c7b8d
-  data.tar.gz: aa71d60c28c24053af0e19153b270f73554fc3f8
+  metadata.gz: 9a5f9e1303f1c190997c2c901c476fa08b2d910c
+  data.tar.gz: a5c56d387625acf0a20fd17132c5efa9e957229a
 SHA512:
-  metadata.gz: 665c150b8f12c7130c7027de8a590438e502465ea3b900872349a8cf89f66113062abecf8c0fc84043a82f6a0eeec5c8caaf7825d1b61818d29d435c73105ebb
-  data.tar.gz: fe0025b6ab497be34fca378e0bc62ad7b653b6b5ebc05781c2b441566048128e91f143a624c6e1d6efd0c208612d306bb44d89486bdf3580446ccc5e1985e2d9
+  metadata.gz: 0d73911fbb82113abd58dd547fcf29b8acdc287c590814157b2eae9804848282c7f4753a8921ef9f32a7f70e58134673ae33537bcf3c612cff7a09e67c516799
+  data.tar.gz: 18c2b1c8ff1197abce0b43ea492764911f5d3c054712ef0c4f666a68ba97fe036cf2d4fc151edabd0e37330f526c036c26c78985e34e017e486fe1d042b02d15

data/app/models/repository_manager/repo_file.rb

@@ -105,22 +105,23 @@ class RepositoryManager::RepoFile < RepositoryManager::RepoItem
           new_item.owner = owner
           new_item.sender = sender
           if path_array.empty?
-            new_item.move!(source_folder: options[:source_folder], owner: owner, overwrite: overwrite)
+            new_item.move!(source_folder: options[:source_folder], owner: owner, sender: sender, overwrite: overwrite)
           else
             # He specified a source_folder
             if options[:source_folder]
-              source_folder = options[:source_folder].get_or_create_by_path_array(path_array, owner: options[:owner], sender: options[:sender])
+              source_folder = options[:source_folder].get_or_create_by_path_array(path_array, owner: owner, sender: sender)
             else # No source folder specified
               # We have to check if we are in a folder
-              if parent = self.parent
+              parent = self.parent
+              if parent
                 # we unzip on this folder
-                source_folder = parent.get_or_create_by_path_array(path_array, owner: options[:owner], sender: options[:sender])
+                source_folder = parent.get_or_create_by_path_array(path_array, owner: owner, sender: sender)
               else
                 # We are in root
-                source_folder = owner.get_or_create_by_path_array(path_array, sender: options[:sender])
+                source_folder = owner.get_or_create_by_path_array(path_array, sender: sender)
               end
             end
-            new_item.move!(source_folder: source_folder, owner: owner, overwrite: overwrite)
+            new_item.move!(source_folder: source_folder, owner: owner, sender: sender, overwrite: overwrite)
           end
         else # it is a :file
           new_item = RepositoryManager::RepoFile.new
@@ -136,22 +137,23 @@ class RepositoryManager::RepoFile < RepositoryManager::RepoItem
 
 
           if path_array.empty?
-            new_item.move!(source_folder: options[:source_folder], owner: owner, overwrite: overwrite)
+            new_item.move!(source_folder: options[:source_folder], owner: owner, sender: sender, overwrite: overwrite)
           else
             # He specified a source_folder
             if options[:source_folder]
-              source_folder = options[:source_folder].get_or_create_by_path_array(path_array, owner: options[:owner], sender: options[:sender])
+              source_folder = options[:source_folder].get_or_create_by_path_array(path_array, owner: owner, sender: sender)
             else # No source folder specified
               # We have to check if we are in a folder
-              if parent = self.parent
+              parent = self.parent
+              if parent
                 # we unzip on this folder
-                source_folder = parent.get_or_create_by_path_array(path_array, owner: options[:owner], sender: options[:sender])
+                source_folder = parent.get_or_create_by_path_array(path_array, owner: owner, sender: sender)
               else
                 # We are in root
-                source_folder = owner.get_or_create_by_path_array(path_array, sender: options[:sender])
+                source_folder = owner.get_or_create_by_path_array(path_array, owner: owner, sender: sender)
               end
             end
-            new_item.move!(source_folder: source_folder, owner: owner, overwrite: overwrite)
+            new_item.move!(source_folder: source_folder, owner: owner, sender: sender, overwrite: overwrite)
           end
         end
       end

data/lib/repository_manager/has_repository.rb

@@ -458,7 +458,16 @@ module RepositoryManager
           repo_item.errors.add(:unzip, I18n.t('repository_manager.errors.repo_item.unzip.no_permission'))
           raise RepositoryManager::PermissionException.new("unzip repo_file failed. You don't have the permission to create in the source_folder '#{target.name}'")
         end
-        repo_item.unzip!(source_folder: target, sender: options[:sender], overwrite: options[:overwrite])
+
+        if !target
+          parent = repo_item.parent
+          if parent && !can_create?(parent)
+            repo_item.errors.add(:unzip, I18n.t('repository_manager.errors.repo_item.unzip.no_permission'))
+            raise RepositoryManager::PermissionException.new("unzip repo_file failed. You don't have the permission to create in the source_folder '#{parent.name}'")
+          end
+        end
+
+        repo_item.unzip!(source_folder: target, owner: self, sender: options[:sender], overwrite: options[:overwrite])
       end
 
       def unzip_repo_item(repo_item, options = {})

data/lib/repository_manager/version.rb

@@ -1,3 +1,3 @@
 module RepositoryManager
-  VERSION = '0.2.9'
+  VERSION = '0.2.10'
 end

data/spec/unzip_spec.rb

@@ -60,6 +60,18 @@ describe 'Unzip' do
     expect(@user2.unzip_repo_item(@zip_file)).to eq(false)
   end
 
-  # TODO test change owner and sender
-
+  it 'User can\'t unzip file without create permission' do
+    @user2 = FactoryGirl.create(:user)
+    #shared_folder = @user1.create_folder('Shared Folder')
+    @user1.move_repo_item!(@zip_file, source_folder: @user1.create_folder('Shared Folder'))
+    @user1.share_repo_item!(@zip_file, @user2, repo_item_permissions: {
+        can_read: true,
+        can_create: true,
+        can_update: true,
+        can_delete: false,
+        can_share: true
+    } )
+    # He can t unzip because he don't have the permission to create in shared folder
+    expect(@user2.unzip_repo_item(@zip_file)).to eq(false)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repository-manager
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Yves Baumann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails