Updated packages, fixed some bugs, added new functionality, and generated new NuGet packages

.gitignore

@@ -122,6 +122,9 @@ publish/
 *.[Pp]ublish.xml
 *.azurePubxml
 
+# NuGet Packages
+*.nupkg
+
 # NuGet Packages Directory
 packages/
 ## TODO: If the tool you use requires repositories.config uncomment the next line

Contributing.md

@@ -0,0 +1,7 @@
+Open TODO file, if there is one, and see if there is anywhere you can help.  Otherwise, look at the issues.  
+If you want to contribute, fork https://github.com/keithjjones/ArinWhois.NET and perform your modifications on the "devel" branch.
+If you send a pull request we will review the changes and merge them appropriately.
+
+The "master" branch is always the working code.  The "devel" branch is working code, but it hasn't been accepted into "master" for the entire project.
+Any other branch consisting of new features typically starts with "devel-" and contains the feature's name.  It may or may not be working depending on the contributor.  These
+branches are branched from the "devel" branch.

LICENSE → License.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 MaxHorstmann
+Copyright (c) 2014 MaxHorstmann, 2016 Keith J. Jones
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -11,46 +11,64 @@ This is a simple .NET client to access the RESTful API programmatically with a s
 Install
 ============
 
-Use the [NuGet](https://www.nuget.org/packages/ArinWhois) package, run the following command in the Package Manager Console:
+Use the [NuGet](https://www.nuget.org/packages/ArinWhois-VS2015) package, run the following command in the Package Manager Console:
 
-    PM> Install-Package ArinWhois
+    PM> Install-Package ArinWhois-VS2015
 
 
 
 Sample Usage
 ============
 
-    var arinClient = new ArinClient();
-
-    // Check single IP
-    var ipResponse = await arinClient.QueryIpAsync(IPAddress.Parse("69.63.176.0"));
-
-    Console.WriteLine(ipResponse.Network.Name);
-    Console.WriteLine(ipResponse.Network.NetBlocks.NetBlock.Cidr);
-
-    // Find out more about organization
-    var orgResponse = await arinClient.QueryResourceAsync(ipResponse.Network.OrgRef.Handle, 
+```csharp
+var arinClient = new ArinClient();
+
+// Check single IP
+var ipResponse = await arinClient.QueryIpAsync(IPAddress.Parse("69.63.176.0"));
+
+Console.WriteLine(ipResponse.Network.Name);
+Console.WriteLine(ipResponse.Network.NetBlocks.NetBlock.Cidr);
+
+// Find out more about organization or customer
+if (ipResponse.Network.OrgRef != null)
+{
+	var orgResponse = await arinClient.QueryResourceAsync(ipResponse.Network.OrgRef.Handle, 
 								ArinClient.ResourceType.Organization);
-    Console.WriteLine(orgResponse.Organization.Name);
-    Console.WriteLine(orgResponse.Organization.City);
-
+	Console.WriteLine(orgResponse.Organization.Name);
+	Console.WriteLine(orgResponse.Organization.City);
+}
+else if (ipResponse.Network.CustomerRef != null)
+{
+	var customerResponse = await arinClient.QueryResourceAsync(ipResponse.Network.CustomerRef.Handle, 
+								ArinClient.ResourceType.Customer);
+	Console.WriteLine(customerResponse.Organization.Name);
+	Console.WriteLine(customerResponse.Organization.City);
+}
+```
 
 If you don't wanna do async, use `.Result`: 
 
+```csharp
     var response = arinClient.QueryIpAsync(IPAddress.Parse("69.63.176.0")).Result;
-
+```
+
 But you should do async, really.
 
 
 Limitations
 ===========
 * Read-only
+* Make sure nuget.exe is in your path for building release.
 
 
 
 Contributors
 ============
 * [MaxHorstmann](https://github.com/MaxHorstmann) (Max Horstmann)
+* [KeithJJones] (https://github.com/keithjjones) (Keith J. Jones)
 
+More Reading
+============
+* [ARIN's Documentation on the RESTful Interface] (https://www.arin.net/resources/whoisrws/whois_api.html)
 
 

src/ArinWhois.Tests/ApiTests.cs

@@ -19,31 +19,207 @@ public void TestIpFound()
 
             Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
             Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
-            Assert.IsNotNull(ipResponse.Network.NetBlocks.NetBlock);
-            Assert.IsNotNull(ipResponse.Network.NetBlocks.NetBlock.CidrLength.Value);
-            Assert.IsNotNull(ipResponse.Network.NetBlocks.NetBlock.Description);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
 
             Assert.IsNotNull(ipResponse.Network.OrgRef.Name);
-            Assert.AreEqual(ipResponse.Network.OrgRef.Name, "Facebook, Inc.");
+            Assert.AreEqual("Facebook, Inc.", ipResponse.Network.OrgRef.Name);
 
             var organizationHandle = ipResponse.Network.OrgRef.Handle;
-            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle, ArinClient.ResourceType.Organization).Result;
+            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle.ToString(), ArinClient.ResourceType.Organization).Result;
 
             Assert.IsNotNull(organizationResponse);
-            Assert.AreEqual(organizationResponse.Organization.City.Value, "Menlo Park");
+            Assert.AreEqual("UNITED STATES", organizationResponse.Organization.iso3166_1.Name.Value);
+            Assert.AreEqual("Menlo Park", organizationResponse.Organization.City.Value);
+            Assert.AreEqual("CA", organizationResponse.Organization.iso3166_2.Value);
+            Assert.AreEqual("94025", organizationResponse.Organization.PostalCode.Value);
+        }
+
+        [TestMethod]
+        public void TestIp2Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("98.155.64.40")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
 
+            Assert.IsNotNull(ipResponse.Network.OrgRef.Name);
+            Assert.AreEqual("Time Warner Cable Internet LLC", ipResponse.Network.OrgRef.Name);
+
+            var organizationHandle = ipResponse.Network.OrgRef.Handle;
+            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle.ToString(), ArinClient.ResourceType.Organization).Result;
+
+            Assert.IsNotNull(organizationResponse);
+            Assert.AreEqual("UNITED STATES", organizationResponse.Organization.iso3166_1.Name.Value);
+            Assert.AreEqual("Herndon", organizationResponse.Organization.City.Value);
+            Assert.AreEqual("VA", organizationResponse.Organization.iso3166_2.Value);
+            Assert.AreEqual("20171", organizationResponse.Organization.PostalCode.Value);
         }
 
         [TestMethod]
-        public void TestIpNotFound()
+        public void TestIp3Found()
         {
             var arinClient = new ArinClient();
-            var response = arinClient.QueryIpAsync(IPAddress.Parse("108.33.73.20")).Result;
-            Assert.IsNull(response);
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("96.21.63.199")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
+
+            Assert.IsNull(ipResponse.Network.OrgRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef.Name);
+            Assert.AreEqual("Videotron Ltee", ipResponse.Network.CustomerRef.Name);
+
+            var customerHandle = ipResponse.Network.CustomerRef.Handle;
+            var customerResponse = arinClient.QueryResourceAsync(customerHandle.ToString(), ArinClient.ResourceType.Customer).Result;
+
+            Assert.IsNotNull(customerResponse);
+            Assert.AreEqual("CANADA", customerResponse.Customer.iso3166_1.Name.Value);
+            Assert.AreEqual("Montreal", customerResponse.Customer.City.Value);
+            Assert.AreEqual("QC", customerResponse.Customer.iso3166_2.Value);
+            Assert.AreEqual("H2X 3W4", customerResponse.Customer.PostalCode.Value);
         }
 
+        [TestMethod]
+        public void TestIp4Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("98.176.133.1")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
 
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
 
+            Assert.IsNull(ipResponse.Network.OrgRef);
 
+            Assert.IsNotNull(ipResponse.Network.CustomerRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef.Name);
+            Assert.AreEqual("Cox Communications", ipResponse.Network.CustomerRef.Name);
+
+            var customerHandle = ipResponse.Network.CustomerRef.Handle;
+            var customerResponse = arinClient.QueryResourceAsync(customerHandle.ToString(), ArinClient.ResourceType.Customer).Result;
+
+            Assert.IsNotNull(customerResponse);
+            Assert.AreEqual("UNITED STATES", customerResponse.Customer.iso3166_1.Name.Value);
+            Assert.AreEqual("Atlanta", customerResponse.Customer.City.Value);
+            Assert.AreEqual("GA", customerResponse.Customer.iso3166_2.Value);
+            Assert.AreEqual("30319", customerResponse.Customer.PostalCode.Value);
+        }
+
+        [TestMethod]
+        public void TestIp5Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("108.234.177.20")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
+
+            Assert.IsNotNull(ipResponse.Network.OrgRef);
+
+            Assert.IsNotNull(ipResponse.Network.OrgRef.Name);
+            Assert.AreEqual("AT&T Internet Services", ipResponse.Network.OrgRef.Name);
+
+            var organizationHandle = ipResponse.Network.OrgRef.Handle;
+            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle.ToString(), ArinClient.ResourceType.Organization).Result;
+
+            Assert.IsNotNull(organizationResponse);
+            Assert.AreEqual("UNITED STATES", organizationResponse.Organization.iso3166_1.Name.Value);
+            Assert.AreEqual("Richardson", organizationResponse.Organization.City.Value);
+            Assert.AreEqual("TX", organizationResponse.Organization.iso3166_2.Value);
+            Assert.AreEqual("75082", organizationResponse.Organization.PostalCode.Value);
+        }
+
+        [TestMethod]
+        public void TestIp6Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("174.65.101.118")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
+
+            Assert.IsNull(ipResponse.Network.OrgRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef);
+
+            Assert.IsNotNull(ipResponse.Network.CustomerRef.Name);
+            Assert.AreEqual("Cox Communications", ipResponse.Network.CustomerRef.Name);
+
+            var customerHandle = ipResponse.Network.CustomerRef.Handle;
+            var customerResponse = arinClient.QueryResourceAsync(customerHandle.ToString(), ArinClient.ResourceType.Customer).Result;
+
+            Assert.IsNotNull(customerResponse);
+            Assert.AreEqual("UNITED STATES", customerResponse.Customer.iso3166_1.Name.Value);
+            Assert.AreEqual("Atlanta", customerResponse.Customer.City.Value);
+            Assert.AreEqual("GA", customerResponse.Customer.iso3166_2.Value);
+            Assert.AreEqual("30319", customerResponse.Customer.PostalCode.Value);
+        }
+
+        [TestMethod]
+        public void TestIp7Found()
+        {
+            var arinClient = new ArinClient();
+            var ipResponse = arinClient.QueryIpAsync(IPAddress.Parse("174.34.144.69")).Result;
+
+            Assert.IsNotNull(ipResponse);
+            Assert.IsNotNull(ipResponse.Network);
+
+            Assert.IsTrue(ipResponse.Network.TermsOfUse.StartsWith("http"));
+            Assert.IsNotNull(ipResponse.Network.RegistrationDate.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0]);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].CidrLength.Value);
+            Assert.IsNotNull(ipResponse.Network.NetBlocks[0].Description);
+
+            Assert.IsNotNull(ipResponse.Network.OrgRef);
+
+            Assert.IsNotNull(ipResponse.Network.OrgRef.Name);
+            Assert.AreEqual("Ubiquity Server Solutions Seattle", ipResponse.Network.OrgRef.Name);
+
+            var organizationHandle = ipResponse.Network.OrgRef.Handle;
+            var organizationResponse = arinClient.QueryResourceAsync(organizationHandle.ToString(), ArinClient.ResourceType.Organization).Result;
+
+            Assert.IsNotNull(organizationResponse);
+            Assert.AreEqual("12101 Tukwila International Blvd", organizationResponse.Organization.StreetAddress.Line[0].Value.Trim());
+            Assert.AreEqual("Suite 100", organizationResponse.Organization.StreetAddress.Line[1].Value.Trim());
+            Assert.AreEqual("UNITED STATES", organizationResponse.Organization.iso3166_1.Name.Value);
+            Assert.AreEqual("Tukwila", organizationResponse.Organization.City.Value);
+            Assert.AreEqual("WA", organizationResponse.Organization.iso3166_2.Value);
+            Assert.AreEqual("98168", organizationResponse.Organization.PostalCode.Value);
+        }
     }
 }

src/ArinWhois.Tests/ArinWhois.Tests.csproj

@@ -35,7 +35,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Jil, Version=2.12.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Jil.2.12.1\lib\net45\Jil.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Sigil, Version=4.5.1.0, Culture=neutral, PublicKeyToken=2d06c3494341c8ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\Sigil.4.5.1\lib\net45\Sigil.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -59,6 +69,10 @@
       <Name>ArinWhois</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>

src/ArinWhois.Tests/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Sigil" publicKeyToken="2d06c3494341c8ab" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.5.1.0" newVersion="4.5.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

src/ArinWhois.Tests/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Jil" version="2.12.1" targetFramework="net45" />
+  <package id="Sigil" version="4.5.1" targetFramework="net45" />
+</packages>