Merge pull request #64 from Cimpress-MCP/us-auto-shorten

Do not auto-shorten US as well

Author: istanishev

.nuget/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EWSoftware.SHFB" version="2014.11.22.0" />
-  <package id="NUnit.Runners"  version="2.6.4" />
   <package id="coveralls.net" version="0.5.0" />
+  <package id="EWSoftware.SHFB" version="2014.11.22.0" />
+  <package id="NUnit.Runners" version="2.6.4" />
   <package id="OpenCover" version="4.5.3723" />
 </packages>

src/PostalCodes.UnitTests/Generated/USPostalCodeTests.gen.cs

@@ -8,7 +8,7 @@ internal class USPostalCodeTests
     {
 
         [TestCase("12346","12345")]
-        [TestCase("12346-1234","12345")]
+        [TestCase("12346-1234","12346-1233")]
         public void Predecessor_ValidInput_ReturnsCorrectPostalCode(string postalCode, string postalCodePredecessor)
         {
             var code = new USPostalCode(postalCode);
@@ -19,7 +19,7 @@ public void Predecessor_ValidInput_ReturnsCorrectPostalCode(string postalCode, s
         }
 
         [TestCase("12346","12347")]
-        [TestCase("12346-1234","12347")]
+        [TestCase("12346-1234","12346-1235")]
         public void Successor_ValidInput_ReturnsCorrectPostalCode(string postalCode, string postalCodeSuccessor)
         {
             var code = new USPostalCode(postalCode);

src/PostalCodes.UnitTests/PostalCodeRangeTests.cs

@@ -222,9 +222,15 @@ public static IEnumerable<ITestCaseData> Contains_WithPostalCode_TestCases
         {
             get
             {
-                var rangeUS = MakeRangeUS("28000 0000", "28000 9999");
-                yield return new TestCaseData(rangeUS, new USPostalCode("28000")).Returns(true);
-                yield return new TestCaseData(rangeUS, new USPostalCode("28000 1235")).Returns(true);
+                var rangeUS1 = MakeRangeUS("28000 0000", "28000 9999");
+                var rangeUS2 = MakeRangeUS("28000", "28000");
+                var rangeUS3 = MakeRangeUS("28000", "29000");
+                yield return new TestCaseData(rangeUS1, new USPostalCode("28000")).Returns(true);
+                yield return new TestCaseData(rangeUS1, new USPostalCode("28000 1235")).Returns(true);
+                yield return new TestCaseData(rangeUS2, new USPostalCode("28000")).Returns(true);
+                yield return new TestCaseData(rangeUS2, new USPostalCode("28000 1235")).Returns(true);
+                yield return new TestCaseData(rangeUS3, new USPostalCode("28000")).Returns(true);
+                yield return new TestCaseData(rangeUS3, new USPostalCode("28000 1235")).Returns(true);
             }
         }
 

src/PostalCodes/Generated/USPostalCode.gen.cs

@@ -40,7 +40,7 @@ public override int GetHashCode ()
                 RegexShort = new Regex("^[0-9]{5}$", RegexOptions.Compiled),
                 OutputDefault = "xxxxx-xxxx",
                 OutputShort = "xxxxx",
-                AutoConvertToShort = true,
+                AutoConvertToShort = false,
                 ShortExpansionAsLowestInRange = "0000",
                 ShortExpansionAsHighestInRange = "9999",
                 LeftPaddingCharacter = "0",

src/PostalCodes/PostalCodeRange.cs

@@ -12,7 +12,10 @@ public class PostalCodeRange : IEquatable<PostalCodeRange>, IComparable<PostalCo
         /// The lazy default
         /// </summary>
         private static readonly Lazy<PostalCodeRange> LazyDefault = new Lazy<PostalCodeRange>(() => new PostalCodeRange(null, null));
-        
+
+        private PostalCode _start;
+        private PostalCode _end;
+
         /// <summary>
         /// Gets the default.
         /// </summary>
@@ -43,8 +46,8 @@ public PostalCodeRange(PostalCode start, PostalCode end)
                     "PostalCodeRange end ({0}) can't be before start ({1})", end, start));
             }
 
-            Start = start != null ? start.ExpandPostalCodeAsLowestInRange() : start;
-            End = end != null ? end.ExpandPostalCodeAsHighestInRange() : end;
+            _start = start != null ? start.ExpandPostalCodeAsLowestInRange() : null;
+            _end = end != null ? end.ExpandPostalCodeAsHighestInRange() : null;
         }
 
         /// <summary>
@@ -69,13 +72,21 @@ public bool IsDefault
         /// Gets the start.
         /// </summary>
         /// <value>The start.</value>
-        public PostalCode Start { get; private set; }
+        public PostalCode Start
+        {
+            get { return _start; }
+            set { _start = value != null ? value.ExpandPostalCodeAsLowestInRange() : null; }
+        }
 
         /// <summary>
         /// Gets the end.
         /// </summary>
         /// <value>The end.</value>
-        public PostalCode End { get; private set; }
+        public PostalCode End
+        {
+            get { return _end; }
+            set { _end = value != null ? value.ExpandPostalCodeAsHighestInRange() : null; }
+        }
 
         /// <summary>
         /// Gets the predecessor postal code.
@@ -346,8 +357,9 @@ public static bool Contains(PostalCodeRange range, PostalCode specificCode)
             {
                 return false;
             }
-            return range.IsDefault 
-                || ((range.Start <= specificCode) && (specificCode <= range.End));
+
+            return range.IsDefault ||
+                   ((range.Start <= specificCode.ExpandPostalCodeAsLowestInRange()) && (specificCode.ExpandPostalCodeAsHighestInRange() <= range.End));
         }
 
         /// <summary>