repository-manager 0.0.22 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e37f122c9ac68a5696514ba45aa58590d70f8d2d
-  data.tar.gz: ff2275d01570d20ea9ddcca099890a7a41d2bee0
+  metadata.gz: e54eb1966aef674b05d284cd6998ef0b414aa887
+  data.tar.gz: e6e295ed9fa6b70719c7ef318b7fc0944d253d00
 SHA512:
-  metadata.gz: cf1c68509fb5f38b59e6493b51b903e0a556dc8e27bc079f62080801f7c10eebbdf4e7268ed8ece90ddd4182480578d50c04140ecb62a4300cf8ac4af2c11432
-  data.tar.gz: 736abdc384ce33cb4484c249d5952753a6a7d1c2ca0477b2a3e774c2813bb9f3109d2eb862f40943ca72e0cf995d9860b3dde551da6177c1b2137b50ece164b4
+  metadata.gz: 6a823adf63f6394fda1d473b32ecd8c7f49133b454c30cdc78d8096d94bfb2833b174b73ca4986c086cd7e49e2571363cba0e66aa3c9dbc580b2aabcd7742228
+  data.tar.gz: 63474ee1c92accbf200c279391daaa3b6f537edd200dee80c2a978da08cb6690155478bf185dac871ce84a115f5be0463729a8f1073063df5719942c06a31de5

data/README.md

@@ -408,8 +408,7 @@ the_folder.delete_zip
 ## TODO
 
 - Test the rename folder method
-- Donner un nom UNIQUE de dossier par default
-- Verifier que le nom du dossier n'existe pas dans la racine du repo
+- Test if the file already exist before creating or moving it
 - Do the rename file method
 - Write the documentation for the rename method
 - Write the methods : copy, share_link.

data/app/models/repo_folder.rb

@@ -6,10 +6,13 @@ class RepoFolder < RepoItem
   validates :name, presence: true
 
   # Add a repo_item in the folder.
-  def add!(repo_item)
+  # second param destroy the repo_item if it can move it.
+  def add!(repo_item, destroy_if_fail = false)
     # We check if this name already exist
     #if repo_item.children.exists?(:name => repo_item.name)
-    if RepoItem.where(name: repo_item.name).where(id: child_ids).first
+    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}'")
     else
       repo_item.update_attribute :parent, self
@@ -26,13 +29,12 @@ class RepoFolder < RepoItem
 
   # Rename the item
   def rename!(new_name)
-    # We take all siblings without itself
-    sibling_ids_without_itself = self.sibling_ids.delete(self.id)
-    # We check if another item has the same name
-    if RepoItem.where(name: self.name).where(id: sibling_ids_without_itself).first
+    if name_exist_in_siblings?(new_name)
       raise RepositoryManager::RepositoryManagerException.new("rename failed. The repo_item '#{new_name}' already exist.'")
     else
       self.name = new_name
+      # TODO see if I have to save or not
+      save!
     end
   end
 
@@ -104,6 +106,21 @@ class RepoFolder < RepoItem
     FileUtils.rm_rf(path)
   end
 
+  # Returns true or false if the name exist in this folder
+  def name_exist_in_children?(name)
+    #RepoItem.where(name: name).where(id: child_ids).first ? true : false
+    RepoItem.where('name = ? OR file = ?', name, name).where(id: child_ids).first ? true : false
+  end
+
+  # Returns true or false if the name exist in siblings
+  def name_exist_in_siblings?(name)
+    # We take all siblings without itself
+    sibling_ids_without_itself = self.sibling_ids.delete(self.id)
+    # We check if another item has the same name
+    #RepoItem.where(name: name).where(id: sibling_ids_without_itself).first ? true : false
+    RepoItem.where('name = ? OR file = ?', name, name).where(id: sibling_ids_without_itself).first ? true : false
+  end
+
   private
 
   # Returns the default path of the zip file

data/app/models/repo_item.rb

@@ -1,13 +1,13 @@
 class RepoItem < ActiveRecord::Base
   attr_accessible :type if RepositoryManager.protected_attributes?
 
-
   has_ancestry
 
   # Associate with the User Class
   belongs_to :owner, :polymorphic => true
   has_many :sharings, :dependent => :destroy
   #has_many :members, through: :sharings
+  belongs_to :user, class_name: RepositoryManager.user_model if RepositoryManager.user_model
 
   if Rails::VERSION::MAJOR == 4
     scope :files, -> { where type: 'RepoFile' }

data/app/models/sharing.rb

@@ -1,10 +1,11 @@
 class Sharing < ActiveRecord::Base
   attr_accessible :can_read, :can_create, :can_update, :can_delete, :can_share if RepositoryManager.protected_attributes?
 
-
   has_many :sharings_members, :dependent => :destroy
   belongs_to :owner, :polymorphic => true
   belongs_to :repo_item
+  belongs_to :user, class_name: RepositoryManager.user_model if RepositoryManager.user_model
+
 
   #scope :recipient, lambda { |recipient|
   #  joins(:receipts).where('receipts.receiver_id' => recipient.id,'receipts.receiver_type' => recipient.class.base_class.to_s)

data/db/migrate/20131018214212_create_repository_manager.rb

@@ -3,8 +3,9 @@ class CreateRepositoryManager < ActiveRecord::Migration
   def change
 
     create_table :sharings do |t|
-      t.references :owner, polymorphic: true
-      t.references :repo_item
+      t.references :owner, polymorphic: true, index: true
+      t.references :user, index: true
+      t.references :repo_item, index: true
       t.boolean :can_create, :default => false
       t.boolean :can_read, :default => false
       t.boolean :can_update, :default => false
@@ -20,9 +21,10 @@ class CreateRepositoryManager < ActiveRecord::Migration
     end
 
     create_table :repo_items do |t|
-      t.references :owner, polymorphic: true
+      t.references :owner, polymorphic: true, index: true
+      t.references :user, index: true
       t.string :ancestry
-      t.integer :ancestry_depth, :default => 0
+      #t.integer :ancestry_depth, :default => 0
       t.string :name
       t.float :file_size
       t.string :content_type

data/lib/generators/repository_manager/templates/initializer.rb

@@ -6,6 +6,10 @@ RepositoryManager.setup do |config|
   # Default sharing permissions that an object has when he is added in a sharing.
   config.default_sharing_permissions = { can_add: false, can_remove: false }
 
+  # Note here the user model. Default : 'User'
+  # Def false if you don't want to register the user
+  #config.user_model = 'User'
+
   # Default path for generating the zip file when a user want to download a folder
   # Default is : "download/#{member.class.to_s.underscore}/#{member.id}/#{self.class.to_s.underscore}/#{self.id}/"
   #config.default_zip_path = true

data/lib/repository-manager.rb

@@ -14,6 +14,10 @@ module RepositoryManager
   mattr_accessor :accept_nested_sharing
   @@accept_nested_share = false
 
+  mattr_accessor :user_model
+  #@@user_model = 'User'
+  @@user_model = false
+
   class << self
     def setup
       yield self

data/lib/repository_manager/has_repository.rb

@@ -63,6 +63,7 @@ module RepositoryManager
 
           sharing = Sharing.new(repo_item_permissions)
           sharing.owner = self
+          sharing.user = current_user if RepositoryManager.user_model
 
           sharing.add_members(members, sharing_permissions)
 
@@ -99,13 +100,19 @@ module RepositoryManager
             folder.name = name
           end
           folder.owner = self
+          folder.user = current_user if RepositoryManager.user_model
 
-          # Soit il a une source_folder, donc on l'ajoute et on le sauve et ça fonctionne pas => ERREUR
-          # Soit il n'a pas de source_folder et le save ne va pas => ERREUR
-          unless (folder.save && source_folder && source_folder.add(folder)) || (!source_folder && folder.save)
-            folder.destroy
+          # 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.")
+          end
+
+          unless folder.save
             raise RepositoryManager::RepositoryManagerException.new("create_folder failed. Can\'t save the folder '#{name}'.")
           end
+
+          # It raise an error if name already exist and destroy the folder
+          source_folder.add!(folder, true) if source_folder
         else
           raise RepositoryManager::AuthorisationException.new("create_folder failed. You don't have the permission to create a folder in '#{source_folder.name}'")
         end
@@ -146,31 +153,29 @@ module RepositoryManager
         if can_create?(source_folder)
           if file.class.name == 'RepoFile'
             repo_file = file
-            repo_file.owner = self
-            unless repo_file.save
-              raise RepositoryManager::RepositoryManagerException.new("create_file failed. The file '#{name}' can't be save")
-            end
           else
             repo_file = RepoFile.new
             repo_file.file = file
-            repo_file.owner = self
-            unless repo_file.save
-              raise RepositoryManager::RepositoryManagerException.new("create_file failed. The file '#{name}' can't be save")
-            end
           end
 
-          # We have to look if it is ok to add the file here
-          if source_folder == nil || source_folder.add(file)
-            return repo_file
-          else
-            # The add didn't works, we delete the file
-            file.destroy
-            raise RepositoryManager::RepositoryManagerException.new("create_file failed. The file '#{name}' already exist in folder '#{source_folder.name}'")
+          repo_file.owner = self
+          repo_file.user = current_user if RepositoryManager.user_model
+
+          # 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.")
           end
+
+          unless repo_file.save
+            raise RepositoryManager::RepositoryManagerException.new("create_file failed. The file can't be save")
+          end
+
+          # It raise an error if name already exist and destroy the file
+          source_folder.add!(repo_file, true) if source_folder
         else
-          #raise "create_file failed. You don't have the permission to create a file in the folder '#{source_folder.name}'"
-          raise RepositoryManager::AuthorisationException.new("create_file failed. The file '#{name}' already exist in folder '#{source_folder.name}'")
+          raise RepositoryManager::AuthorisationException.new("create_file failed. You don't have the permission to create a file")
         end
+        repo_file
       end
 
       def create_file(file, source_folder = nil)
@@ -378,6 +383,17 @@ module RepositoryManager
         "#{prefix}#{self.class.to_s.underscore}/#{self.id}/"
       end
 
+      # Returns true of false if the name exist in the root path of this instance
+      def repo_item_name_exist_in_root?(name)
+        # add : or file : name
+        #RepoItem.where(name: name).where(owner: self).where(ancestry: nil).first ? true : false
+        #puts RepoItem.where('name = ? OR file = ?', name, name).where(owner: self).where(ancestry: nil).first.inspect
+        #puts self.inspect
+
+        RepoItem.where('name = ? OR file = ?', name, name).where(owner: self).where(ancestry: nil).first ? true : false
+
+      end
+
       private
 
       # Return if you can do or not this action in the sharing
@@ -477,18 +493,19 @@ module RepositoryManager
         # We check if another item has the same name
 
         if source_folder
+          #TODO Optimiser, récupérer tout les instances contenants le nom, puis faire la boucle (pas boucle de requete)
           # We check if another item has the same name
-          until !RepoItem.where(name: name).where(id: source_folder.child_ids).first do
+          until !source_folder.name_exist_in_children?(name) do
             if i == ''
               i = 1
             end
             i += 1
             name = "#{I18n.t 'repository_manager.models.repo_folder.name'}#{i}"
           end
-
         else
+          #TODO Optimiser, récupérer tout les instances contenants le nom, puis faire la boucle (pas boucle de requete)
           # Si il n'a pas de parent, racine
-          until !RepoItem.where(name: name).where(owner: self).where(ancestry: nil).first do
+          until !repo_item_name_exist_in_root?(name) do
             if i == ''
               i = 1
             end

data/lib/repository_manager/version.rb

@@ -1,3 +1,3 @@
 module RepositoryManager
-  VERSION = '0.0.22'
+  VERSION = '0.0.24'
 end

data/spec/has_repository_spec.rb

@@ -7,9 +7,6 @@ describe 'HasRepository' do
     @user2 = FactoryGirl.create(:user)
     @user3 = FactoryGirl.create(:user)
     @group1 = FactoryGirl.create(:group)
-    #@group2 = FactoryGirl.create(:group)
-    #@group3 = FactoryGirl.create(:group)
-    #@fileAlone = FactoryGirl.create(:app_file)
   end
 
   it "should be associate with shares" do

data/spec/models/repository_spec.rb

@@ -174,4 +174,29 @@ describe 'RepoItem' do
     expect(folder4.name).to eq('translation missing: en.repository_manager.models.repo_folder.name2')
 
   end
+
+  it 'can\'t create a folder with the same name at root' do
+    @user1.create_folder('test')
+    folder2 = @user1.create_folder('test')
+
+    expect(folder2).to eq(false)
+  end
+
+  it "can't create too file with the same name at root" do
+    file = @user2.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"))
+    expect(file.name).to eq('textfile.txt')
+    file2 = @user2.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"))
+    expect(file2).to eq(false)
+
+    #@user1.create_file!(File.open("#{Rails.root}/../fixture/textfile.txt"))
+  end
+
+  it "can't create too file with the same name in folder" do
+    file = @user1.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"), @user1_folder)
+    expect(file.name).to eq('textfile.txt')
+    file2 = @user1.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"),@user1_folder)
+    expect(file2).to eq(false)
+
+    #@user1.create_file!(File.open("#{Rails.root}/../fixture/textfile.txt"), @user1_folder)
+  end
 end

data/spec/spec_helper.rb

@@ -18,6 +18,10 @@ if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
 
+RSpec.configure do |config|
+  config.include SpecTestHelper#, :type => :controller
+end
+
 
 #
 #class ActiveSupport::TestCase

data/spec/support/spec_test_helper.rb

@@ -0,0 +1,5 @@
+module SpecTestHelper
+  def current_user
+    User.first
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repository-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.24
 platform: ruby
 authors:
 - Yves Baumann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,7 @@ files:
 - spec/models/share_spec.rb
 - spec/repository_manager_spec.rb
 - spec/spec_helper.rb
+- spec/support/spec_test_helper.rb
 homepage: https://github.com/Texicitys/repository-manager
 licenses:
 - MIT
@@ -267,3 +268,4 @@ test_files:
 - spec/models/share_spec.rb
 - spec/repository_manager_spec.rb
 - spec/spec_helper.rb
+- spec/support/spec_test_helper.rb