el_finder 1.0.5 → 1.0.6

data/lib/el_finder/connector.rb

@@ -407,7 +407,6 @@ module ElFinder
       }.merge(perms_for(pathname))
     end
 
-    # TODO - Implement link, linkTo, and parent
     def cdc_for(pathname)
       response = {
         :name => pathname.basename.to_s,
@@ -421,12 +420,6 @@ module ElFinder
           :size => 0,
           :mime => 'directory'
         )
-      elsif pathname.symlink?
-        response.merge!(
-          :link => 'FIXME',
-          :linkTo => 'FIXME',
-          :parent => 'FIXME'
-        )
       elsif pathname.file?
         response.merge!(
           :size => pathname.size, 
@@ -443,6 +436,14 @@ module ElFinder
 
       end
 
+      if pathname.symlink?
+        response.merge!(
+          :link => to_hash(ElFinder::Pathname.new_with_root(@root, pathname.readlink)), # hash of file to which point link
+          :linkTo => ElFinder::Pathname.new_with_root(@root, pathname.readlink).relative_path_from(pathname.dirname).to_s, # relative path to
+          :parent => to_hash(ElFinder::Pathname.new_with_root(@root, pathname.readlink.dirname)) # hash of directory in which is linked file 
+        )
+      end
+
       return response
     end
 

data/lib/el_finder/pathname.rb

@@ -25,6 +25,7 @@ module ElFinder
 
     #
     def self.new_with_root(root, path = '')
+      path = path.to_s.sub(root, '') if path.to_s[0,1] == '/'
       new(superclass.new(File.join(root, path)).cleanpath.to_s)
     end # of self.new_with_root
 

data/lib/el_finder/version.rb

@@ -1,3 +1,3 @@
 module ElFinder
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end 

data/test/test_el_finder_symlink.rb

@@ -0,0 +1,81 @@
+require 'el_finder_test_case'
+
+class TestElFinderSymlink < Test::Unit::TestCase
+
+  include ElFinderTestCase
+
+  ################################################################################
+
+  def test_ruby_symlink_creation
+    File.symlink(File.join(@vroot, 'pjkh.png'), File.join(@vroot, 'symlink.png'))
+    assert File.symlink?(File.join(@vroot, 'symlink.png'))
+    assert_equal File.join(@vroot, 'pjkh.png'), File.readlink(File.join(@vroot, 'symlink.png'))
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+  end
+
+  def test_same_directory
+    File.symlink(File.join(@vroot, 'pjkh.png'), File.join(@vroot, 'symlink.png'))
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    source = r[:cdc].find{|e| e[:name] == 'pjkh.png'}
+    target = r[:cdc].find{|e| e[:name] == 'symlink.png'}
+    assert_equal 'image/png', target[:mime]
+    assert_equal source[:hash], target[:link]
+    assert_equal 'pjkh.png', target[:linkTo]
+    assert_equal r[:cwd][:hash], target[:parent]
+  end
+
+  def test_sub_directory
+    File.symlink(File.join(@vroot, 'pjkh.png'), File.join(@vroot, 'foo', 'symlink.png'))
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    home = r[:cwd]
+    source = r[:cdc].find{|e| e[:name] == 'pjkh.png'}
+    foo = r[:cdc].find{|e| e[:name] == 'foo'}
+
+    h, r = @elfinder.run(:cmd => 'open', :target => foo[:hash])
+    target = r[:cdc].find{|e| e[:name] == 'symlink.png'}
+
+    assert_equal source[:hash], target[:link]
+    assert_equal '../pjkh.png', target[:linkTo]
+    assert_equal home[:hash], target[:parent]
+  end
+
+  def test_parent_directory
+    File.symlink(File.join(@vroot, 'foo', 'tom.txt'), File.join(@vroot, 'symlink.txt'))
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    target = r[:cdc].find{|e| e[:name] == 'symlink.txt'}
+    foo = r[:cdc].find{|e| e[:name] == 'foo'}
+
+    h, r = @elfinder.run(:cmd => 'open', :target => foo[:hash])
+    source = r[:cdc].find{|e| e[:name] == 'tom.txt'}
+
+    pp source
+    pp target
+
+    assert_equal source[:hash], target[:link]
+    assert_equal 'foo/tom.txt', target[:linkTo]
+    assert_equal foo[:hash], target[:parent]
+  end
+
+  def test_sibling_directory
+    FileUtils.mkdir(File.join(@vroot, 'bar'))
+    File.symlink(File.join(@vroot, 'foo', 'tom.txt'), File.join(@vroot, 'bar', 'symlink.txt'))
+
+    h, r = @elfinder.run(:cmd => 'open', :init => 'true', :target => '')
+    foo = r[:cdc].find{|e| e[:name] == 'foo'}
+    bar = r[:cdc].find{|e| e[:name] == 'bar'}
+
+    h, r = @elfinder.run(:cmd => 'open', :target => foo[:hash])
+    source = r[:cdc].find{|e| e[:name] == 'tom.txt'}
+
+    h, r = @elfinder.run(:cmd => 'open', :target => bar[:hash])
+    target = r[:cdc].find{|e| e[:name] == 'symlink.txt'}
+
+    assert_equal source[:hash], target[:link]
+    assert_equal '../foo/tom.txt', target[:linkTo]
+    assert_equal foo[:hash], target[:parent]
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: el_finder
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Philip Hallstrom
@@ -74,6 +74,7 @@ files:
 - test/test_el_finder_extractors.rb
 - test/test_el_finder_hash.rb
 - test/test_el_finder_permissions.rb
+- test/test_el_finder_symlink.rb
 has_rdoc: true
 homepage: http://github.com/phallstrom/el_finder
 licenses: []
@@ -126,3 +127,4 @@ test_files:
 - test/test_el_finder_extractors.rb
 - test/test_el_finder_hash.rb
 - test/test_el_finder_permissions.rb
+- test/test_el_finder_symlink.rb