Fixes #8

Change to ApplicationId
jamesmontemagno · Dec 14, 2017 · 728259d · 728259d
1 parent 29b9107
commit 728259d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -107,8 +107,8 @@ Regardless of implementation, Cache will always be stored in the default platfor
 
 ## Setup
 
-It is required that you set a UniqueId for your application so a folder is created specifically for your app on disk. This can be done with a static string on Barrel before calling ANY method:
+It is required that you set a ApplicationId for your application so a folder is created specifically for your app on disk. This can be done with a static string on Barrel before calling ANY method:
 
 ```
-Barrel.UniqueId = "your_unique_name_here";
+Barrel.ApplicationId = "your_unique_name_here";
 ```
diff --git a/src/MonkeyCache.LiteDB/Barrel.cs b/src/MonkeyCache.LiteDB/Barrel.cs
@@ -18,12 +18,12 @@ namespace MonkeyCache
     /// </summary>
     public class Barrel : IBarrel
     {
-        public static string UniqueId { get; set; } = string.Empty;
+        public static string ApplicationId { get; set; } = string.Empty;
         public static string EncryptionKey { get; set; } = string.Empty;
 
         static readonly Lazy<string> baseCacheDir = new Lazy<string>(() =>
         {
-            return Path.Combine(Utils.GetBasePath(UniqueId), "MonkeyCache");
+            return Path.Combine(Utils.GetBasePath(ApplicationId), "MonkeyCache");
         });
 
         readonly LiteDatabase db;

diff --git a/src/MonkeyCache.Shared/Utils.cs b/src/MonkeyCache.Shared/Utils.cs
@@ -13,10 +13,10 @@ namespace MonkeyCache
 {
     static class Utils
     {
-        public static string GetBasePath(string uniqueId)
+        public static string GetBasePath(string applicationId)
         {
-            if (string.IsNullOrWhiteSpace(uniqueId))
-                throw new ArgumentException("You must set a UniqueId for MonkeyCache by using Barrel.UniqueId.");
+            if (string.IsNullOrWhiteSpace(applicationId))
+                throw new ArgumentException("You must set a ApplicationId for MonkeyCache by using Barrel.ApplicationId.");
 
             var path = string.Empty;
             ///Gets full path based on device type.
@@ -29,7 +29,7 @@ public static string GetBasePath(string uniqueId)
 #else
             path = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
 #endif
-            return Path.Combine(path, uniqueId);
+            return Path.Combine(path, applicationId);
         }
     }
 }
diff --git a/src/MonkeyCache.TestApp/MainPage.xaml.cs b/src/MonkeyCache.TestApp/MainPage.xaml.cs
@@ -21,7 +21,7 @@ public MainPage()
             ButtonLoad.Clicked += ButtonLoad_Clicked;
             ButtonSave.Clicked += ButtonSave_Clicked;
 
-            Barrel.UniqueId = "com.refractored.monkeycachetest";
+            Barrel.ApplicationId = "com.refractored.monkeycachetest";
 
             var monkey = Barrel.Current.Get<Monkey>("monkey");
             if (monkey != null)

diff --git a/src/MonkeyCache.TestsLiteDB/BarrelTestsEncryption.cs b/src/MonkeyCache.TestsLiteDB/BarrelTestsEncryption.cs
@@ -20,8 +20,8 @@ public class BarrelEncryptionTests
         public void Setup()
         {
 
-            Barrel.UniqueId = "com.monkey.barrel.encrypt"; 
-            Barrel.EncryptionKey = Barrel.UniqueId;
+            Barrel.ApplicationId = "com.monkey.barrel.encrypt"; 
+            Barrel.EncryptionKey = Barrel.ApplicationId;
 
             url = "http://montemagno.com/monkeys.json";
             barrel = Barrel.Current;

diff --git a/src/MonkeyCache.TestsShared/BarrelTests.cs b/src/MonkeyCache.TestsShared/BarrelTests.cs
@@ -22,9 +22,9 @@ public void Setup()
         {
 
 #if SQLITE
-            Barrel.UniqueId = "com.refractored.monkeycache";
+            Barrel.ApplicationId = "com.refractored.monkeycache";
 #else
-            Barrel.UniqueId = "com.refractored.monkeycacheldb";
+            Barrel.ApplicationId = "com.refractored.monkeycacheldb";
 #endif
             url = "http://montemagno.com/monkeys.json";
             barrel = Barrel.Current;

diff --git a/src/MonkeyCache.TestsShared/HttpCacheTests.cs b/src/MonkeyCache.TestsShared/HttpCacheTests.cs
@@ -18,9 +18,9 @@ public class HttpCacheTests
         [TestInitialize]
         public void Setup()
         {
-            Barrel.UniqueId = "com.refractored.monkeycache";
+            Barrel.ApplicationId = "com.refractored.monkeycache";
             var path = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-            path = Path.Combine(path, Barrel.UniqueId);
+            path = Path.Combine(path, Barrel.ApplicationId);
             if (System.IO.File.Exists(path))
                 File.Delete(path);
             url = "http://montemagno.com/monkeys.json";

diff --git a/src/MonkeyCache/Barrel.cs b/src/MonkeyCache/Barrel.cs
@@ -14,12 +14,12 @@ namespace MonkeyCache
     /// </summary>
     public class Barrel : IBarrel
     {
-        public static string UniqueId { get; set; } = string.Empty;
+        public static string ApplicationId { get; set; } = string.Empty;
 
 
         static readonly Lazy<string> baseCacheDir = new Lazy<string>(() =>
         {
-            return Path.Combine(Utils.GetBasePath(UniqueId), "MonkeyCache");
+            return Path.Combine(Utils.GetBasePath(ApplicationId), "MonkeyCache");
         });
 
         readonly SQLiteConnection db;