All queries now take factories instead of final data

Author: Tomas Bezouska

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -0,0 +1,212 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+## TODO: Comment the next line if you want to checkin your
+## web deploy settings but do note that will include unencrypted
+## passwords
+#*.pubxml
+
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# LightSwitch generated files
+GeneratedArtifacts/
+_Pvt_Extensions/
+ModelManifest.xml

src/Firebase/FireBase.csproj

@@ -55,6 +55,7 @@
     <Compile Include="Query\IFirebaseQuery.cs" />
     <Compile Include="Query\OrderQuery.cs" />
     <Compile Include="Query\ParameterQuery.cs" />
+    <Compile Include="Query\QueryFactoryExtensions.cs" />
     <Compile Include="Query\QueryExtensions.cs" />
     <Compile Include="Streaming\FirebaseCache.cs" />
     <Compile Include="Streaming\FirebaseEvent.cs" />

src/Firebase/FirebaseClient.cs

@@ -45,7 +45,7 @@ public FirebaseClient(string baseUrl, Func<Task<string>> authTokenAsyncFactory)
         /// <returns> <see cref="ChildQuery"/>. </returns>
         public ChildQuery Child(string resourceName)
         {
-            return new ChildQuery(this.baseUrl + resourceName, this);
+            return new ChildQuery(this, () => this.baseUrl + resourceName);
         }
     }
 }

src/Firebase/Query/AuthQuery.cs

@@ -1,21 +1,23 @@
 namespace Firebase.Database.Query
 {
+    using System;
+
     /// <summary>
     /// Represents an auth parameter in firebase query, e.g. "?auth=xyz".
     /// </summary>
     public class AuthQuery : ParameterQuery
     {
-        private readonly string token;
+        private readonly Func<string> tokenFactory;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AuthQuery"/> class.
         /// </summary>
         /// <param name="parent"> The parent.  </param>  
-        /// <param name="token"> The authentication token. </param>
+        /// <param name="tokenFactory"> The authentication token factory. </param>
         /// <param name="client"> The owner. </param>
-        public AuthQuery(FirebaseQuery parent, string token, FirebaseClient client) : base(parent, "auth", client)
+        public AuthQuery(FirebaseQuery parent, Func<string> tokenFactory, FirebaseClient client) : base(parent, () => "auth", client)
         {
-            this.token = token;
+            this.tokenFactory = tokenFactory;
         }
 
         /// <summary>
@@ -25,7 +27,7 @@ public AuthQuery(FirebaseQuery parent, string token, FirebaseClient client) : ba
         /// <returns> The <see cref="string"/>. </returns>
         protected override string BuildUrlParameter(FirebaseQuery child)
         {
-            return this.token;
+            return this.tokenFactory();
         }
     }
 }

src/Firebase/Query/ChildQuery.cs

@@ -1,36 +1,33 @@
 namespace Firebase.Database.Query
 {
+    using System;
+
     /// <summary>
     /// Firebase query which references the child of current node.
     /// </summary>
     public class ChildQuery : FirebaseQuery
     {
-        private readonly string path;
+        private readonly Func<string> pathFactory;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChildQuery"/> class.
         /// </summary>
-        /// <param name="path"> The path to the child node.  </param>
         /// <param name="parent"> The parent.  </param>
+        /// <param name="pathFactory"> The path to the child node.  </param>
         /// <param name="client"> The owner. </param>
-        public ChildQuery(string path, FirebaseQuery parent, FirebaseClient client)
+        public ChildQuery(FirebaseQuery parent, Func<string> pathFactory, FirebaseClient client)
             : base(parent, client)
         {
-            this.path = path;
-
-            if (!this.path.EndsWith("/"))
-            {
-                this.path += "/";
-            }
+            this.pathFactory = pathFactory;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChildQuery"/> class.
         /// </summary>
-        /// <param name="path"> The path to the child node.  </param>
         /// <param name="client"> The client. </param>
-        public ChildQuery(string path, FirebaseClient client)
-            : this(path, null, client)
+        /// <param name="pathFactory"> The path to the child node.  </param>
+        public ChildQuery(FirebaseClient client, Func<string> pathFactory)
+            : this(null, pathFactory, client)
         {
         }
 
@@ -41,12 +38,19 @@ public ChildQuery(string path, FirebaseClient client)
         /// <returns> The <see cref="string"/>. </returns>
         protected override string BuildUrlSegment(FirebaseQuery child)
         {
+            var s = this.pathFactory();
+
+            if (!s.EndsWith("/"))
+            {
+                s += '/';
+            }
+
             if (!(child is ChildQuery))
             {
-                return this.path + ".json";
+                return s + ".json";
             }
 
-            return this.path;
+            return s;
         }
     }
 }