Merge branch 'drusellers-AddHeader'

Author: Michael Hallett

.nuget/Signed/RestSharp.Build.dll

@@ -36,6 +36,12 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\RestSharp.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v3.5" />
@@ -50,6 +56,11 @@
     <Compile Include="NuSpecUpdateTask.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\RestSharp.snk">
+      <Link>RestSharp.snk</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy /Y $(TargetPath) $(SolutionDir).nuget\Signed\$(TargetFileName)</PostBuildEvent>

RestSharp.Build/RestSharp.Build.Signed.csproj

@@ -52,9 +52,6 @@
     <AssemblyOriginatorKeyFile>..\RestSharp.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>

RestSharp.IntegrationTests/RestSharp.IntegrationTests.Signed.csproj

@@ -49,9 +49,6 @@
     <DelaySign>false</DelaySign>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />

RestSharp.Net4/RestSharp.Net4.Signed.csproj

@@ -0,0 +1,17 @@
+namespace RestSharp.Tests
+{
+    using Xunit;
+
+    public class AddRangeTests
+    {
+        [Fact]
+        public void ShouldParseOutRangeSpecifier()
+        {
+            var restClient = new RestClient("http://localhost");
+            var req = new RestRequest("bob", Method.GET);
+            
+            req.AddHeader("Range", "pages=1-2");
+            var resp = restClient.Execute(req);
+        }
+    }
+}

RestSharp.Tests/AddRangeTests.cs

@@ -60,6 +60,12 @@
     </DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\RestSharp.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v3.5" />
@@ -83,6 +89,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AddRangeTests.cs" />
+    <Compile Include="InterfaceImplementationTests.cs" />
+    <Compile Include="OAuthTests.cs" />
     <Compile Include="SampleClasses\EmployeeTracker.cs" />
     <Compile Include="SampleClasses\EnumTest.cs" />
     <Compile Include="SampleClasses\Goodreads.cs" />
@@ -124,7 +133,9 @@
     <Content Include="SampleData\boolean_from_number.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="SampleData\Goodreads.xml" />
+    <Content Include="SampleData\Goodreads.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="SampleData\iso8601datetimes.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -207,6 +218,9 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\RestSharp.snk">
+      <Link>RestSharp.snk</Link>
+    </None>
     <None Include="packages.config" />
     <Content Include="SampleData\restsharp.nuspec">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

RestSharp.Tests/RestSharp.Tests.Signed.csproj

@@ -82,6 +82,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="InterfaceImplementationTests.cs" />
+    <Compile Include="AddRangeTests.cs" />
     <Compile Include="OAuthTests.cs" />
     <Compile Include="SampleClasses\EmployeeTracker.cs" />
     <Compile Include="SampleClasses\EnumTest.cs" />

RestSharp.Tests/RestSharp.Tests.csproj

@@ -464,17 +464,18 @@ private void ProcessResponseStream(Stream webResponseStream, HttpResponse respon
 #if FRAMEWORK
         private void AddRange(HttpWebRequest r, string range)
         {
-            System.Text.RegularExpressions.Match m = System.Text.RegularExpressions.Regex.Match(range, "=(\\d+)-(\\d+)$");
+            System.Text.RegularExpressions.Match m = System.Text.RegularExpressions.Regex.Match(range, "(\\w+)=(\\d+)-(\\d+)$");
 
             if (!m.Success)
             {
                 return;
             }
 
-            int from = Convert.ToInt32(m.Groups[1].Value);
-            int to = Convert.ToInt32(m.Groups[2].Value);
+            string rangeSpecifier = m.Groups[1].Value;
+            int from = Convert.ToInt32(m.Groups[2].Value);
+            int to = Convert.ToInt32(m.Groups[3].Value);
 
-            r.AddRange(from, to);
+            r.AddRange(rangeSpecifier, from, to);
         }
 #endif
     }