el_finder 1.0.14 → 1.0.15

data/lib/el_finder/connector.rb

@@ -409,7 +409,7 @@ module ElFinder
       else
         begin
           target.unlink
-          if (thumbnail = thumbnail_for(target)).file?
+          if @options[:thumbs] && (thumbnail = thumbnail_for(target)).file?
             thumbnail.unlink
           end
         rescue
@@ -493,7 +493,7 @@ module ElFinder
     def tree_for(root)
       root.children.
       select{ |child| child.directory? }.
-      reject{ |child| child.to_s == @thumb_directory.to_s }.
+      reject{ |child| @options[:thumbs] && child.to_s == @thumb_directory.to_s }.
       sort_by{|e| e.basename.to_s.downcase}.
       map { |child|
           {:name => child.basename.to_s,

data/lib/el_finder/version.rb

@@ -1,3 +1,3 @@
 module ElFinder
-  VERSION = '1.0.14'
+  VERSION = '1.0.15'
 end 

data/test/test_el_finder_thumbs.rb

@@ -106,6 +106,20 @@ class TestElFinderThumbs < Test::Unit::TestCase
     assert !File.exist?(elfinder_thumb)
   end
 
+  def test_thumbnail_removal_not_attempted_when_thumbs_not_enabled_and_image_removed
+    @elfinder.options = { :thumbs => false }
+    pjkh_thumb = File.join(@vroot, '.thumbs', "#{@elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'pjkh.png'))}.png")
+    elfinder_thumb = File.join(@vroot, '.thumbs', "#{@elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'elfinder.png'))}.png")
+    Dir.mkdir(File.join(@vroot, '.thumbs'))
+    FileUtils.touch pjkh_thumb
+    FileUtils.touch elfinder_thumb
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    h, r = @elfinder.run(:cmd => 'rm', :targets => r[:cdc].select{|e| e[:mime] =~ /image/}.map{|e| e[:hash]})
+
+    assert_nil r[:error]
+  end
+
   def test_open_response_contains_tmb_details_if_thumbs_exist
     @elfinder.options = { :thumbs => true }
     h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: el_finder
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 0
-  - 14
-  version: 1.0.14
+  - 15
+  version: 1.0.15
 platform: ruby
 authors: 
 - Philip Hallstrom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -07:00
+date: 2011-05-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency