Merge pull request #104 from mfilippov/bug-77

Fix parsing id from URL. #77
mfilippov · Sep 29, 2017 · 1e331a8 · 1e331a8
2 parents 3d2ac02 + b60b01c
commit 1e331a8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/src/VimeoDotNet.Tests/Helpers/ModelHelpersTests.cs b/src/VimeoDotNet.Tests/Helpers/ModelHelpersTests.cs
@@ -0,0 +1,16 @@
+using Shouldly;
+using VimeoDotNet.Helpers;
+using Xunit;
+
+namespace VimeoDotNet.Tests.Helpers
+{
+    public class ModelHelpersTests
+    {
+        [Fact]
+        public void ShouldCorrectlyParseId()
+        {
+            ModelHelpers.ParseModelUriId("/a/b/c/12345").ShouldBe(12345);
+            ModelHelpers.ParseModelUriId("/a/b/c/12345:xyz").ShouldBe(12345);
+        }
+    }
+}
diff --git a/src/VimeoDotNet.Tests/VimeoDotNet.Tests.csproj b/src/VimeoDotNet.Tests/VimeoDotNet.Tests.csproj
@@ -82,6 +82,7 @@
   </Choose>
   <ItemGroup>
     <Compile Include="AuthorizationClientAsyncTests.cs" />
+    <Compile Include="Helpers\ModelHelpersTests.cs" />
     <Compile Include="Settings\SettingsLoader.cs" />
     <Compile Include="Settings\VimeoApiTestSettings.cs" />
     <Compile Include="VimeoClientAsyncTests.cs" />

diff --git a/src/VimeoDotNet/Helpers/ModelHelpers.cs b/src/VimeoDotNet/Helpers/ModelHelpers.cs
@@ -12,9 +12,14 @@ internal static class ModelHelpers
             {
                 return null;
             }
-            string[] pieces = uri.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
+            var pieces = uri.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
             long userId = 0;
-            if (long.TryParse(pieces[pieces.Length - 1], out userId))
+            var idString = pieces[pieces.Length - 1];
+            if (idString.Contains(":"))
+            {
+                idString = idString.Split(':')[0];
+            }
+            if (long.TryParse(idString, out userId))
             {
                 return userId;
             }

diff --git a/src/VimeoDotNet/Properties/AssemblyInfo.cs b/src/VimeoDotNet/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("VimeoDotNet")]
@@ -7,6 +8,7 @@
 [assembly: AssemblyCopyright("Copyright © 2014-2016, Stephen Commisso, Mikhael Filippov")]
 [assembly: AssemblyVersion("1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0")]
+[assembly: InternalsVisibleTo("VimeoDotNet.Tests")]
 
 [assembly: AssemblyDescription("Core library for accessing the Vimeo REST API")]