repository-manager 0.1.21 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 039847f7aefc14428ba9580ac69fa2421aaf9c2f
-  data.tar.gz: 42f647e14302c8845cbb609db5f09259fdf9fbf9
+  metadata.gz: 3143ce6c4c30c092465f7df4d8a6d034af441c20
+  data.tar.gz: e8312b152f841ae69fcd5edb97e72d403c00b502
 SHA512:
-  metadata.gz: 4d02cf94ea13082dd65ecdf3f682bbb46871a6404d651c3365ac152f5a01d2ef417951ee7e38175e38be922d074ffafed8831a33bfb58fd728c98b331382eb85
-  data.tar.gz: 73490b6e53f03bbd7951e776988bcff2a1c77b2da222737aebc3f8ddbd97d364695905e023d83fa6cc5c3cda947700f0b5421ec6ef70d3eabdd808dece77aaf7
+  metadata.gz: cadd9617228aca58a60b5eaf42d2adc4407d845e67dde41e689f2d8fc9c5b9cd8090d5804e20320d7b2cf5dbaadebd8961749c2a59e0c8308c8670f3be8b6a89
+  data.tar.gz: c9d6f0071279a2c4dd565bc43176502e7fb98b8b2e1cdfbe5420d140495745f765692691341b02ad555b0aa999efc9ac33266abcc8e46ee36244e3f9b8b2a00a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    repository-manager (0.1.20)
+    repository-manager (0.1.23)
       ancestry
       carrierwave (>= 0.5.8)
       rails (> 3.0.0)

data/README.md

@@ -227,7 +227,7 @@ file.sender # Returns user1
 
 ```
 
-WARNING : There is no verification if the user has the permission to create a file or folder into this group. You have to check this in your controller ! The fact that user1 is the sender of this folder gives him NO AUTHORISATION on it !
+WARNING : There is no verification if the user1 has the permission to create a file or folder into this group. You have to check this in your controller ! The fact that user1 is the sender of this folder gives him NO PERMISSION on it !
 
 ### How can I share a repo_item (file/folder)
 
@@ -456,7 +456,6 @@ the_folder.delete_zip
 ## TODO
 
 - Do the rename file method
-- Configure path to save files
 - Write the methods : share_link.
 - Snapshot the file if possible
 - Versioning

data/app/models/repository_manager/repo_file.rb

@@ -31,7 +31,7 @@ class RepositoryManager::RepoFile < RepositoryManager::RepoItem
     if options[:source_folder]
       options[:source_folder].add!(new_item)
     elsif options[:owner].repo_item_name_exist_in_root?(new_item.name)
-      raise RepositoryManager::RepositoryManagerException.new("copy failed. The repo_file '#{new_item.name}' already exist in root.")
+      raise RepositoryManager::ItemExistException.new("copy failed. The repo_file '#{new_item.name}' already exist in root.")
     end
 
     options[:owner] ? new_item.owner = options[:owner] : new_item.owner = self.owner

data/app/models/repository_manager/repo_folder.rb

@@ -12,7 +12,7 @@ class RepositoryManager::RepoFolder < RepositoryManager::RepoItem
     if name_exist_in_children?(repo_item.name)
       # we delete the repo if asked
       repo_item.destroy if destroy_if_fail
-      raise RepositoryManager::RepositoryManagerException.new("add failed. The repo_item '#{repo_item.name}' already exist in the folder '#{name}'")
+      raise RepositoryManager::ItemExistException.new("add failed. The repo_item '#{repo_item.name}' already exist in the folder '#{name}'")
     else
       repo_item.update_attribute :parent, self
     end
@@ -29,7 +29,7 @@ class RepositoryManager::RepoFolder < RepositoryManager::RepoItem
   # Rename the item
   def rename!(new_name)
     if name_exist_in_siblings?(new_name)
-      raise RepositoryManager::RepositoryManagerException.new("rename failed. The repo_item '#{new_name}' already exist.'")
+      raise RepositoryManager::ItemExistException.new("rename failed. The repo_item '#{new_name}' already exist.'")
     else
       self.name = new_name
       # TODO see if I have to save or not
@@ -58,7 +58,7 @@ class RepositoryManager::RepoFolder < RepositoryManager::RepoItem
     if options[:source_folder]
       options[:source_folder].add!(new_item)
     elsif options[:owner].repo_item_name_exist_in_root?(new_item.name)
-      raise RepositoryManager::RepositoryManagerException.new("copy failed. The repo_folder '#{new_item.name}' already exist in root.")
+      raise RepositoryManager::ItemExistException.new("copy failed. The repo_folder '#{new_item.name}' already exist in root.")
     end
 
     options[:owner] ? new_item.owner = options[:owner] : new_item.owner = self.owner

data/app/models/repository_manager/repo_item.rb

@@ -39,12 +39,12 @@ class RepositoryManager::RepoItem < ActiveRecord::Base
         raise RepositoryManager::RepositoryManagerException.new("move failed. target '#{options[:source_folder].name}' can't be a file")
       end
       if options[:source_folder].name_exist_in_children?(self.name)
-        raise RepositoryManager::RepositoryManagerException.new("move failed. The repo_item '#{name}' already exist ine the folder '#{options[:source_folder].name}'")
+        raise RepositoryManager::ItemExistException.new("move failed. The repo_item '#{name}' already exist ine the folder '#{options[:source_folder].name}'")
       end
     # We are in root, we check if name exist in root
     # We stay in the same owner
     elsif self.owner.repo_item_name_exist_in_root?(self.name)
-      raise RepositoryManager::RepositoryManagerException.new("move failed. The repo_item '#{name}' already exist ine the root")
+      raise RepositoryManager::ItemExistException.new("move failed. The repo_item '#{name}' already exist ine the root")
     end
     # here, all is ok
     # We change the owner if another one is specify

data/lib/repository-manager.rb

@@ -26,6 +26,14 @@ module RepositoryManager
     def protected_attributes?
       Rails.version < '4' || defined?(ProtectedAttributes)
     end
+
+    ##
+    # Loads the Carrierwave locale files before the Rails application locales
+    # letting the Rails application overrite the carrierwave locale defaults
+    #config.before_configuration do
+      I18n.load_path << File.join(File.dirname(__FILE__), 'repository_manager', 'locales', 'repository_manager.en.yml')
+    #end
+
   end
 
 end

data/lib/repository_manager/exceptions.rb

@@ -7,4 +7,7 @@ module RepositoryManager
 
   class NestedSharingException < RepositoryManagerException
   end
+
+  class ItemExistException < RepositoryManagerException
+  end
 end

data/lib/repository_manager/has_repository.rb

@@ -87,7 +87,14 @@ module RepositoryManager
       def share(repo_item, members, options = {})
         begin
           share!(repo_item, members, options)
-        rescue RepositoryManager::PermissionException, RepositoryManager::NestedSharingException, ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
+        rescue RepositoryManager::PermissionException
+          repo_item.errors.add(:sharing, I18n.t('repository_manager.errors.sharing.create.no_permission'))
+          false
+        rescue RepositoryManager::NestedSharingException
+          repo_item.errors.add(:sharing, I18n.t('repository_manager.errors.sharing.create.nested_sharing'))
+          false
+        rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
+          repo_item.errors.add(:sharing, I18n.t('repository_manager.errors.sharing.create.not_created'))
           false
         end
       end
@@ -122,7 +129,7 @@ module RepositoryManager
 
           # If we are in root path we check if we can add this folder name
           if !source_folder && repo_item_name_exist_in_root?(name)
-            raise RepositoryManager::RepositoryManagerException.new("create folder failed. The repo_item '#{name}' already exist in the root folder.")
+            raise RepositoryManager::ItemExistException.new("create folder failed. The repo_item '#{name}' already exist in the root folder.")
           end
 
           # It raise an error if name already exist and destroy the folder
@@ -138,9 +145,17 @@ module RepositoryManager
       # Like create_folder!
       # Returns false if the folder is not created instead of an exception
       def create_folder(name = '', options = {})
+        options[:errors] = []
         begin
           create_folder!(name, options)
-        rescue RepositoryManager::PermissionException, RepositoryManager::RepositoryManagerException, ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
+        rescue RepositoryManager::PermissionException
+          options[:errors].push(I18n.t'repository_manager.errors.repo_item.repo_folder.create.no_permission')
+          false
+        rescue RepositoryManager::ItemExistException
+          options[:errors].push(I18n.t'repository_manager.errors.repo_item.repo_folder.item_exist')
+          false
+        rescue RepositoryManager::RepositoryManagerException, ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
+          options[:errors].push(I18n.t'repository_manager.errors.repo_item.repo_folder.create.not_created')
           false
         end
       end
@@ -158,6 +173,7 @@ module RepositoryManager
         begin
           delete_repo_item!(repo_item)
         rescue RepositoryManager::PermissionException
+          repo_item.errors.add(:delete, I18n.t('repository_manager.errors.repo_item.delete.no_permission'))
           false
         end
       end
@@ -198,7 +214,7 @@ module RepositoryManager
 
           # If we are in root path we check if we can add this file name
           if !source_folder && repo_item_name_exist_in_root?(repo_file.file.identifier)
-            raise RepositoryManager::RepositoryManagerException.new("create file failed. The repo_item '#{repo_file.file.identifier}' already exist in the root folder.")
+            raise RepositoryManager::ItemExistException.new("create file failed. The repo_item '#{repo_file.file.identifier}' already exist in the root folder.")
           end
 
           # It raise an error if name already exist and destroy the file
@@ -212,9 +228,17 @@ module RepositoryManager
       end
 
       def create_file(file, options = {})
+        options[:errors] = []
         begin
           create_file!(file, options)
-        rescue RepositoryManager::PermissionException, RepositoryManager::RepositoryManagerException, ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
+        rescue RepositoryManager::PermissionException
+          options[:errors].push(I18n.t'repository_manager.errors.repo_item.repo_file.create.no_permission')
+          false
+        rescue RepositoryManager::ItemExistException
+          options[:errors].push(I18n.t'repository_manager.errors.repo_item.repo_file.item_exist')
+          false
+        rescue RepositoryManager::RepositoryManagerException, ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
+          options[:errors].push(I18n.t'repository_manager.errors.repo_item.repo_file.create.not_created')
           false
         end
       end
@@ -264,6 +288,7 @@ module RepositoryManager
         begin
           download!(repo_item, options)
         rescue RepositoryManager::PermissionException
+          repo_item.errors.add(:download, I18n.t('repository_manager.errors.repo_item.download.no_permission'))
           false
         end
       end
@@ -281,6 +306,7 @@ module RepositoryManager
         begin
           rename_repo_item!(repo_item, new_name)
         rescue RepositoryManager::PermissionException
+          repo_item.errors.add(:rename, I18n.t('repository_manager.errors.repo_item.rename.no_permission'))
           false
         end
       end
@@ -319,7 +345,14 @@ module RepositoryManager
       def move_repo_item(repo_item, target = nil)
         begin
           move_repo_item!(repo_item, target)
+        rescue RepositoryManager::PermissionException
+          repo_item.errors.add(:move, I18n.t('repository_manager.errors.repo_item.move.no_permission'))
+          false
+        rescue RepositoryManager::ItemExistException
+          repo_item.errors.add(:move, I18n.t('repository_manager.errors.repo_item.item_exist'))
+          false
         rescue RepositoryManager::RepositoryManagerException, ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
+          repo_item.errors.add(:move, I18n.t('repository_manager.errors.repo_item.move.not_moved'))
           false
         end
       end
@@ -351,7 +384,14 @@ module RepositoryManager
       def copy_repo_item(repo_item, target = nil, options = {})
         begin
           copy_repo_item!(repo_item, target, options)
-        rescue RepositoryManager::PermissionException, RepositoryManager::RepositoryManagerException, ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
+        rescue RepositoryManager::PermissionException
+          repo_item.errors.add(:copy, I18n.t('repository_manager.errors.repo_item.copy.no_permission'))
+          false
+        rescue RepositoryManager::ItemExistException
+          repo_item.errors.add(:copy, I18n.t('repository_manager.errors.repo_item.item_exist'))
+          false
+        rescue RepositoryManager::RepositoryManagerException, ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved
+          repo_item.errors.add(:copy, I18n.t('repository_manager.errors.repo_item.copy.not_copied'))
           false
         end
       end
@@ -440,6 +480,7 @@ module RepositoryManager
         begin
           add_members_to!(sharing, members, options = RepositoryManager.default_sharing_permissions)
         rescue RepositoryManager::PermissionException
+          sharing.errors.add(:add, I18n.t('repository_manager.errors.sharing.add.no_permission'))
           false
         end
       end
@@ -458,6 +499,7 @@ module RepositoryManager
         begin
           remove_members_from!(sharing, members)
         rescue RepositoryManager::PermissionException
+          sharing.errors.add(:remove, I18n.t('repository_manager.errors.sharing.remove.no_permission'))
           false
         end
       end

data/lib/repository_manager/locales/repository_manager.en.yml

@@ -0,0 +1,48 @@
+en:
+  repository_manager:
+    models:
+      repo_folder:
+        name: New folder
+    success:
+      repo_folder:
+        created: The folder was created with success !
+      repo_file:
+        created: The file was created with success !
+    errors:
+      repo_item:
+        item_exist: This item already exist in the target destination
+        download:
+          no_permission: You don't have the permission to download this item
+        rename:
+          no_permission: You don't have the permission to rename this item
+        delete:
+          no_permission: You don't have the permission to delete this item
+        move:
+          no_permission: You don't have the permission to move this item
+          not_moved: This item was not moved
+        copy:
+          no_permission: You don't have the permission to copy this item
+          not_copied: This item was not copied
+        repo_folder:
+          item_exist: This folder already exist
+          create:
+            no_permission: You don't have the permission to create a folder
+            not_created: The folder was not created
+        repo_file:
+          item_exist: This file already exist
+          create:
+            no_permission: You don't have the permission to create a file
+            not_created: The file was not created
+      sharing:
+        create:
+          no_permission: You don't have the permission to share this item
+          nested_sharing: You can't share this item because another sharing exist on its ancestors or descendants
+          not_created: This item was not shared
+        add:
+          no_permission: You don't have the permission to add member to this share
+        remove:
+          no_permission: You don't have the permission to remove member from this share
+    form:
+      new:
+        repo_folder: Create a folder
+        repo_file: Send a file

data/lib/repository_manager/locales/repository_manager.fr.yml

@@ -0,0 +1,45 @@
+fr:
+  repository_manager:
+    models:
+      repo_folder:
+        name: Nouveau dossier
+    success:
+      repo_folder:
+        created: Le dossier a été créé avec succès !
+      repo_file:
+        created: Le fichier a été créé avec succès !
+    errors:
+      repo_item:
+        download:
+          no_permission: Vous n'avez pas la permission de télécharger cet élément
+        rename:
+          no_permission: Vous n'avez pas la permission de renommer cet élément
+        delete:
+          no_permission: Vous n'avez pas la permission de supprimer cet élément
+        move:
+          no_permission: Vous n'avez pas la permission de déplacer cet élément
+          not_moved: Cet élément n'a pas été déplacé
+          item_exist: Cet élément existe déjà dans la destination cible
+        repo_folder:
+          item_exist: Ce dossier existe déjà
+          create:
+            no_permission: Vous n'avez pas la permission de créer un dossier
+            not_created: Le dossier n'a pas été créé
+        repo_file:
+          item_exist: Ce fichier existe déjà
+          create:
+            no_permission: Vous n'avez pas la permission de créer un fichier
+            not_created: Le fichier n'a pas été envoyé
+      sharing:
+        create:
+          no_permission: Vous n'avez pas la permission de partager cet élément
+          nested_sharing: Vous ne pouvez pas partager cet élément car un partage existe déjà dans un de ces parents ou descendants
+          not_created: L'élément n'a pas été partagé
+        add:
+          no_permission: Vous n'avez pas la permission d'ajouter un membre au partage
+        remove:
+          no_permission: Vous n'avez pas la permission de retirer un membre du partage
+    form:
+      new:
+        repo_folder: Créer un dossier
+        repo_file: Envoyer un fichier

data/lib/repository_manager/version.rb

@@ -1,3 +1,3 @@
 module RepositoryManager
-  VERSION = '0.1.21'
+  VERSION = '0.1.24'
 end

data/spec/has_repository_spec.rb

@@ -59,6 +59,8 @@ describe 'HasRepository' do
 
     @user1.share(rep, members)
 
+    expect(rep.errors.messages).to eq({sharing: ['You don\'t have the permission to share this item']})
+
     expect(@user2.sharings.count).to eq(0)
     expect(@user1.sharings_owners.count).to eq(0)
   end
@@ -229,6 +231,8 @@ describe 'HasRepository' do
 
     # Here we can't share 'Parent' or 'Children' because it already exist a nested sharing.
     expect(@user1.share(parent, @user2)).to eq(false) # Returns false
+    expect(parent.errors.messages).to eq({sharing: ['You can\'t share this item because another sharing exist on its ancestors or descendants']})
+
   end
 
   it 'can\'t share a repo_item with ancestor sharing permissions' do

data/spec/models/repository_spec.rb

@@ -21,14 +21,20 @@ describe 'RepoItem' do
   end
 
   it 'can\'t create a folder in it a file' do
-    folder = @user1.create_folder('Folder1', source_folder: @user1_file)
+    options = {source_folder: @user1_file}
+    folder = @user1.create_folder('Folder1', options)
+
+    expect(options[:errors]).to eq(['The folder was not created'])
 
     expect(folder).to eq(false)
   end
 
 
   it 'can\'t create a folder in another folder without permission' do
-    folder = @user2.create_folder('Folder1', source_folder: @user1_folder)
+    options = {source_folder: @user1_folder}
+    folder = @user2.create_folder('Folder1', options)
+
+    expect(options[:errors]).to eq(['You don\'t have the permission to create a folder'])
 
     expect(@user1_folder.has_children?).to eq(false)
     expect(folder).to eq(false)
@@ -62,6 +68,8 @@ describe 'RepoItem' do
 
   it 'can\'t delete a repo_item without permission' do
     @user2.delete_repo_item(@user1_file)
+    expect(@user1_file.errors.messages).to eq({delete: ['You don\'t have the permission to delete this item']})
+
     expect(@user1.repo_items.count).to eq(2)
   end
 
@@ -97,6 +105,8 @@ describe 'RepoItem' do
   it 'user can\'t download a file without permission' do
     path = @user2.download(@user1_file)
     expect(path).to eq(false)
+    expect(@user1_file.errors.messages).to eq({download: ['You don\'t have the permission to download this item']})
+
   end
 
   #it 'download the file if there is just one in a folder (no zip)' do
@@ -191,6 +201,8 @@ describe 'RepoItem' do
 
   it 'can\'t rename item without share update permission' do
     @user2.rename_repo_item(@user1_folder, 'test new name')
+    expect(@user1_folder.errors.messages).to eq({rename: ['You don\'t have the permission to rename this item']})
+
     expect(@user1_folder.reload.name).to eq('Folder')
   end
 
@@ -202,20 +214,19 @@ describe 'RepoItem' do
     folder5 = @user1.create_folder()
     folder6 = @user1.create_folder('', source_folder: folder1)
 
-
-
-    # TODO add translate in gem
-    expect(folder1.name).to eq('translation missing: en.repository_manager.models.repo_folder.name')
-    expect(folder2.name).to eq('translation missing: en.repository_manager.models.repo_folder.name 2')
-    expect(folder3.name).to eq('translation missing: en.repository_manager.models.repo_folder.name')
-    expect(folder4.name).to eq('translation missing: en.repository_manager.models.repo_folder.name 2')
-    expect(folder5.name).to eq('translation missing: en.repository_manager.models.repo_folder.name 3')
-    expect(folder6.name).to eq('translation missing: en.repository_manager.models.repo_folder.name 3')
+    expect(folder1.name).to eq('New folder')
+    expect(folder2.name).to eq('New folder 2')
+    expect(folder3.name).to eq('New folder')
+    expect(folder4.name).to eq('New folder 2')
+    expect(folder5.name).to eq('New folder 3')
+    expect(folder6.name).to eq('New folder 3')
   end
 
   it 'can\'t create a folder with the same name at root' do
     @user1.create_folder('test')
-    folder2 = @user1.create_folder('test')
+    folder2 = @user1.create_folder('test',options={})
+
+    expect(options[:errors]).to eq(['This folder already exist'])
 
     expect(folder2).to eq(false)
   end
@@ -232,8 +243,11 @@ describe 'RepoItem' do
   it "can't create too file with the same name in folder" do
     file = @user1.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"), source_folder: @user1_folder)
     expect(file.name).to eq('textfile.txt')
-    file2 = @user1.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"), source_folder: @user1_folder)
+    options = {source_folder: @user1_folder}
+    file2 = @user1.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"), options)
     expect(file2).to eq(false)
+    expect(options[:errors]).to eq(['This file already exist'])
+
 
     #@user1.create_file!(File.open("#{Rails.root}/../fixture/textfile.txt"), source_folder: @user1_folder)
   end
@@ -280,6 +294,9 @@ describe 'RepoItem' do
     folder = @user2.create_folder('folder')
 
     expect(@user2.move_repo_item(folder, file)).to eq(false)
+    expect(folder.errors.messages).to eq({move: ['This item was not moved']})
+
+
   end
 
   it "move_repo_item default to the root of the self owner" do
@@ -294,15 +311,20 @@ describe 'RepoItem' do
   it "move_repo_item can't move a file into a root if file already exist" do
     file = @user1.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"), source_folder: @user1_folder)
     expect(@user1.move_repo_item(file)).to eq(false)
+    expect(file.errors.messages).to eq({move: ['This item already exist in the target destination']})
+
   end
 
   it "move_repo_item can't move if no permission" do
     file = @user1.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"), source_folder: @user1_folder)
     expect(@user2.move_repo_item(file)).to eq(false)
+    expect(file.errors.messages).to eq({move: ['You don\'t have the permission to move this item']})
+
   end 
 
-  it "can't copy a file withour permission" do
-    expect(@user2.copy_repo_item(@user1_file)).to eq(false)         
+  it "can't copy a file without permission" do
+    expect(@user2.copy_repo_item(@user1_file)).to eq(false)
+    expect(@user1_file.errors.messages).to eq({copy: ['You don\'t have the permission to copy this item']})
   end
   
   it "can copy a file with read permission" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repository-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.24
 platform: ruby
 authors:
 - Yves Baumann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,6 +139,8 @@ files:
 - lib/repository_manager/engine.rb
 - lib/repository_manager/exceptions.rb
 - lib/repository_manager/has_repository.rb
+- lib/repository_manager/locales/repository_manager.en.yml
+- lib/repository_manager/locales/repository_manager.fr.yml
 - lib/repository_manager/version.rb
 - repository-manager.gemspec
 - spec/dummy/Gemfile