el_finder 1.0.19 → 1.0.20

data/lib/el_finder/connector.rb

@@ -20,7 +20,7 @@ module ElFinder
       :archivers => {},
       :extractors => {},
       :home => 'Home',
-      :default_perms => {:read => true, :write => true, :rm => true},
+      :default_perms => {:read => true, :write => true, :rm => true, :hidden => false },
       :perms => [],
       :thumbs => false,
       :thumbs_directory => '.thumbs',
@@ -124,7 +124,9 @@ module ElFinder
         command_not_implemented
       elsif target.directory?
         @response[:cwd] = cwd_for(target)
-        @response[:cdc] = target.children.sort_by{|e| e.basename.to_s.downcase}.map{|e| cdc_for(e)}.compact
+        @response[:cdc] = target.children.
+          reject{ |child| perms_for(child)[:hidden]}.
+          sort_by{|e| e.basename.to_s.downcase}.map{|e| cdc_for(e)}.compact
 
         if @params[:tree]
           @response[:tree] = {
@@ -147,7 +149,7 @@ module ElFinder
 
       else
         @response[:error] = "Directory does not exist"
-        _open(@root)
+        _open(@root) if File.directory?(@root)
       end
 
     end # of open
@@ -341,7 +343,7 @@ module ElFinder
 
     #
     def _archive
-      @response[:error] = 'Invalid Parameters' and return unless !@targets.nil? && @targets.all?{|e| e.exist?} && @current.directory?
+      @response[:error] = 'Invalid Parameters' and return unless !@targets.nil? && @targets.all?{|e| e && e.exist?} && @current && @current.directory?
       @response[:error] = 'Access Denied' and return unless !@targets.nil? && @targets.all?{|e| perms_for(e)[:read]} && perms_for(@current)[:write] == true
       @response[:error] = 'No archiver available for this file type' and return if (archiver = @options[:archivers][@params[:type]]).nil?
       extension = archiver.shift
@@ -504,7 +506,9 @@ module ElFinder
     #
     def tree_for(root)
       root.child_directories.
-      reject{ |child| @options[:thumbs] && child.to_s == @thumb_directory.to_s }.
+      reject{ |child| 
+        ( @options[:thumbs] && child.to_s == @thumb_directory.to_s ) || perms_for(child)[:hidden]
+      }.
       sort_by{|e| e.basename.to_s.downcase}.
       map { |child|
           {:name => child.basename.to_s,
@@ -531,13 +535,22 @@ module ElFinder
       response[:rm] &&= specific_perm_for(pathname, :rm)
       response[:rm] &&= @options[:default_perms][:rm]
 
+      response[:hidden] = false
+      response[:hidden] ||= specific_perm_for(pathname, :hidden)
+      response[:hidden] ||= @options[:default_perms][:hidden]
+
       response
     end # of perms_for
 
     #
     def specific_perm_for(pathname, perm)
       pathname = pathname.path if pathname.is_a?(ElFinder::Pathname)
-      @options[:perms].select{ |k,v| pathname.to_s.send((k.is_a?(String) ? :== : :match), k) }.none?{|e| e.last[perm] == false}
+      matches = @options[:perms].select{ |k,v| pathname.to_s.send((k.is_a?(String) ? :== : :match), k) }
+      if perm == :hidden
+        matches.one?{|e| e.last[perm] }
+      else
+        matches.none?{|e| e.last[perm] == false}
+      end
     end # of specific_perm_for
     
     #

data/lib/el_finder/version.rb

@@ -1,3 +1,3 @@
 module ElFinder
-  VERSION = '1.0.19'
+  VERSION = '1.0.20'
 end 

data/test/test_el_finder_permissions.rb

@@ -358,5 +358,24 @@ class TestElFinder < Test::Unit::TestCase
     assert_equal '100x100', ElFinder::Image.size(File.join(@vroot, 'pjkh.png')).to_s
   end
 
+  
+  def test_hidden_permissions
+    @elfinder.options = {
+      :perms => {
+        'README.txt' => { :hidden => true }
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    assert_nil r[:cdc].find{|e| e[:name] == 'README.txt'}
+
+    @elfinder.options = {
+      :perms => {
+        'README.txt' => { :hidden => false }
+      }
+    }
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    assert_not_nil r[:cdc].find{|e| e[:name] == 'README.txt'}
+  end
+
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: el_finder
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 1
   - 0
-  - 19
-  version: 1.0.19
+  - 20
+  version: 1.0.20
 platform: ruby
 authors: 
 - Philip Hallstrom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-27 00:00:00 Z
+date: 2012-04-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: image_size
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: el_finder
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: elFinder server side connector for Ruby.