Merge pull request #62 from StartAutomating/ConvertTo-PSSVG-Fix

Convert to pssvg fix

Author: StartAutomating

Assets/PSSVG.svg

@@ -1,3 +1,10 @@
+### 0.2.5:
+* ConvertTo-PSSVG improvements:
+  * Better at handling malformed XML (#59)
+  * Better at handling file input (#60, #61)
+
+---
+
 ### 0.2.4:
 * Adding ConvertTo-PSSVG (Fixes #53)
 * Updated Logo to use PowerShell Chevron (Fixes #52)
@@ -62,4 +69,4 @@
   * The script used to generate every SVG element (fixes #8)
   * [A github page](https://PSSVG.start-automating.com) (fixes #9)
 
----
+---

CHANGELOG.md

@@ -14,8 +14,9 @@ function ConvertTo-PSSVG
     .EXAMPLE
         ConvertTo-PSSVG -InputObject "<svg><circle cx='5' cy='5' r='3'></svg>"
     #>
-    param(
-    [Parameter(Mandatory)]
+    param(        
+    [Parameter(Mandatory,ValueFromPipeline,ValueFromPipelineByPropertyName)]
+    [Alias('Fullname')]
     $InputObject
     )
 
@@ -24,7 +25,7 @@ function ConvertTo-PSSVG
         filter ToPSSVG {
             if ($_.LocalName -eq '#whitespace') { return }
             if ($_.LocalName -eq '#text') {
-                "'$($_.Value -replace "'", "''")'"
+                (' ' * (4 * $indentDepth)) + "'$($_.Value -replace "'", "''")'"
             } elseif ($_.LocalName) {
                 $xin = $_
                 $svgCmdName = if ($xin.LocalName -ne 'SVG') {
@@ -67,17 +68,27 @@ function ConvertTo-PSSVG
     }
 
     process {
+        $originalInputObject = $InputObject
         # If the input looks like a URL
         if ($InputObject -match '^https{0,1}://') 
         {
             # go get it
             $InputObject = Invoke-RestMethod -Uri $InputObject
+            if ($InputObject -is [string]) {
+                $InputObject = ($InputObject -replace '^[^<]+') -as [xml]
+            }
         } elseif ($InputObject -isnot [xml] -and 
             $InputObject -isnot [Xml.XmlDocument] -and 
-            (-not $InputObject -as [xml])
+            (-not ($InputObject -as [xml]))
         ) {
             # If it's not XML and won't be XML, try loading it from a file.
-            $resolvedPath = $ExecutionContext.SessionState.Path.GetResolvedPSPathFromPSPath($InputObject)
+            $resolvedPath = 
+                if ($InputObject -is [IO.FileInfo]) {
+                    $InputObject.FullName
+                } else {
+                    $ExecutionContext.SessionState.Path.GetResolvedPSPathFromPSPath($InputObject)
+                }
+            
             if (-not $resolvedPath) { return }
             if ($resolvedPath) {
                 $inputObject = [xml][IO.File]::ReadAllText($resolvedPath)
@@ -89,7 +100,7 @@ function ConvertTo-PSSVG
 
         # If the input isn't XML at this point, error out.
         if ($InputObject -isnot [xml] -and $InputObject -isnot [Xml.XmlDocument]) {
-            Write-Error "Could not convert input to XML"
+            Write-Error "Could not convert input '$originalInputObject' to XML"
             return
         }
 

Commands/Common/ConvertTo-PSSVG.ps1

@@ -1,5 +1,5 @@
 @{
-    ModuleVersion     = '0.2.4'
+    ModuleVersion     = '0.2.5'
     Guid              = '77696e6e-0252-43f2-b914-2dfa63953c60'
     CompanyName       = 'Start-Automating'
     Copyright         = '2022 Start-Automating'
@@ -14,6 +14,13 @@
             ProjectURI = 'https://github.com/StartAutomating/PSSVG'
             LicenseURI = 'https://github.com/StartAutomating/PSSVG/blob/main/LICENSE'            
             ReleaseNotes = @'
+### 0.2.5:
+* ConvertTo-PSSVG improvements:
+  * Better at handling malformed XML (#59)
+  * Better at handling file input (#60, #61)
+
+---
+
 ### 0.2.4:
 * Adding ConvertTo-PSSVG (Fixes #53)
 * Updated Logo to use PowerShell Chevron (Fixes #52)

PSSVG.psd1

@@ -26,4 +26,20 @@ describe PSSVG {
                 }
         }
     }
+
+    context 'Converting SVGs' {
+        it 'Can convert SVGs to PSSVG' {
+            ConvertTo-PSSVG https://raw.githubusercontent.com/StartAutomating/PSSVG/main/Assets/PSSVG.svg | 
+                ForEach-Object { 
+                    $_.GetType() | Should -Be ([scriptblock])
+                }
+
+            Get-ChildItem -Path $PSScriptRoot -Filter *.svg |
+                Select-Object -First 1 |
+                ConvertTo-PSSVG |
+                ForEach-Object { 
+                    $_.GetType() | Should -Be ([scriptblock])
+                }
+        }
+    }
 }

PSSVG.tests.ps1

@@ -1,3 +1,10 @@
+### 0.2.5:
+* ConvertTo-PSSVG improvements:
+  * Better at handling malformed XML (#59)
+  * Better at handling file input (#60, #61)
+
+---
+
 ### 0.2.4:
 * Adding ConvertTo-PSSVG (Fixes #53)
 * Updated Logo to use PowerShell Chevron (Fixes #52)
@@ -63,3 +70,4 @@
   * [A github page](https://PSSVG.start-automating.com) (fixes #9)
 
 ---
+

docs/Assets/PSSVG.svg

@@ -42,7 +42,7 @@ ConvertTo-PSSVG -InputObject .\a.svg
 
 > **Position**: 1
 
-> **PipelineInput**:false
+> **PipelineInput**:true (ByValue, ByPropertyName)