el_finder 1.0.9 → 1.0.10

data/lib/el_finder/connector.rb

@@ -75,12 +75,12 @@ module ElFinder
 
     #
     def to_hash(pathname)
-      Base64.encode64(pathname.path.to_s).chomp
+      Base64.encode64(pathname.path.to_s).chomp.tr("\n", "_")
     end # of to_hash
 
     #
     def from_hash(hash)
-      pathname = @root + Base64.decode64(hash)
+      pathname = @root + Base64.decode64(hash.tr("_", "\n"))
     end # of from_hash
 
     #
@@ -349,14 +349,18 @@ module ElFinder
       else
         @response[:current] = to_hash(@current)
         @response[:images] = {}
-        @current.children.select{|e| mime_handler.for(e) =~ /image/}.each_with_index do |img, idx|
+        idx = 0
+        @current.children.select{|e| mime_handler.for(e) =~ /image/}.each do |img|
           if idx >= @options[:thumbs_at_once]
             @response[:tmb] = true
             break
           end
           thumbnail = thumbnail_for(img)
-          image_handler.thumbnail(img, thumbnail, :width => @options[:thumbs_size].to_i, :height => @options[:thumbs_size].to_i)
-          @response[:images][to_hash(img)] = @options[:url] + '/' + thumbnail.path.to_s
+          unless thumbnail.file?
+            image_handler.thumbnail(img, thumbnail, :width => @options[:thumbs_size].to_i, :height => @options[:thumbs_size].to_i)
+            @response[:images][to_hash(img)] = @options[:url] + '/' + thumbnail.path.to_s
+            idx += 1
+          end
         end
       end
 

data/lib/el_finder/version.rb

@@ -1,3 +1,3 @@
 module ElFinder
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end 

data/test/test_el_finder_thumbs.rb

@@ -72,7 +72,7 @@ class TestElFinderThumbs < Test::Unit::TestCase
     h, r = @elfinder.run(:cmd => 'tmb', :current => '')
 
     elfinder_hash = @elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'elfinder.png'))
-    pjkh_hash = @elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'elfinder.png'))
+    pjkh_hash = @elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'pjkh.png'))
 
     assert_equal 2, r[:images].size
     assert_equal "/elfinder/.thumbs/#{elfinder_hash}.png", r[:images][elfinder_hash]
@@ -85,7 +85,7 @@ class TestElFinderThumbs < Test::Unit::TestCase
     h, r = @elfinder.run(:cmd => 'tmb', :current => '')
 
     elfinder_hash = @elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'elfinder.png'))
-    pjkh_hash = @elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'elfinder.png'))
+    pjkh_hash = @elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'pjkh.png'))
 
     assert_equal true, r[:tmb]
     assert_equal 1, r[:images].size
@@ -93,7 +93,7 @@ class TestElFinderThumbs < Test::Unit::TestCase
 
   def test_thumbnail_removed_when_image_removed
     @elfinder.options = { :thumbs => true }
-    pjkh_thumb = File.join(@vroot, '.thumbs', "#{@elfinder.to_hash(ElFinder::Pathname.new(@vroot, 'elfinder.png'))}.png")
+    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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: el_finder
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Philip Hallstrom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -08:00
+date: 2011-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: el_finder
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: elFinder server side connector for Ruby.