Merge pull request #5 from launchdarkly/dr/fixNumberComparison

Fix number comparison when evaluating rules

src/LaunchDarkly.Client/Feature.cs

@@ -36,7 +36,7 @@ public bool Evaluate(User user, bool defaultValue)
  if (Variations.Any(v => v.MatchesUserTarget(user)))
  return Variations.First(v => v.MatchesUserTarget(user)).Value;
 
- if(Variations.Any(v=>v.Matches(user)))
+ if (Variations.Any(v => v.Matches(user)))
  return Variations.First(v => v.Matches(user)).Value;
 
  var param = user.GetParam(Key, Salt);
@@ -65,10 +65,10 @@ public bool Matches(User user)
  {
  return Targets.Any(t => t.Matches(user));
  }
- 
+
  public bool MatchesUserTarget(User user)
  {
- if (UserTarget != null && UserTarget.Matches(user))
+  if (UserTarget != null && UserTarget.Matches(user))
  {
  return true;
  }
@@ -98,7 +98,6 @@ public bool Matches(User user)
  var uvs = (IEnumerable<object>)userValue;
  return Values.Intersect<object>(uvs).Any();
  }
-
  return Values.Contains(userValue);
  }
 
@@ -129,7 +128,7 @@ private Object GetUserValue(User user)
  if (token.Type == Newtonsoft.Json.Linq.JTokenType.Array)
  {
  var arr = (JArray)token;
- return arr.Values<JToken>().Select(i => ((JValue)i).Value); 
+ return arr.Values<JToken>().Select(i => ((JValue)i).Value);
  }
  else if (token.Type == JTokenType.Object)
  {
@@ -138,7 +137,7 @@ private Object GetUserValue(User user)
  else
  {
  var val = (JValue)token;
- return val.Value; 
+ return val.Value;
  }
  }
  }

src/LaunchDarkly.Client/LaunchDarkly.Client.csproj

@@ -36,9 +36,9 @@
  </PropertyGroup>
  <ItemGroup>
  <Reference Include="Microsoft.CSharp" />
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
  </Reference>
  <Reference Include="System" />
  <Reference Include="System.configuration" />

src/LaunchDarkly.Client/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersion("1.0.0")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyInformationalVersion("1.0.1")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]

src/LaunchDarkly.Client/User.cs

@@ -151,7 +151,7 @@ public static User AndCustomAttribute(this User user, string attribute, int valu
  if (attribute == string.Empty)
  throw new ArgumentException("Attribute Name can not be empty");
 
- user.Custom.Add(attribute, new JValue(value));
+ user.Custom.Add(attribute, new JValue((double)value));
 
  return user;
  }
@@ -175,5 +175,15 @@ public static User AndCustomAttribute(this User user, string attribute, List<str
 
  return user;
  }
+
+ public static User AndCustomAttribute(this User user, string attribute, List<int> value)
+ {
+ if (attribute == string.Empty)
+ throw new ArgumentException("Attribute Name can not be empty");
+
+ user.Custom.Add(attribute, new JArray(value.ToArray()));
+
+ return user;
+ }
  }
 }

src/LaunchDarkly.Client/app.config

@@ -4,7 +4,7 @@
  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
  <dependentAssembly>
  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
  </dependentAssembly>
  <dependentAssembly>
  <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

src/LaunchDarkly.Client/packages.config

@@ -5,6 +5,6 @@
  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
  <package id="NuGet.CommandLine" version="3.4.3" targetFramework="net45" developmentDependency="true" />
 </packages>

src/LaunchDarkly.Tests/FeatureTest.cs

@@ -1,5 +1,6 @@
 using LaunchDarkly.Client;
 using Moq;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using RichardSzalay.MockHttp;
 using System.Collections.Generic;
@@ -84,6 +85,45 @@ public void IfAUserHasCustomListAttributes_TargetRulesMatch()
  Assert.AreEqual(true, target.Matches(user));
  }
 
+ [Test]
+ public void IfAUserHasCustomAttributeAsFloat_TargetRulesMatch()
+ {
+ var user = User.WithKey("anyUser").AndCustomAttribute("numbers", 1362823F);
+ var target = new TargetRule();
+
+ target.Attribute = "numbers";
+ target.Op = "in";
+ target.Values = new List<object>() { 1362823F };
+
+ Assert.AreEqual(true, target.Matches(user));
+ }
+
+ [Test]
+ public void IfAUserHasCustomAttributeAsInteger_TargetRulesMatch()
+ {
+ var user = User.WithKey("anyUser").AndCustomAttribute("numbers", 1362823);
+ var target = new TargetRule();
+
+ target.Attribute = "numbers";
+ target.Op = "in";
+ target.Values = new List<object>() { 1362823.0 };
+
+ Assert.AreEqual(true, target.Matches(user));
+ }
+
+ [Test]
+ public void IfAUserHasCustomListAttributeAsIntegers_TargetRulesMatch()
+ {
+ var user = User.WithKey("anyUser").AndCustomAttribute("numbers", new List<int>() { 1362823 });
+ var target = new TargetRule();
+
+ target.Attribute = "numbers";
+ target.Op = "in";
+ target.Values = new List<object>() { 55, 1362823 };
+
+ Assert.AreEqual(true, target.Matches(user));
+ }
+
  [Test]
  public void IfAUserHasNonMatchingCustomListAttributes_TargetRulesDoNotMatch()
  {

src/LaunchDarkly.Tests/LaunchDarkly.Tests.csproj

@@ -39,8 +39,8 @@
  <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">

src/LaunchDarkly.Tests/app.config

@@ -8,7 +8,7 @@
  </dependentAssembly>
  <dependentAssembly>
  <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
  </dependentAssembly>
  <dependentAssembly>
  <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

src/LaunchDarkly.Tests/packages.config

@@ -5,7 +5,7 @@
  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net451" userInstalled="true" />
  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net451" userInstalled="true" />
  <package id="Moq" version="4.2.1510.2205" targetFramework="net451" userInstalled="true" />
- <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net451" userInstalled="true" />
+ <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" userInstalled="true" />
  <package id="NLog" version="4.3.1" targetFramework="net451" userInstalled="true" />
  <package id="NLog.Config" version="4.3.1" targetFramework="net451" userInstalled="true" />
  <package id="NLog.Schema" version="4.3.0" targetFramework="net451" userInstalled="true" />