Merge pull request #55 from phpcr/target_path_basename

Node Copy, Move, and Move append basename on target exist.

Author: dantleech

CHANGELOG.md

@@ -4,24 +4,27 @@ Changelog
 alpha-4
 -------
 
+### Features
+
+- [node] copy,move and clone - Target paths automatically append basename if target is a node.
 - [query] Always show path next to resultset
 
 alpha-3
 -------
 
 ### Features
 
-- [file]: `file:import` - New command to import files into the repository.
-- [node]: `node:list` Added `--level` option to rescursively show children nodes and properties.
-- [node]: `node:list` Show "unulfilled" property and child node definitions when listing node contents.
+- [file] `file:import` - New command to import files into the repository.
+- [node] `node:list` Added `--level` option to rescursively show children nodes and properties.
+- [node] `node:list` Show "unulfilled" property and child node definitions when listing node contents.
 
 ### Improvements
 
-- [export]: `session:export:view`: Added `--pretty` option to `session:export:view` command to output formatted XML.
-- [export]: `session:export:view`: Ask confirmation before overwriting file.
-- [shell]: Autocomplete completes property names in addition to node names in current path.
+- [export] `session:export:view`: Added `--pretty` option to `session:export:view` command to output formatted XML.
+- [export] `session:export:view`: Ask confirmation before overwriting file.
+- [shell] Autocomplete completes property names in addition to node names in current path.
 
 ### Bugs
 
-- [shell]: Aliases do not allow quoted arguments.
-- [shell]: Autocomplete causes segfault.
+- [shell] Aliases do not allow quoted arguments.
+- [shell] Autocomplete causes segfault.

features/phpcr_node_clone.feature

@@ -16,6 +16,12 @@ Feature: Clone a node from a given workspace to the current workspace
         And I save the session
         And there should exist a node at "/cms/clone"
 
+    Scenario: Clone node onto existing node 
+        Given I execute the "node:clone /cms/articles/article1 /cms/test" command
+        Then the command should not fail
+        And I save the session
+        And there should exist a node at "/cms/test/article1"
+
     Scenario: Clone node
         Given I execute the "node:clone  /tests_general_base /cms/foobar default_1" command
         Then the command should not fail

features/phpcr_node_copy.feature

@@ -20,3 +20,9 @@ Feature: Copy a node from a given workspace to the current workspace
         Given I execute the "node:copy /tests_general_base/index.txt /index.txt default_1" command
         Then the command should not fail
         And there should exist a node at "/index.txt"
+
+    Scenario: Copy node onto existing target
+        Given I execute the "node:copy /tests_general_base/index.txt /tests_general_base/daniel" command
+        Then the command should not fail
+        And I save the session
+        And there should exist a node at "/tests_general_base/daniel"

features/phpcr_node_move.feature

@@ -21,3 +21,10 @@ Feature: Move a node in the current session
         And I execute the "session:save" command
         And there should exist a node at "/barfoo"
         And there should not exist a node at "/tests_general_base/index.txt"
+
+    Scenario: Move onto existing target
+        Given the current node is "/tests_general_base/index.txt"
+        And I execute the "node:move . /tests_general_base/daniel" command
+        Then the command should not fail
+        And I execute the "session:save" command
+        And there should exist a node at "/tests_general_base/daniel/index.txt"

src/PHPCR/Shell/Console/Command/Phpcr/NodeCloneCommand.php

@@ -59,7 +59,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $session = $this->getHelper('phpcr')->getSession();
         $srcWorkspace = $input->getArgument('srcWorkspace');
         $srcAbsPath = $session->getAbsPath($input->getArgument('srcPath'));
-        $destAbsPath = $session->getAbsPath($input->getArgument('destPath'));
+        $destAbsPath = $session->getAbsTargetPath($srcAbsPath, $input->getArgument('destPath'));
         $removeExisting = $input->getOption('remove-existing');
 
         // todo: Check to ensure that source node has the referenceable mixin

src/PHPCR/Shell/Console/Command/Phpcr/NodeCopyCommand.php

@@ -88,7 +88,7 @@ public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getHelper('phpcr')->getSession();
         $srcAbsPath = $session->getAbsPath($input->getArgument('srcPath'));
-        $destAbsPath = $session->getAbsPath($input->getArgument('destPath'));
+        $destAbsPath = $session->getAbsTargetPath($srcAbsPath, $input->getArgument('destPath'));
         $srcWorkspace = $input->getArgument('srcWorkspace');
 
         $workspace = $session->getWorkspace();

src/PHPCR/Shell/Console/Command/Phpcr/NodeMoveCommand.php

@@ -52,8 +52,9 @@ protected function configure()
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $session = $this->getHelper('phpcr')->getSession();
-        $srcPath = $session->getAbsPath($input->getArgument('srcPath'));
-        $destPath = $session->getAbsPath($input->getArgument('destPath'));
+        $srcPath = $input->getArgument('srcPath');
+        $destPath = $input->getArgument('destPath');
+
         $session->move($srcPath, $destPath);
     }
 }

src/PHPCR/Shell/PhpcrSession.php

@@ -105,6 +105,32 @@ public function getAbsPath($path)
         return $absPath;
     }
 
+    /**
+     * Infer the absolute target path for a given source path.
+     *
+     * This means that if there is a node at targetPath then we
+     * will return append the  basename of $srcPath to $targetPath.
+     *
+     * @param string $srcPath
+     * @param string $targetPath
+     *
+     * @return string
+     */
+    public function getAbsTargetPath($srcPath, $targetPath)
+    {
+        $targetPath = $this->getAbsPath($targetPath);
+
+        try {
+            $this->getNode($targetPath);
+        } catch (PathNotFoundException $e) {
+            return $targetPath;
+        }
+
+        $basename = basename($this->getAbsPath($srcPath));
+
+        return $this->getAbsPath(sprintf('%s/%s', $targetPath, $basename));
+    }
+
     public function getAbsPaths($paths)
     {
         $newPaths = array();
@@ -200,9 +226,9 @@ public function propertyExists($path)
         return $this->session->propertyExists($this->getAbsPath($path));
     }
 
-    public function move($srcAbsPath, $destAbsPath)
+    public function move($srcPath, $destPath)
     {
-        return $this->session->move($this->getAbsPath($srcAbsPath), $this->getAbsPath($destAbsPath));
+        return $this->session->move($this->getAbsPath($srcPath), $this->getAbsTargetPath($srcPath, $destPath));
     }
 
     public function removeItem($path)

tests/PHPCR/Shell/PhpcrSessionTest.php

@@ -3,6 +3,7 @@
 namespace PHPCR\Shell;
 
 use PHPCR\SessionInterface;
+use PHPCR\PathNotFoundException;
 
 class PhpcrSessionTest extends \Phpunit_Framework_TestCase
 {
@@ -73,6 +74,9 @@ public function testMv($cwd, $relSrc, $relTar, $expSrc, $expTar)
         $this->phpcr->expects($this->once())
             ->method('move')
             ->with($expSrc, $expTar);
+        $this->phpcr->expects($this->once())
+            ->method('getNode')
+            ->will($this->throwException(new PathNotFoundException));
         $this->session->setCwd($cwd);
         $this->session->move($relSrc, $relTar);
     }