Merge pull request #83 from phpcr/no_aggregate_truncate_multivalue

Do not treat multivalue property values as a whole when truncating

Author: dantleech

CHANGELOG.md

@@ -10,6 +10,10 @@ dev-master
 - [general] The shell supports being embedded as a dependency
 - [node:edit] New command `node:edit` enables editing of entire node
 
+### Bug Fixes
+
+- [shell] Multivalue (and so multiline) property values are truncated as a single string (#70)
+
 alpha-4
 -------
 

spec/PHPCR/Shell/Console/Helper/ResultFormatterHelperSpec.php

@@ -4,9 +4,17 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
+use PHPCR\Shell\Console\Helper\TextHelper;
 
 class ResultFormatterHelperSpec extends ObjectBehavior
 {
+    function let(
+        TextHelper $textHelper
+    )
+    {
+        $this->beConstructedWith($textHelper);
+    }
+
     function it_is_initializable()
     {
         $this->shouldHaveType('PHPCR\Shell\Console\Helper\ResultFormatterHelper');

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -126,15 +126,16 @@ public function init()
     protected function registerHelpers()
     {
         $phpcrHelper = new PhpcrHelper($this->transportRegistry, $this->profile);
+        $textHelper = new TextHelper();
 
         $helpers = array(
+            $textHelper,
             new ConfigHelper(),
             new EditorHelper(),
             new NodeHelper(),
             new PathHelper(),
             new RepositoryHelper($phpcrHelper),
-            new ResultFormatterHelper(),
-            new TextHelper(),
+            new ResultFormatterHelper($textHelper),
             new TableHelper(),
             $phpcrHelper
         );

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

@@ -173,7 +173,7 @@ private function renderProperties($currentNode, $table, $spacers)
                     unset($propertyNames[$name]);
                 }
 
-                $valueCell = $this->textHelper->truncate($this->formatter->formatValue($property), 55);
+                $valueCell = $this->formatter->formatValue($property);
 
             } catch (\Exception $e) {
                 $valueCell = '<error>' . $e->getMessage() . '</error>';

src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php

@@ -9,6 +9,7 @@
 use PHPCR\PropertyType;
 use PHPCR\NodeInterface;
 use PHPCR\PropertyInterface;
+use PHPCR\Shell\Console\Helper\TextHelper;
 
 /**
  * Provide methods for formatting PHPCR objects
@@ -17,6 +18,13 @@
  */
 class ResultFormatterHelper extends Helper
 {
+    protected $textHelper;
+
+    public function __construct(TextHelper $textHelper)
+    {
+        $this->textHelper = $textHelper;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -87,7 +95,7 @@ public function normalizeValue($value)
                 } else {
                     $value = $value;
                 }
-                $value = '[' . $i . '] ' . $value;
+                $value = '[' . $i . '] ' . $this->textHelper->truncate($value);
                 $values[] = $value;
             }
 
@@ -98,7 +106,7 @@ public function normalizeValue($value)
             return $value->format('c');
         }
 
-        return $value;
+        return $this->textHelper->truncate($value);
     }
 
     public function formatValue(PropertyInterface $value, $showBinary = false)
@@ -133,6 +141,7 @@ public function formatValue(PropertyInterface $value, $showBinary = false)
                 return $value->getValue()->getIdentifier();
             case PropertyType::URI :
             case PropertyType::STRING :
+                return $this->textHelper->truncate($value->getValue());
             case PropertyType::NAME :
             case PropertyType::LONG :
             case PropertyType::DOUBLE :

src/PHPCR/Shell/Console/Helper/TextHelper.php

@@ -11,6 +11,12 @@
  */
 class TextHelper extends Helper
 {
+    /**
+     * @todo: Make this configurable
+     * @var integer
+     */
+    protected $truncateLength = 75;
+
     /**
      * {@inheritDoc}
      */
@@ -29,8 +35,12 @@ public function getName()
      *
      * @return string
      */
-    public function truncate($string, $length, $alignment = null, $delimString = null)
+    public function truncate($string, $length = null, $alignment = null, $delimString = null)
     {
+        if (null === $length) {
+            $length = $this->truncateLength;
+        }
+
         $alignment = $alignment === null ? 'left' : $alignment;
         $delimString = $delimString === null ? '...' : $delimString;
         $delimLen = strlen($delimString);