repository-manager 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    repository-manager (0.0.4)
+    repository-manager (0.0.5)
       ancestry
       carrierwave
       enumerize
       rails (> 3.0.0)
+      rubyzip
 
 GEM
   remote: https://rubygems.org/
@@ -90,6 +91,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
+    rubyzip (0.9.9)
     sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)

data/README.md

@@ -74,37 +74,37 @@ end
 
 ### How can I create/delete a repository (file or folder)
 
-You just have to call the method `createFile`, `createFolder`, or `deleteRepository`.
+You just have to call the method `create_file`, `create_folder`, or `delete_repository`.
 
 ```ruby
 # user1 wants to create a folder in his repository
 
 # Create a root folder on the user1 repository (you can have how many roots as you want)
-sourceFolder = createFolder('Root folder')
+source_folder = user1.create_folder('Root folder')
 
 # user1 own repository :
 #   'Root folder'
 
 # sourceFolder is the directory in wich user1 wants to create the folder 'The new folder'
 name = 'The new folder'
-theFolder = user1.createFolder(name, sourceFolder)
+the_folder = user1.create_folder(name, sourceFolder)
 
 # user1 own repository :
 #   'Root folder'
 #     'The new folder'
 
-# Now we want to add a file into theFolder 
-# Note : user1 needs the ':can_create => true' permission in the folder : theFolder
-user1.createFile(params[:file], theFolder)
+# Now we want to add a file into the_folder 
+# Note : user1 needs the ':can_create => true' permission in the folder : the_folder.
+user1.create_file(params[:file], the_folder)
 # OR
-#user1.createFile(File.open('somewhere'), theFolder)
+#user1.create_file(File.open('somewhere'), the_folder)
 
 # user1 own repository :
 #   'Root folder'
 #     'The new folder'
 #        'file'
 
-file2 = user1.createFile(params[:file2])
+file2 = user1.create_file(params[:file2])
 
 # user1 own repository :
 #   'Root folder'
@@ -113,14 +113,14 @@ file2 = user1.createFile(params[:file2])
 #   'file2'
 
 # Delete a repository
-# Note : user1 needs the ':can_delete => true' permission in the folder : theFolder
-user1.deleteRepository(theFolder)
+# Note : user1 needs the ':can_delete => true' permission in the folder : the_folder
+user1.delete_repository(the_folder)
 
 # user1 own repository :
 #   'Root folder'
 #   'file2'
 
-user1.deleteRepository(file2)
+user1.delete_repository(file2)
 
 # user1 own repository :
 #   'Root folder'
@@ -132,7 +132,7 @@ user1.deleteRepository(file2)
 Now, user1 want to share his folder 'The new folder' with a Group object et another User object.
 
 ```ruby
-# user1 wants to share theFolder with group1 and user2
+# user1 wants to share the_folder with group1 and user2
 
 items = []
 # You can add other instance (who has_repository) in this array to share with more than one instance
@@ -144,7 +144,7 @@ share_permissions = {can_add: true, can_remove: true}
 # Default reposiroty permissions are: {can_read: false, can_create: false, can_update:false, can_delete:false, can_share: false}
 repo_permissions = {can_read: true, can_create: true, can_update:true, can_delete:true, can_share: true}
 
-share = user1.share(theFolder, items, repo_permissions, share_permissions)
+share = user1.share(the_folder, items, repo_permissions, share_permissions)
 ```
 
 `share_permissions` specifies if the item who receive the share can add or remove items in this share.
@@ -164,9 +164,27 @@ There is two king of repository:
 user1.repositories.all # => You get the repository that user1 has created
 
 # user2 want to get his shared repository
-user2.shares_repositories.all
+user2.shared_repositories.all
 ```
 
+A repository can be:
+- A file
+- A folder
+
+```ruby
+# We want to know if the object repository is a file or a folder:
+if repository.type == 'Folder'
+  repository.name #=> Returns the name of the folder ('New folder').
+elsif repository.type == 'AppFile'
+  repository.name #=> Returns the name of the file ('file.png').
+  # Here is the file
+  repository.file.url # => '/url/to/file.png'
+  repository.file.current_path # => 'path/to/file.png'
+  repository.file.identifier # => 'file.png'
+end
+```
+
+
 ### How can I manage a share
 
 
@@ -174,7 +192,7 @@ If it has the authorisation, an object can add items to a share.
 
 ```ruby
 # user1 want to add items to his share (the actions are done only if user1 has the ':can_add' permission)
-user1.can_add_to_share(share) # => true
+user1.can_add_to?(share) # => true
 
 share_permissions = {can_add: true, can_remove: false}
 # Add items
@@ -182,11 +200,11 @@ items = []
 items << user3
 items << group2
 ...
-@user1.addItemsToShare(share, items, share_permissions)
+@user1.add_items_to(share, items, share_permissions)
 
 # Here user3 and group2 can add items in this share, but they can't remove an item.
-group2.can_add_to_share(share) # => true
-group2.can_remove_to_share(share) # => false
+group2.can_add_to?(share) # => true
+group2.can_remove_from?(share) # => false
 
 # If user2 add an item in the share, he can choose if the permission ':can_add' is true or false, but he can't put ':can_remove' to true (because he don't have this permission himself).
 ```
@@ -195,17 +213,17 @@ If it has the authorisation, an object can remove items from a share.
 
 ```ruby
 # user1 want to remove group2 from this share
-user1.removeItemsToShare(share, group2)
+user1.remove_items_from(share, group2)
 ```
 
 As admin, you can directly work with the share. Be carefull, there is NO authorisation verification !
 
 ```ruby
 # Add an item to the share
-share.addItems(item, share_permissions)
+share.add_items(item, share_permissions)
 
 # Delete items from the share
-share.removeItems(items)
+share.remove_items(items)
 ```
 
 ### Authorisations
@@ -213,13 +231,13 @@ share.removeItems(items)
 #### Repository authorisations
 
 The owner of a repository (file or folder) has all the authorisations on it. When he share this repository, he can choose what authorisation he gives to the share. The authorisations are :
-- can_read(repository) : The item can read (=download) this file/folder.
-- can_create(repository) : Can create in the repository (if repository is nil (= root), always true).
-- can_update(repository) : Can update a repository.
-- can_delete(repository) : Can delete a repository.
-- can_share(repository) : Can share a repository.
+- can_read?(repository) : The item can read (=download) this file/folder.
+- can_create?(repository) : Can create in the repository (if repository is nil (= root), always true).
+- can_update?(repository) : Can update a repository.
+- can_delete?(repository) : Can delete a repository.
+- can_share?(repository) : Can share a repository.
 
-To check if a user has one of this authorisation, you just have to write : `user1.can_read(repository)`, `user1.can_share(repository)`, etc (it returns `true` or `false`).
+To check if a user has one of this authorisation, you just have to write : `user1.can_read?(repository)`, `user1.can_share?(repository)`, etc (it returns `true` or `false`).
 
 NOTICE : An object who can share a repository, can't set new permissions that it doesn't have. 
 For instance, `user3` has a share of `repository1` with `:can_delete => false` and `:can_share => true`. He can share `repository1` with `user4`, but he can't put `:can_delete => true` in this new share.
@@ -241,10 +259,10 @@ end
 #### Share permissions
 
 You can manage the permissions of an instance in a share. The owner of the share has all the permissions. The permissions are:
-- can_add_to_share(share) : The item can add a new instance in this share.
-- can_remove_to_share(share) : Can remove an instance from this share.
+- can_add_to?(share) : The item can add a new instance in this share.
+- can_remove_from(share) : Can remove an instance from this share.
 
-To check if the object can add or remove an instance in the share, just write : `group1.can_add_to_share(share)` or `group1.can_remove_to_share(share)` (it returns `true` or `false`).
+To check if the object can add or remove an instance in the share, just write : `group1.can_add_to?(share)` or `group1.can_remove_from?(share)` (it returns `true` or `false`).
 
 Like the repository authorisations, you can get the share authorisations with : `group1.get_share_authorisations(share)`.
 

data/app/models/app_file.rb

@@ -1,16 +1,28 @@
 class AppFile < Repository
-  attr_accessible :name, :content_type, :file_size if RepositoryManager.protected_attributes?
-
-  mount_uploader :name, RepositoryUploader
+  attr_accessible :file, :content_type, :file_size if RepositoryManager.protected_attributes?
 
+  validates :file, presence: true
+  mount_uploader :file, RepositoryUploader
   before_save :update_asset_attributes
 
+  # Return the name of the file with his extension
+  def name
+    file.identifier
+  end
+
+  # Downloading this file
+  def download(object = nil)
+    path = file.path
+    #render status: :bad_request and return unless File.exist?(path)
+    #send_file(path)
+  end
+
   private
 
   def update_asset_attributes
-    if name.present? && name_changed?
-      self.content_type = name.file.content_type
-      self.file_size = name.file.size
+    if file.present? && file_changed?
+      self.content_type = file.file.content_type
+      self.file_size = file.file.size
     end
   end
 

data/app/models/folder.rb

@@ -1,8 +1,54 @@
 class Folder < Repository
   attr_accessible :name if RepositoryManager.protected_attributes?
 
-  #Add a repository in the folder.
-  def addRepository(repository)
+  validates :name, presence: true
+
+  # Add a repository in the folder.
+  def add_repository(repository)
     repository.update_attribute :parent, self
   end
+
+  # Download this folder (zip it first)
+  # If object = nil, it download all the folder
+  # if object is set, it download only the folder that the user can_read.
+  def download(object = nil)
+    # Get all the children
+    children = Repository.find(child_ids)
+
+    # The array that will contain all the children to zip
+    children_to_add = []
+
+    if children
+      # If we have an object, we have to look at his permissions
+      if object
+        # For all repositories, we check if the object has the permission to read it
+        children.each do |child|
+          # If he can read it, add to the array
+          children_to_add << child if object.can_read?(child)
+        end
+      else
+        # Simply add all
+        children_to_add = children
+      end
+    end
+
+    # If something is in the array to add, we zip it
+    if children_to_add.length > 1
+      # We create the zip here
+      Zip::File.open("#{name}.zip", Zip::File::CREATE) do |zipfile|
+        children_to_add.each do |child|
+          # Two arguments:
+          # - The name of the file as it will appear in the archive
+          # - The original file, including the path to find it
+          zipfile.add(child.file.identifier, child.file.current_path)
+        end
+      end
+    elsif children_to_add.length == 1
+      children_to_add.first.file.path
+    else
+      # Nothing to download here
+      false
+    end
+  end
+
 end

data/app/models/share.rb

@@ -26,25 +26,25 @@ class Share < ActiveRecord::Base
   end
 
   # Add items to the share
-  def addItems(items, share_permissions=nil)
+  def add_items(items, share_permissions = nil)
     if items.kind_of?(Array)
       # Add each item to this share
       items.each do |i|
-        shareItem = SharesItem.new(share_permissions)
-        shareItem.item = i
+        share_item = SharesItem.new(share_permissions)
+        share_item.item = i
         # Add the shares items in the share
-        self.shares_items << shareItem
+        self.shares_items << share_item
       end
     else
-      shareItem = SharesItem.new(share_permissions)
-      shareItem.item = items
+      share_item = SharesItem.new(share_permissions)
+      share_item.item = items
       # Add the shares items in the share
-      self.shares_items << shareItem
+      self.shares_items << share_item
     end
   end
 
   # Remove items to the share
-  def removeItems(items)
+  def remove_items(items)
     if items.kind_of?(Array)
       # Add each item to this share
       items.each do |item|

data/app/uploaders/repository_uploader.rb

@@ -1,6 +1,10 @@
 # encoding: utf-8
+require 'carrierwave/processing/mime_types'
 
 class RepositoryUploader < CarrierWave::Uploader::Base
+  include CarrierWave::MimeTypes
+
+  process :set_content_type
 
   # Include RMagick or MiniMagick support:
   # include CarrierWave::RMagick

data/db/migrate/20131025085845_add_file_to_files.rb

@@ -0,0 +1,5 @@
+class AddFileToFiles < ActiveRecord::Migration
+  def change
+    add_column :repositories, :file, :string
+  end
+end

data/lib/repository_manager/has_repository.rb

@@ -14,16 +14,10 @@ module RepositoryManager
 
         # The own repositories
         has_many :repositories, as: :owner #, dependent: :destroy
+        # The share repositories
+        has_many :shared_repositories, through: :shares, source: :repository, class_name: 'Repository'
 
-        # The repositories shares
-        #if Rails::VERSION::MAJOR == 4
-        #  has_many :shares_repositories, -> { where can_read: true }, as: :item, through: :shares_items, class_name: 'Repository'
-        #else
-        # Rails 3 does it this way
-        has_many :shares_repositories, through: :shares, source: :repository, class_name: 'Repository'
-        #end
-
-        #scope :all_repositories, -> { self.repositories.shares_repositories }
+        #scope :all_repositories, -> { self.repositories.shared_repositories }
 
         #All repositories (own and shares)
         #has_many :all_repositories
@@ -33,6 +27,7 @@ module RepositoryManager
     end
 
     module LocalInstanceMethods
+
       # Share the repository with the items, with the repo_permissions
       # repo_permissions contains :
       #   <tt>:can_read</tt> - Item can download the repository
@@ -47,14 +42,14 @@ module RepositoryManager
         authorisations = get_authorisations(repository)
 
         # Here we look if the instance has the authorisation for making a share
-        if can_share(nil, authorisations)
+        if can_share?(nil, authorisations)
 
           repo_permissions = make_repo_permissions(repo_permissions, authorisations)
 
           share = Share.new(repo_permissions)
           share.owner = self
 
-          share.addItems(items, share_permissions)
+          share.add_items(items, share_permissions)
 
           repository.shares << share
           repository.save!
@@ -65,20 +60,20 @@ module RepositoryManager
         end
       end
 
-      # Create a folder with the name (name) in the directory (sourceFolder)
+      # Create a folder with the name (name) in the directory (source_folder)
       # Returns the object of the folder created if it is ok
       # Returns false if the folder is not created (no authorisation)
-      def createFolder(name, sourceFolder = nil)
+      def create_folder(name = 'New folder', source_folder = nil)
         # If he want to create a folder in a directory, we have to check if he have the authorisation
-        if can_create(sourceFolder)
+        if can_create?(source_folder)
 
           folder = Folder.new(name: name)
           folder.owner = self
           folder.save
 
           # If we want to create a folder in a folder, we have to check if we have the authorisation
-          if sourceFolder
-            sourceFolder.addRepository(folder)
+          if source_folder
+            source_folder.add_repository(folder)
           end
 
           return folder
@@ -88,40 +83,40 @@ module RepositoryManager
       end
 
       # Delete the repository
-      def deleteRepository(repository)
-        if can_delete(repository)
+      def delete_repository(repository)
+        if can_delete?(repository)
           repository.destroy
         else
           return false
         end
       end
 
-      # Create the file (file) in the directory (sourceFolder)
+      # Create the file (file) in the directory (source_folder)
       # Param file can be a File, or a instance of AppFile
       # Return the object of the file created if it is ok
       # Return false if the file is not created (no authorisation)
-      def createFile(file, sourceFolder = nil)
+      def create_file(file, source_folder = nil)
         # If he want to create a file in a directory, we have to check if he have the authorisation
-        if can_create(sourceFolder)
+        if can_create?(source_folder)
           if file.class.name == 'File'
-            appFile = AppFile.new
-            appFile.name = file
-            appFile.owner = self
-            appFile.save!
+            app_file = AppFile.new
+            app_file.file = file
+            app_file.owner = self
+            app_file.save
           elsif file.class.name == 'AppFile'
-            appFile = file
-            appFile.owner = self
-            appFile.save!
+            app_file = file
+            app_file.owner = self
+            app_file.save
           else
             return false
           end
 
-          # Add the file into the sourceFolder
-          if sourceFolder
-            sourceFolder.addRepository(file)
+          # Add the file into the source_folder
+          if source_folder
+            source_folder.add_repository(file)
           end
 
-          return appFile
+          return app_file
         else
           return false
         end
@@ -134,7 +129,7 @@ module RepositoryManager
       # Return true if the repository is nil (he as all authorisations on his own rep)
       def get_authorisations(repository=nil)
         # If repository is nil, he can do what he want
-        return true if repository==nil
+        return true if repository == nil
 
         # If the item is the owner, he can do what he want !
         if repository.owner == self
@@ -157,6 +152,18 @@ module RepositoryManager
         return false
       end
 
+      # Download a repository if the object can_read it
+      # If it is a file, he download the file
+      # If it is a folder, we check witch repository is in it, and witch he can_read
+      # We zip all the content that the object has access.
+      def download(repository)
+        if can_download?(repository)
+          repository.download(self)
+        else
+          false
+        end
+      end
+
       #Return the authorisations of the share (can_add, can_remove)
       def get_share_authorisations(share)
         share.get_authorisations(self)
@@ -164,53 +171,53 @@ module RepositoryManager
 
       # Return true if you can share the repo, else false
       # You can give the authorisations or the repository as params
-      def can_share(repository, authorisations = nil)
-        can_do('share', repository, authorisations)
+      def can_share?(repository, authorisations = nil)
+        can_do?('share', repository, authorisations)
       end
 
       # Return true if you can read the repo, else false
-      def can_read(repository, authorisations = nil)
-        can_do('read', repository, authorisations)
+      def can_read?(repository, authorisations = nil)
+        can_do?('read', repository, authorisations)
       end
 
       # Return true if you can download the repo, else false
       # Read = Download for the moment
-      def can_download(repository, authorisations = nil)
-        can_do('read', repository, authorisations)
+      def can_download?(repository, authorisations = nil)
+        can_do?('read', repository, authorisations)
       end
 
       # Return true if you can create in the repo, false else
-      def can_create(repository, authorisations = nil)
-        can_do('create', repository, authorisations)
+      def can_create?(repository, authorisations = nil)
+        can_do?('create', repository, authorisations)
       end
 
       # Return true if you can edit the repo, false else
-      def can_update(repository, authorisations = nil)
-        can_do('update', repository, authorisations)
+      def can_update?(repository, authorisations = nil)
+        can_do?('update', repository, authorisations)
       end
 
       # Return true if you can delete the repo, false else
-      def can_delete(repository, authorisations = nil)
-        can_do('delete', repository, authorisations)
+      def can_delete?(repository, authorisations = nil)
+        can_do?('delete', repository, authorisations)
       end
 
       # Return true if you can add an item in this share, false else
-      def can_add_to_share(share)
-        can_do_to_share('add', share)
+      def can_add_to?(share)
+        can_do_to?('add', share)
       end
 
       # Return true if you can remove an item in this share, false else
-      def can_remove_to_share(share)
-        can_do_to_share('remove', share)
+      def can_remove_from?(share)
+        can_do_to?('remove', share)
       end
 
       # You can here add new items in the share
       # Param item could be an object or an array of object
-      def addItemsToShare(share, items, share_permissions = nil)
+      def add_items_to(share, items, share_permissions = nil)
         authorisations = get_share_authorisations(share)
-        if can_add_to_share(share)
+        if can_add_to?(share)
           share_permissions = make_share_permissions(share_permissions, authorisations)
-          share.addItems(items, share_permissions)
+          share.add_items(items, share_permissions)
         else
           return false
         end
@@ -218,9 +225,9 @@ module RepositoryManager
 
       # You can here add new items in the share
       # Param item could be an object or an array of object
-      def removeItemsToShare(share, items)
-        if can_remove_to_share(share)
-          share.removeItems(items)
+      def remove_items_from(share, items)
+        if can_remove_from?(share)
+          share.remove_items(items)
         else
           return false
         end
@@ -229,8 +236,8 @@ module RepositoryManager
       private
 
       # Return if you can do or not this action in the share
-      def can_do_to_share(what, share, authorisations = nil)
-        if authorisations === nil
+      def can_do_to?(what, share, authorisations = nil)
+        if authorisations == nil
           authorisations = share.get_authorisations(self)
         end
         case what
@@ -242,7 +249,7 @@ module RepositoryManager
       end
 
       # Return if you can do or not this action (what)
-      def can_do(what, repository, authorisations = nil)
+      def can_do?(what, repository, authorisations = nil)
         #If we pass no authorisations we have to get it
         if authorisations === nil
           authorisations = get_authorisations(repository)

data/lib/repository_manager/version.rb

@@ -1,3 +1,3 @@
 module RepositoryManager
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/repository-manager.gemspec

@@ -11,9 +11,8 @@ Gem::Specification.new do |s|
   s.email       = ['texicitys@gmail.com']
   s.homepage    = 'https://github.com/Texicitys/repository-manager'
   s.summary     = "Ruby on Rails plugin (gem) for managing repositories (files/folders/permissions/shares)."
-  s.description = "This project is based on the need for a repository manager system for Collaide. Instead of creating my core repository manager system heavily dependent on our development, I'm trying to implement a generic and potent repository gem.
-                    After looking for a good gem to use I noticed the lack of repository gems and flexibility in them. RepositoryManager tries to be the more flexible possible. Each instance (users, groups, etc..) can have it own repositories (with files and folders). It can manage them easily (edit, remove, add, etc) and share them with other instance.
-                    This gem is my informatics project for the Master in University of Lausanne (CH)."
+  s.description = "This project is based on the need for a repository manager system for Collaide. A system for easily create/delete files and folders in a repository. For share these repositories easily with other object with a flexible and complete authorisations management.
+Each instance (users, groups, etc..) can have it own repositories (with files and folders). It can manage them easily (edit, remove, add, etc) and share them with other instance."
 
   #s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
   s.files         = `git ls-files`.split("\n")
@@ -29,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'ancestry'
   s.add_runtime_dependency 'carrierwave'
   s.add_runtime_dependency 'enumerize'
+  s.add_runtime_dependency 'rubyzip'
 end

data/spec/dummy/db/migrate/20131025085845_add_file_to_files.rb

@@ -0,0 +1,5 @@
+class AddFileToFiles < ActiveRecord::Migration
+  def change
+    add_column :repositories, :file, :string
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131025085844) do
+ActiveRecord::Schema.define(version: 20131025085845) do
 
   create_table "groups", force: true do |t|
     t.string   "name"
@@ -33,6 +33,7 @@ ActiveRecord::Schema.define(version: 20131025085844) do
     t.string  "type"
     t.float   "file_size"
     t.string  "content_type"
+    t.string  "file"
   end
 
   create_table "shares", force: true do |t|

data/spec/factories/app_file.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :app_file do
-    name { fixture_file }
+    file { fixture_file }
     #sequence :password do |n|
     #  'secret'
     #end

data/spec/has_repository_spec.rb

@@ -14,7 +14,7 @@ describe "HasRepository" do
 
   it "should be associate with shares" do
     share = Share.create
-    @user1.shares<<share
+    @user1.shares << share
     expect(@user1.shares.last).to eq(share)
   end
 
@@ -50,7 +50,7 @@ describe "HasRepository" do
     expect(@user3.shares.count).to eq(1)
     expect(@user1.shares_owners.count).to eq(1)
     expect(@user2.repositories.count).to eq(0)
-    #expect(@user2.shares_repositories.count).to eq(1)
+    #expect(@user2.shared_repositories.count).to eq(1)
 
     #expect(@user2.shares_owners.count).to eq(0)
     #expect(@user3.shares_owners.count).to eq(0)
@@ -197,14 +197,14 @@ describe "HasRepository" do
   it 'can share a repository with ancestor share permissions' do
     parent = FactoryGirl.create(:folder)
     parent.owner = @user3
-    middle = @user3.createFolder('Middle', parent)
-    children = @user3.createFolder('Children', middle)
+    middle = @user3.create_folder('Middle', parent)
+    children = @user3.create_folder('Children', middle)
 
     file = FactoryGirl.build(:app_file)
     file.owner = @user3
     file.save
 
-    children.addRepository(file)
+    children.add_repository(file)
 
     repo_permissions = {can_read: true, can_update: true, can_share: false}
     @user3.share(parent, @user1, repo_permissions)
@@ -219,15 +219,15 @@ describe "HasRepository" do
   end
 
   it "can create a folder" do
-    folder = @user1.createFolder('test folder')
+    folder = @user1.create_folder('test folder')
     #folder = @user1.repositories.last
     expect(folder.name).to eq('test folder')
     expect(folder.type).to eq('Folder')
   end
 
   it "can create a file" do
-    file = @user1.createFile(File.open("#{Rails.root}/../fixture/textfile.txt"))
-    expect(file.name.identifier).to eq('textfile.txt')
+    file = @user1.create_file(File.open("#{Rails.root}/../fixture/textfile.txt"))
+    expect(file.name).to eq('textfile.txt')
     expect(@user1.repositories.count).to eq(1)
   end
 

data/spec/models/repository_spec.rb

@@ -14,13 +14,13 @@ describe 'Repository' do
   end
 
   it 'can create a folder in it own folder' do
-    folder = @user1.createFolder('Folder1', @user1_folder)
+    folder = @user1.create_folder('Folder1', @user1_folder)
 
     expect(@user1_folder.has_children?).to eq(true)
   end
 
   it 'can\'t create a folder in another folder without permission' do
-    folder = @user2.createFolder('Folder1', @user1_folder)
+    folder = @user2.create_folder('Folder1', @user1_folder)
 
     expect(@user1_folder.has_children?).to eq(false)
     expect(folder).to eq(false)
@@ -28,32 +28,32 @@ describe 'Repository' do
 
   it 'can create a file into a folder' do
     file = FactoryGirl.build(:app_file)
-    theFile = @user1.createFile(file, @user1_folder)
+    theFile = @user1.create_file(file, @user1_folder)
 
     expect(@user1_folder.has_children?).to eq(true)
     expect(file).to eq(theFile)
   end
 
   it 'can\'t create a repo into a file' do
-    file = @user2.createFolder('Folder1', @user1_file)
+    file = @user2.create_folder('Folder1', @user1_file)
 
     expect(@user1_file.has_children?).to eq(false)
     expect(file).to eq(false)
   end
 
   it 'can delete a file' do
-    @user1.deleteRepository(@user1_file)
+    @user1.delete_repository(@user1_file)
     expect(@user1.repositories.count).to eq(1)
   end
 
   it 'can delete a folder an his files' do
-    @user1_folder.addRepository(@user1_file)
-    @user1.deleteRepository(@user1_folder)
+    @user1_folder.add_repository(@user1_file)
+    @user1.delete_repository(@user1_folder)
     expect(@user1.repositories.count).to eq(0)
   end
 
   it 'can\'t delete a repository without permission' do
-    @user2.deleteRepository(@user1_file)
+    @user2.delete_repository(@user1_file)
     expect(@user1.repositories.count).to eq(2)
   end
 
@@ -70,15 +70,35 @@ describe 'Repository' do
   end
 
   it 'can return only the share repositories' do
-    #expect(@user2.shares_repositories.count).to eq(0)
+    #expect(@user2.shared_repositories.count).to eq(0)
     @user1.share(@user1_file, @user2)
-    expect(@user2.shares_repositories.count).to eq(1)
+    expect(@user2.shared_repositories.count).to eq(1)
   end
 
   it 'can download a file' do
-    #expect(@user2.shares_repositories.count).to eq(0)
-    #@user1.download(@user1_file)
-    #expect(@user2.shares_repositories.count).to eq(1)
+    #expect(@user2.shared_repositories.count).to eq(0)
+    @user1_file.download
+    #expect(@user2.shared_repositories.count).to eq(1)
+  end
+
+  it 'user can download a file with permission' do
+    @user1.download(@user1_file)
+    #expect(@user2.shared_repositories.count).to eq(1)
+  end
+
+  it 'user can\'t download a file without permission' do
+    path = @user2.download(@user1_file)
+    expect(path).to eq(false)
+  end
+
+  it 'download the file if there is just one in a folder (no zip)' do
+    @user1_folder.add_repository(@user1_file)
+    @user1.download(@user1_folder)
+  end
+
+  it 'user can download a folder' do
+    folder = @user1.create_folder('Folder1', @user1_folder)
+
   end
 
 end

data/spec/models/share_spec.rb

@@ -13,56 +13,56 @@ describe 'Share' do
 
   it 'can add a item in his own share' do
     share = @user1.share(@user1_file, @user2, nil, {can_add: false, can_remove: false})
-    @user1.addItemsToShare(share, @user3)
-    expect(@user3.shares_repositories.count).to eq(1)
+    @user1.add_items_to(share, @user3)
+    expect(@user3.shared_repositories.count).to eq(1)
   end
 
   it 'can\'t add an item in a share without permission' do
     share = @user1.share(@user1_file, @user2, nil, {can_add: false, can_remove: false})
-    @user2.addItemsToShare(share, @user3)
-    expect(@user3.shares_repositories.count).to eq(0)
+    @user2.add_items_to(share, @user3)
+    expect(@user3.shared_repositories.count).to eq(0)
   end
 
   it 'can add an item in a share with permission' do
     share = @user1.share(@user1_file, @user2, nil, {can_add: true, can_remove: false})
-    @user2.addItemsToShare(share, @user3)
-    expect(@user3.shares_repositories.count).to eq(1)
+    @user2.add_items_to(share, @user3)
+    expect(@user3.shared_repositories.count).to eq(1)
   end
 
   it 'can remove an item in his own share' do
     share = @user1.share(@user1_file, @user2, nil, {can_add: false, can_remove: false})
-    @user1.removeItemsToShare(share, @user2)
-    expect(@user2.shares_repositories.count).to eq(0)
+    @user1.remove_items_from(share, @user2)
+    expect(@user2.shared_repositories.count).to eq(0)
   end
 
   it 'can remove an item in a share with permission' do
     share = @user1.share(@user1_file, @user2, nil, {can_add: false, can_remove: true})
-    @user1.addItemsToShare(share, @user3)
-    @user2.removeItemsToShare(share, @user3)
-    expect(@user3.shares_repositories.count).to eq(0)
+    @user1.add_items_to(share, @user3)
+    @user2.remove_items_from(share, @user3)
+    expect(@user3.shared_repositories.count).to eq(0)
   end
 
   it 'can\'t remove an item in a share without permission' do
     share = @user1.share(@user1_file, @user2, nil, {can_add: false, can_remove: false})
-    @user1.addItemsToShare(share, @user3)
-    @user2.removeItemsToShare(share, @user3)
-    expect(@user3.shares_repositories.count).to eq(1)
+    @user1.add_items_to(share, @user3)
+    @user2.remove_items_from(share, @user3)
+    expect(@user3.shared_repositories.count).to eq(1)
   end
 
   it 'can remove and add an array of items in a share with permission' do
     share = @user1.share(@user1_file, @user2, nil, {can_add: true, can_remove: true})
     user4 = FactoryGirl.create(:user)
-    @user2.addItemsToShare(share, [@user3, user4])
-    expect(user4.shares_repositories.count).to eq(1)
-    @user2.removeItemsToShare(share, [@user3, user4])
-    expect(user4.shares_repositories.count).to eq(0)
+    @user2.add_items_to(share, [@user3, user4])
+    expect(user4.shared_repositories.count).to eq(1)
+    @user2.remove_items_from(share, [@user3, user4])
+    expect(user4.shared_repositories.count).to eq(0)
   end
 
   it 'can\'t add an items in a share with permission that he has not' do
     share = @user1.share(@user1_file, @user2, nil, {can_add: true, can_remove: false})
-    @user2.addItemsToShare(share, @user3, {can_add:true, can_remove:true})
-    @user3.removeItemsToShare(share, @user2)
-    expect(@user2.shares_repositories.count).to eq(1)
+    @user2.add_items_to(share, @user3, {can_add:true, can_remove:true})
+    @user3.remove_items_from(share, @user2)
+    expect(@user2.shared_repositories.count).to eq(1)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repository-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,15 +123,30 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "This project is based on the need for a repository manager system
-  for Collaide. Instead of creating my core repository manager system heavily dependent
-  on our development, I'm trying to implement a generic and potent repository gem.\n
-  \                   After looking for a good gem to use I noticed the lack of repository
-  gems and flexibility in them. RepositoryManager tries to be the more flexible possible.
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'This project is based on the need for a repository manager system
+  for Collaide. A system for easily create/delete files and folders in a repository.
+  For share these repositories easily with other object with a flexible and complete
+  authorisations management.
+
   Each instance (users, groups, etc..) can have it own repositories (with files and
   folders). It can manage them easily (edit, remove, add, etc) and share them with
-  other instance.\n                    This gem is my informatics project for the
-  Master in University of Lausanne (CH)."
+  other instance.'
 email:
 - texicitys@gmail.com
 executables: []
@@ -153,6 +168,7 @@ files:
 - app/uploaders/repository_uploader.rb
 - db/migrate/20131018214212_create_repository_manager.rb
 - db/migrate/20131025085844_add_file_to_repositories.rb
+- db/migrate/20131025085845_add_file_to_files.rb
 - lib/generators/repository_manager/install_generator.rb
 - lib/generators/repository_manager/templates/initializer.rb
 - lib/repository-manager.rb
@@ -194,6 +210,7 @@ files:
 - spec/dummy/db/migrate/20131016194207_create_groups_users.rb
 - spec/dummy/db/migrate/20131018214212_create_repository_manager.rb
 - spec/dummy/db/migrate/20131025085844_add_file_to_repositories.rb
+- spec/dummy/db/migrate/20131025085845_add_file_to_files.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/.keep
@@ -271,6 +288,7 @@ test_files:
 - spec/dummy/db/migrate/20131016194207_create_groups_users.rb
 - spec/dummy/db/migrate/20131018214212_create_repository_manager.rb
 - spec/dummy/db/migrate/20131025085844_add_file_to_repositories.rb
+- spec/dummy/db/migrate/20131025085845_add_file_to_files.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/.keep