bridge to project assembly. changed ravencontext to implement IDocSes…

…sion.
ronnieoverby · Apr 17, 2012 · 1d5822f · 1d5822f
1 parent 2bd9ffb
commit 1d5822f
Show file tree

Hide file tree

Showing 32 changed files with 96 additions and 69 deletions.
diff --git a/RavenLinqpadDriver.Bridge/ConnectionInfo.cs b/RavenLinqpadDriver.Bridge/ConnectionInfo.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Net;
+
+namespace RavenLinqpadDriver.Bridge
+{
+    public class ConnectionInfo
+    {
+        public string Url { get; set; }
+        public string DefaultDatabase { get; set; }
+        public NetworkCredential Credentials { get; set; }
+        public Guid? ResourceManagerId { get; set; }
+
+
+    }
+}
diff --git a/RavenLinqpadDriver.Bridge/IConfigureDocumentStore.cs b/RavenLinqpadDriver.Bridge/IConfigureDocumentStore.cs
diff --git a/RavenLinqpadDriver.Bridge/ICreateDocumentStore.cs b/RavenLinqpadDriver.Bridge/ICreateDocumentStore.cs
@@ -0,0 +1,14 @@
+using Raven.Client;
+
+namespace RavenLinqpadDriver.Bridge
+{
+    public interface ICreateDocumentStore
+    {
+        /// <summary>
+        /// Creates an IDocumentStore.
+        /// </summary>
+        /// <param name="connectionInfo">The connection information for a RavenDB database.</param>
+        /// <returns>An IDocumentStore.</returns>
+        IDocumentStore CreateDocumentStore(ConnectionInfo connectionInfo);
+    }
+}
diff --git a/RavenLinqpadDriver.Bridge/RavenLinqpadDriver.Bridge.csproj b/RavenLinqpadDriver.Bridge/RavenLinqpadDriver.Bridge.csproj
@@ -53,7 +53,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IConfigureDocumentStore.cs" />
+    <Compile Include="ConnectionInfo.cs" />
+    <Compile Include="ICreateDocumentStore.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/RavenLinqpadDriver.Bridge35/Class1.cs b/RavenLinqpadDriver.Bridge35/Class1.cs
diff --git a/RavenLinqpadDriver.Bridge35/RavenLinqpadDriver.Bridge35.csproj b/RavenLinqpadDriver.Bridge35/RavenLinqpadDriver.Bridge35.csproj
@@ -51,10 +51,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\RavenLinqpadDriver.Bridge\IConfigureDocumentStore.cs">
-      <Link>IConfigureDocumentStore.cs</Link>
+    <Compile Include="..\RavenLinqpadDriver.Bridge\ConnectionInfo.cs">
+      <Link>ConnectionInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\RavenLinqpadDriver.Bridge\ICreateDocumentStore.cs">
+      <Link>ICreateDocumentStore.cs</Link>
     </Compile>
-    <Compile Include="Class1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/RavenLinqpadDriver.suo b/RavenLinqpadDriver.suo
diff --git a/RavenLinqpadDriver/AssemblyVersion.cs b/RavenLinqpadDriver/AssemblyVersion.cs
@@ -9,5 +9,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 using System.Reflection;
-[assembly: AssemblyVersion("0.3.701.0")]
-[assembly: AssemblyFileVersion("0.3.701.0")]
+[assembly: AssemblyVersion("0.3.888.0")]
+[assembly: AssemblyFileVersion("0.3.888.0")]
diff --git a/RavenLinqpadDriver/RavenConectionDialog.xaml.cs b/RavenLinqpadDriver/RavenConectionDialog.xaml.cs
@@ -5,9 +5,9 @@ namespace RavenLinqpadDriver
 {
     public partial class RavenConectionDialog : Window
     {
-        private RavenConnectionInfo _connInfo;
+        private RavenConnectionDialogViewModel _connInfo;
 
-        public RavenConectionDialog(RavenConnectionInfo conn)
+        public RavenConectionDialog(RavenConnectionDialogViewModel conn)
         {
             if (conn == null)
                 throw new ArgumentNullException("conn", "conn is null.");

diff --git a/RavenLinqpadDriver/RavenConnectionInfo.cs → ...dDriver/RavenConnectionDialogViewModel.cs b/RavenLinqpadDriver/RavenConnectionInfo.cs → ...dDriver/RavenConnectionDialogViewModel.cs
@@ -17,7 +17,7 @@
 
 namespace RavenLinqpadDriver
 {
-    public class RavenConnectionInfo : ViewModelBase
+    public class RavenConnectionDialogViewModel : ViewModelBase
     {
         public const string RavenConnectionInfoKey = "RavenConnectionInfo";
 
@@ -202,7 +202,7 @@ public string Namespaces
             }
         }        
 
-        public RavenConnectionInfo()
+        public RavenConnectionDialogViewModel()
         {
             SaveCommand = new RelayCommand(Save, CanSave);
         }
@@ -282,13 +282,13 @@ public IEnumerable<string> GetNamespaces()
                 yield return ns;
         }
 
-        public static RavenConnectionInfo Load(IConnectionInfo cxInfo)
+        public static RavenConnectionDialogViewModel Load(IConnectionInfo cxInfo)
         {
             XElement xe = cxInfo.DriverData.Element(RavenConnectionInfoKey);
             if (xe != null)
             {
                 var json = xe.Value;
-                var rvnConn = JsonConvert.DeserializeObject<RavenConnectionInfo>(json);
+                var rvnConn = JsonConvert.DeserializeObject<RavenConnectionDialogViewModel>(json);
                 rvnConn.CxInfo = cxInfo;
 
                 if (!rvnConn.Password.IsNullOrWhitespace())

diff --git a/RavenLinqpadDriver/RavenContext.cs b/RavenLinqpadDriver/RavenContext.cs
@@ -10,6 +10,8 @@
 using Raven.Client.Indexes;
 using Raven.Client.Linq;
 using RavenLinqpadDriver.Bridge;
+using System.Reflection;
+using System.Net;
 
 namespace RavenLinqpadDriver
 {
@@ -26,7 +28,7 @@ private IDocumentSession Session
         }
         internal TextWriter LogWriter { get; set; }
 
-        public RavenContext(RavenConnectionInfo connInfo)
+        public RavenContext(RavenConnectionDialogViewModel connInfo)
         {
             if (connInfo == null)
                 throw new ArgumentNullException("conn", "conn is null.");
@@ -64,27 +66,42 @@ void LogRequest(object sender, RequestResultArgs e)
                 e.Result)); // 7
         }
 
-        private void InitDocStore(RavenConnectionInfo conn)
+        private void InitDocStore(RavenConnectionDialogViewModel conn)
         {
             if (conn == null)
                 throw new ArgumentNullException("conn", "conn is null.");
 
-            _docStore = conn.CreateDocStore();
+            var assemblies = new List<Assembly>(new[] 
+            { 
+                this.GetType().Assembly
+            });
 
+            foreach (var path in conn.GetAssemblyPaths())
+                assemblies.Add(Assembly.LoadFrom(path));
 
-            // work on this!!!
-            //search for a user defined initializer
-            var refAssemblyNames = this.GetType().Assembly.GetReferencedAssemblies();
-            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
-            var initType = (from a in assemblies
-                            //let a = Assembly.Load(an)
-                            from t in a.TypesImplementing<IConfigureDocumentStore>()
-                            select t).FirstOrDefault();
+            var docStoreCreatorType = (from a in assemblies
+                                       from t in a.TypesImplementing<ICreateDocumentStore>()
+                                       select t).FirstOrDefault();
 
-            if (initType != null)
+            if (docStoreCreatorType != null)
             {
-                var docStoreInit = (IConfigureDocumentStore)initType.CreateInstance();
-                docStoreInit.ConfigureDocumentStore(_docStore);
+                var docStoreCreator = (ICreateDocumentStore)docStoreCreatorType.CreateInstance();
+                _docStore = docStoreCreator.CreateDocumentStore(new ConnectionInfo
+                {
+                    Url = conn.Url,
+                    DefaultDatabase = conn.DefaultDatabase,
+                    Credentials = new NetworkCredential
+                    {
+                        UserName = conn.Username,
+                        Password = conn.Password
+                    },
+                    ResourceManagerId = conn.ResourceManagerId,
+                    //conn.ApiKey
+                });
+            }
+            else
+            {
+                _docStore = conn.CreateDocStore();
             }
 
             _docStore.Initialize();

diff --git a/RavenLinqpadDriver/RavenDriver.cs b/RavenLinqpadDriver/RavenDriver.cs
@@ -8,7 +8,7 @@ namespace RavenLinqpadDriver
 {
     public class RavenDriver : StaticDataContextDriver
     {
-        RavenConnectionInfo _connInfo;
+        RavenConnectionDialogViewModel _connInfo;
 
         public override string Author
         {
@@ -17,7 +17,7 @@ public override string Author
 
         public override string GetConnectionDescription(IConnectionInfo cxInfo)
         {
-            _connInfo = RavenConnectionInfo.Load(cxInfo);
+            _connInfo = RavenConnectionDialogViewModel.Load(cxInfo);
             return string.Format("RavenDB: {0}", _connInfo.Name);
         }
 
@@ -36,8 +36,8 @@ public override string Name
         public override bool ShowConnectionDialog(IConnectionInfo cxInfo, bool isNewConnection)
         {
             _connInfo = isNewConnection
-                ? new RavenConnectionInfo { CxInfo = cxInfo }
-                : RavenConnectionInfo.Load(cxInfo);
+                ? new RavenConnectionDialogViewModel { CxInfo = cxInfo }
+                : RavenConnectionDialogViewModel.Load(cxInfo);
 
             var win = new RavenConectionDialog(_connInfo);
             var result = win.ShowDialog() == true;
@@ -54,14 +54,14 @@ public override bool ShowConnectionDialog(IConnectionInfo cxInfo, bool isNewConn
 
         public override ParameterDescriptor[] GetContextConstructorParameters(IConnectionInfo cxInfo)
         {
-            _connInfo = RavenConnectionInfo.Load(cxInfo);
+            _connInfo = RavenConnectionDialogViewModel.Load(cxInfo);
 
-            return new[] { new ParameterDescriptor("connInfo", "RavenLinqpadDriver.RavenConnectionInfo") };
+            return new[] { new ParameterDescriptor("connInfo", "RavenLinqpadDriver.RavenConnectionDialogViewModel") };
         }
 
         public override object[] GetContextConstructorArguments(IConnectionInfo cxInfo)
         {
-            _connInfo = RavenConnectionInfo.Load(cxInfo);
+            _connInfo = RavenConnectionDialogViewModel.Load(cxInfo);
             return new[] { _connInfo };
         }
 
@@ -118,7 +118,7 @@ public override List<ExplorerItem> GetSchema(IConnectionInfo cxInfo, Type custom
 
         public override void InitializeContext(IConnectionInfo cxInfo, object context, QueryExecutionManager executionManager)
         {
-            _connInfo = RavenConnectionInfo.Load(cxInfo);
+            _connInfo = RavenConnectionDialogViewModel.Load(cxInfo);
 
             var rc = context as RavenContext;
             rc.LogWriter = executionManager.SqlTranslationWriter;

diff --git a/RavenLinqpadDriver/RavenLinqpadDriver.csproj b/RavenLinqpadDriver/RavenLinqpadDriver.csproj
@@ -100,7 +100,7 @@
     <Compile Include="RavenConectionDialog.xaml.cs">
       <DependentUpon>RavenConectionDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="RavenConnectionInfo.cs" />
+    <Compile Include="RavenConnectionDialogViewModel.cs" />
     <Compile Include="RavenContext.cs" />
     <Compile Include="Utility.cs" />
   </ItemGroup>

diff --git a/RavenLinqpadDriver/bin/Debug/RavenLinqpadDriver.dll b/RavenLinqpadDriver/bin/Debug/RavenLinqpadDriver.dll
diff --git a/RavenLinqpadDriver/bin/Debug/RavenLinqpadDriver.pdb b/RavenLinqpadDriver/bin/Debug/RavenLinqpadDriver.pdb
diff --git a/RavenLinqpadDriver/bin/Release/RavenLinqpadDriver.dll b/RavenLinqpadDriver/bin/Release/RavenLinqpadDriver.dll
diff --git a/RavenLinqpadDriver/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/RavenLinqpadDriver/obj/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/RavenLinqpadDriver/obj/Debug/RavenLinqpadDriver.dll b/RavenLinqpadDriver/obj/Debug/RavenLinqpadDriver.dll
diff --git a/RavenLinqpadDriver/obj/Debug/RavenLinqpadDriver.pdb b/RavenLinqpadDriver/obj/Debug/RavenLinqpadDriver.pdb
diff --git a/RavenLinqpadDriver/obj/Debug/RavenLinqpadDriver_MarkupCompile.cache b/RavenLinqpadDriver/obj/Debug/RavenLinqpadDriver_MarkupCompile.cache
@@ -12,7 +12,7 @@ DEBUG;TRACE
 
 2-629771635
 1-2080279558
-81020814063
+872423325
 26-1480214086
 App.xaml;RavenConectionDialog.xaml;
 

diff --git a/RavenLinqpadDriver/obj/Debug/RavenLinqpadDriver_MarkupCompile.i.cache b/RavenLinqpadDriver/obj/Debug/RavenLinqpadDriver_MarkupCompile.i.cache
@@ -12,7 +12,7 @@ DEBUG;TRACE
 
 2-629771635
 1-2080279558
-9401608380
+9-546782358
 26-1480214086
 App.xaml;RavenConectionDialog.xaml;
 

diff --git a/RavenLinqpadDriver/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/RavenLinqpadDriver/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/RavenLinqpadDriver/obj/Release/RavenLinqpadDriver_MarkupCompile.i.cache b/RavenLinqpadDriver/obj/Release/RavenLinqpadDriver_MarkupCompile.i.cache
@@ -12,8 +12,8 @@ TRACE
 
 2-629771635
 1-2080279558
-9401608380
-24-867411369
+9-546782358
+261185733493
 App.xaml;RavenConectionDialog.xaml;
 
 True

diff --git a/RavenLinqpadDriver/obj/Release/RavenLinqpadDriver_MarkupCompile.i.lref b/RavenLinqpadDriver/obj/Release/RavenLinqpadDriver_MarkupCompile.i.lref
@@ -1,4 +1,4 @@
-C:\code\raven-linqpad-driver\RavenLinqpadDriver\obj\Release\GeneratedInternalTypeHelper.g.i.cs
+
 
 FC:\code\raven-linqpad-driver\RavenLinqpadDriver\RavenConectionDialog.xaml
 
diff --git a/RavenLinqpadDriver35/RavenLinqpadDriver35.csproj b/RavenLinqpadDriver35/RavenLinqpadDriver35.csproj
@@ -93,8 +93,8 @@
       <Link>RavenConectionDialog.xaml.cs</Link>
       <DependentUpon>RavenConectionDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="..\RavenLinqpadDriver\RavenConnectionInfo.cs">
-      <Link>RavenConnectionInfo.cs</Link>
+    <Compile Include="..\RavenLinqpadDriver\RavenConnectionDialogViewModel.cs">
+      <Link>RavenConnectionDialogViewModel.cs</Link>
     </Compile>
     <Compile Include="..\RavenLinqpadDriver\RavenContext.cs">
       <Link>RavenContext.cs</Link>

diff --git a/RavenLinqpadDriver35/bin/Debug/RavenLinqpadDriver35.dll b/RavenLinqpadDriver35/bin/Debug/RavenLinqpadDriver35.dll
diff --git a/RavenLinqpadDriver35/bin/Debug/RavenLinqpadDriver35.pdb b/RavenLinqpadDriver35/bin/Debug/RavenLinqpadDriver35.pdb
diff --git a/RavenLinqpadDriver35/obj/Debug/RavenLinqpadDriver35.dll b/RavenLinqpadDriver35/obj/Debug/RavenLinqpadDriver35.dll
diff --git a/RavenLinqpadDriver35/obj/Debug/RavenLinqpadDriver35.pdb b/RavenLinqpadDriver35/obj/Debug/RavenLinqpadDriver35.pdb
diff --git a/RavenLinqpadDriver35/obj/Debug/RavenLinqpadDriver35_MarkupCompile.cache b/RavenLinqpadDriver35/obj/Debug/RavenLinqpadDriver35_MarkupCompile.cache
@@ -12,7 +12,7 @@ DEBUG;TRACE;NET35
 
 2290151892
 1-2080279558
-81779050512
+8-1729862004
 21988149429
 ..\RavenLinqpadDriver\RavenConectionDialog.xaml;App.xaml;
 
diff --git a/RavenLinqpadDriver35/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/RavenLinqpadDriver35/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/readme.txt b/readme.txt
@@ -2,7 +2,7 @@ RavenDB LINQPadDriver
 
 Yeah... a RavenDB driver for LINQPad.
 
-Uses RavenDB client build 701.
+Uses RavenDB client build 888.
 Referencing another version of the client in LINQPad SHOULD take precedence.
 
 Watch the video at http://youtu.be/XgsPvyk0bjM for help getting started.