From 2d8849d2b3fbdc3d1afb717e80e0745a339b2254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?= <joaopbnogueira@gmail.com>
Date: Mon, 20 Feb 2017 20:58:57 +0000
Subject: [PATCH 1/4] support for controller attribute routing

---
 .../Controllers/RouteAttributeController.cs   |  12 +++-
 .../DefaultRouteDispatcherTests.cs            |  15 +++-
 Hyprlinkr/DefaultRouteDispatcher.cs           |  64 +++++++++++++-----
 UpgradeLog.htm                                | Bin 0 -> 36888 bytes
 4 files changed, 71 insertions(+), 20 deletions(-)
 create mode 100644 UpgradeLog.htm

diff --git a/Hyprlinkr.UnitTest/Controllers/RouteAttributeController.cs b/Hyprlinkr.UnitTest/Controllers/RouteAttributeController.cs
index 918e9f3..bf02b33 100644
--- a/Hyprlinkr.UnitTest/Controllers/RouteAttributeController.cs
+++ b/Hyprlinkr.UnitTest/Controllers/RouteAttributeController.cs
@@ -6,14 +6,22 @@
 
 namespace Ploeh.Hyprlinkr.UnitTest.Controllers
 {
+    [Route("/controllerCustomRoute", Name = ControllerRouteName)]
     public class RouteAttributeController : ApiController
     {
-        public const string RouteName = "CustomRoute";
+        public const string ControllerRouteName = "ControllerCustomRoute";
 
-        [Route("/customRoute", Name = RouteName)]
+        public const string ActionRouteName = "CustomRoute";
+
+        [Route("/customRoute", Name = ActionRouteName)]
         public object GetDefault()
         {
             return new object();
         }
+        
+        public object GetDefaultWithoutActionRouteName()
+        {
+            return new object();
+        }
     }
 }
diff --git a/Hyprlinkr.UnitTest/DefaultRouteDispatcherTests.cs b/Hyprlinkr.UnitTest/DefaultRouteDispatcherTests.cs
index 1e18352..79e1222 100644
--- a/Hyprlinkr.UnitTest/DefaultRouteDispatcherTests.cs
+++ b/Hyprlinkr.UnitTest/DefaultRouteDispatcherTests.cs
@@ -60,7 +60,7 @@ public void DispatchReturnsResultWithCustomRouteName(
         {
             var actual = sut.Dispatch(method, routeValues);
             Assert.Equal(sut.RouteName, actual.RouteName);
-        }
+        }   
 
         [Theory, AutoHypData]
         public void DispatchReturnsResultWithRouterAttributeRouteName(
@@ -70,7 +70,18 @@ public void DispatchReturnsResultWithRouterAttributeRouteName(
             Expression<Action<RouteAttributeController>> exp = c => c.GetDefault();
             var method = (MethodCallExpression)exp.Body;
             var actual = sut.Dispatch(method, routeValues);
-            Assert.Equal(RouteAttributeController.RouteName, actual.RouteName);
+            Assert.Equal(RouteAttributeController.ActionRouteName, actual.RouteName);
+        }
+
+        [Theory, AutoHypData]
+        public void DispatchReturnsResultWithRouterAttributeControllerRouteName(
+          DefaultRouteDispatcher sut,
+          IDictionary<string, object> routeValues)
+        {
+            Expression<Action<RouteAttributeController>> exp = c => c.GetDefaultWithoutActionRouteName();
+            var method = (MethodCallExpression)exp.Body;
+            var actual = sut.Dispatch(method, routeValues);
+            Assert.Equal(RouteAttributeController.ControllerRouteName, actual.RouteName);
         }
 
         [Theory, AutoHypData]
diff --git a/Hyprlinkr/DefaultRouteDispatcher.cs b/Hyprlinkr/DefaultRouteDispatcher.cs
index 5d6e8b9..ab07b8b 100644
--- a/Hyprlinkr/DefaultRouteDispatcher.cs
+++ b/Hyprlinkr/DefaultRouteDispatcher.cs
@@ -78,26 +78,14 @@ public Rouple Dispatch(
             if (method == null)
                 throw new ArgumentNullException("method");
 
-            var routeAttribute = method
-                .Method
-                .GetCustomAttribute<RouteAttribute>(false);
+            var methodRouteAttribute = method.Method.GetCustomAttribute<RouteAttribute>(false);
 
-            if (routeAttribute != null && routeAttribute.Name != null)
+            if (methodRouteAttribute?.Name != null)
             {
-                return new Rouple(routeAttribute.Name, routeValues);
+                return new Rouple(methodRouteAttribute.Name, routeValues);
             }
 
-            var newRouteValues = new Dictionary<string, object>(routeValues);
-
-            var controllerName = method
-                .Object
-                .Type
-                .Name
-                .ToLowerInvariant()
-                .Replace("controller", "");
-            newRouteValues["controller"] = controllerName;
-
-            return new Rouple(this.routeName, newRouteValues);
+            return ExtractRoupleFromController(method, routeValues);
         }
 
         /// <summary>
@@ -108,5 +96,49 @@ public string RouteName
         {
             get { return this.routeName; }
         }
+
+        private Rouple ExtractRoupleFromController(MethodCallExpression callExpression, IDictionary<string, object> routeValues)
+        {
+            var controllerRouteName = RouteName;
+            var newRouteValues = AddControllerNameAndMethodToRouteValues(callExpression, routeValues);
+            var controllerRouteAttribute = callExpression.Object.Type.GetCustomAttribute<RouteAttribute>(false);
+            if (controllerRouteAttribute != null)
+            {
+                if (controllerRouteAttribute.Name != null)
+                {
+                    controllerRouteName = controllerRouteAttribute.Name;
+                }
+
+                newRouteValues = RemoveControllerAndActionRouteValuesIfNeeded(controllerRouteAttribute, newRouteValues);
+            }
+
+            return new Rouple(controllerRouteName, newRouteValues);
+        }
+
+        private static Dictionary<string, object> RemoveControllerAndActionRouteValuesIfNeeded(RouteAttribute controllerRouteAttribute, Dictionary<string, object> routeValues)
+        {
+            var controllerRouteTemplate = controllerRouteAttribute.Template;
+            if (controllerRouteTemplate != null)
+            {
+                if (!controllerRouteTemplate.Contains("{controller}"))
+                {
+                    routeValues.Remove("controller");
+                }
+                if (!controllerRouteTemplate.Contains("{action}"))
+                {
+                    routeValues.Remove("action");
+                }
+            }
+            return routeValues;
+        }
+
+        private static Dictionary<string, object> AddControllerNameAndMethodToRouteValues(MethodCallExpression callExpression, IDictionary<string, object> routeValues)
+        {
+            var newRouteValues = new Dictionary<string, object>(routeValues);
+            var controllerName = callExpression.Object.Type.Name.ToLowerInvariant().Replace("controller", "");
+            newRouteValues["controller"] = controllerName;
+            newRouteValues["action"] = callExpression.Method.Name.ToLowerInvariant();
+            return newRouteValues;
+        }
     }
 }
diff --git a/UpgradeLog.htm b/UpgradeLog.htm
new file mode 100644
index 0000000000000000000000000000000000000000..26f76dbc66497fcfaa143cc8de29f07e62ff8184
GIT binary patch
literal 36888
zcmeI5`BNLolE?ekw-Nh4Xw1GbvkbR6Y(LM00D&=wxeT_4i5GylPb2P`_x|+V{d_Aa
zS9eRa)IwlSETNFPySgeXD>Eyvs&4)7|NJBRAsUO`N2AeF^eLK)N>L%&iO!<K=pgzf
z`p@V;BGu^RQ-~_jT67U@MrF>oqSNS@T7~GGvxDeO)E@Ql>5X1QKT&U;yXU}p741ex
z95<<T#P1m`1kGR<fbM%ML|3lYBl>y8S%vG0gZ#|(aYSh)+Mxa>ch@-Y<hV<TFsbm}
z0(vLc!t2#->$B(?eW{mC+LYb-p~GVhOjOsf)9)MVZgSm8e-+M+5@*o~C7aO~N_QE*
zYK<n^bw<;`K8m)fvBvMFYujD7FHz-+e!IWY;I+eP2PmgtAZon<<{2aFgtCLVa9WD4
z!90%38Tg+;(M@{!C&y#PKMD84h{Rp>yz9odz|{$7r?l#!Z_l#=?USDwT5MBqjhfcB
z5XD<dj*>0J`EFO+FcOa{Twgo<exY`)Hfb3Cx;y%BT8w~e83>Y859w#Fw%iyBlt~H-
ze8ufu@YPkByBknhQlat!u)1^gE?HN<c`*JXS8YGebtt?M?K@g)ejU;8D===0#-sk*
z?~CYlQ?NA`Bon8%5PQ)D_8o5$qUbJ)cEW)*H&+j!lJI>NEkf;W?u!E-kiut?IJHE*
z9ZEI7bv@yDvdOHo>t(J_8M9`al}IN^V|4P>y<PfhZu}=eD)W)P+ICp>Gzm%Ap8`XW
zG}^py{^j_WN19Cj-$DV6L3HS)-{dTiPV>53Tn_U=_zG8*1PzgQ7VOYx9-Nz-0o7dU
zg}x`~QPJ6sp~RmxClNt@r4etSp19e^I8UHdb1-YoV6$2AxmThW|82G(@z`Xc(^=y)
za5l?Wa3c`K+OTB3x8FXlWknAdYnjpI)4*OsrL{;OT<JwK>Db&z?mL@2W`UcRa8mY4
zo`*Pk#Hdf5&N;}5V=HE=(LHXjs%PpmJT$Y-7ht{_T{=%dnoqviG2@VB)11~E-{9J;
zaD|fm^SJL3=5gRgd~Wqd!}pk50cPts?4_rc-Wm9+cM4HB|29(I3Q6pD@{=uz6}*o1
zTWcGaGg)ihlYd^oo=EaekjUd`?^Yr;&*TNj;^&vi{zsL`*2_<j&7{0bZkn|vt<sDS
zE!&OQyfb9QJUL+_&s?5kzPZ%w98ff8)>o2yz(<jvMNf)t<s0ogiIzVr`3+Vszbvmk
zf+Pq0WZ&Ab!2M{}J}iCdk!UJUejVD0TEP$X_9&lkarPC~!~2(t<$~W-VRkCwipK=`
z{dsRglCX_O2f#mpLgrhh%ks&;@8>REBmel}=TzX9MHr94v%8|=QZ$6b>pPrN?maDi
zj;0enNfT_N0W_y1*~&LH$DsgK9=f<5&z*RmRJx`)_(1|%Z^^2yML%+-Xkzg8n7qz6
zg8Vu>DR1RR(5~i*%g5euQjwMo#aSm!a;`pgy{Bo%eAM+)UF|uDgU!K;Yc)x(qGL%z
zh$Ur#?mrW2c@bva#+l*v%{$BUOPgg{rs1&hUYfxCg91m{H|3Rs#S7WT+8%`>H)T!Z
za3nu!x9habE3%RLq_frXxP9CwD{Eep;3ysxCgMQSSF!ra+M9>|9Bme2-{+Kj&7{1(
zWl7}?Sv!?kmaTvvul%E~6o2}>aei;8%i(LZoW7;x!&{7M|LDHC&by_vgzVdAtjQVX
zdD7|fIjyr6`K7-Ww_YK^UIM-a=bH6wy)L|)bK__geO~fuPB(r(oHM;O%6!$Vwp@|N
zPMRd-oO~wO)=E5Q3(RrLJV~=`06}q*&VvS%WD2^^CM(vj@Ub;9^O>Y6q)}AYG>l*<
zACNC5=yIdb>REhD%5Ois40^hy?Y^kushdw;^3O!$=Mr;I8aPeqIDd?v=^DXnGE1R3
zd=6)nPt?7A2lpIX9%5px{+bsYkL@f%5*B&0I$bHe#Ysuk!*lQwSuQiq9p}qym7pj3
zd(JuDEYIekVOVD}yY1KVf~ECy$*)PSxoE@BTjRP`T$-6XZEp6Nr0O@{%=^Rf=Wn!X
z>{IR0hIN|0TVJu4+=O4dv9rAE56yDJ&mgboyq2?B;4>Inr`I@?Z#SJM&niffG^nm5
zQR1j(<eKw>Lml}^TikhxxB7RE`E_0!5R$6^aV#Hu)~ul~<f-P<bY5nRKAkZd%9kG^
zkFI%`Pa^Nj`=o9({(23kEALrL_g!*z?PS37G0x$<8n7*;0h4_{Hb-ql`S{r^?Tb#+
z7g+f>O{bCPrC!(9){DsE1|Rb`O3YJ1Rc@v1_7Q}dliX8wB&*Jf<M@$_Mz%9+mdM*^
zjpH;`>)|=4oln}S6r}GJ)<COg&BpN_qHIf89Stz^%}GDcYkAk5&`Uduv|B+du!=#G
zW%*<<yD#lv(wd836Mg06<Z=D9q<kt<U{Y^;k%Fu~)Esztc{G1?7Fx?YmM$OT+}76R
zVQ4NYXR5nNFXzzdK=VV^U9DrJx{F$q)b?4G5T96f#O$DU`)I$H?5^O7lA4jW2Cn?6
z;ty|meJ%M^ahmTsYps2I1=m)26YXl0J}Iz@A<Tu7olASz&M^<q);Y^g2L+5(M<Z6I
z#rECg)o)&|jkdorNA&p!yaPtO3}oe=v>QrPm1fgX`z&>*ll^ek_aJ*RllpG*>xf_7
zp+nnftsPp@GHuYHI>X+{Jy~(lP5icfpzXK#tWg&3cQf0ytLn9bBzg#^pMku{xjZY&
ze~Yqh>>qvYGKTWD+M?fq-7MuE3h!O0Kf<1j1*D=Unqr@t_OcakKeLSL0}@%{cl)+%
z<m=sHG*8T0WVfxazlGlJ#xLCYS~3ckN8ro~$C=wwtzuY<_vrW{eJ<1UC3IZBEgwN*
zOK`qK56j^8g4SQ~te23O4}3@YU0@&6TfE3#Jgsf|{T#ic)d)RlZ{99geWHBS^}PY)
zm(1gFT4|&+)EWR<5tti{yPJMW+`Z(x4^CIWpND5x^nL)$OW=H>&3oVu0&$1)ZEEar
zZyGG#QGb+{J6xRtO;`*=yCG^_P*UXB5zX?wa1^@W><UQ2dKhdbz_^1kE&}D6+9SX&
za=p#jHt;97Ql_>@jeYvpUe^`Qr;)j7>PQ=vsdq~28TKiZ8Qmm3%(D-Ag>k;%&JmQ_
z0Jk}?QtyfbhTKYO1=<|aVi9b5fF?>`Q11w;%|Q`GY*Uoo(CY;?XX#06%4M)s{W)-&
zhEAf#6|@k4ik#1b@n>jP=Jx~e4>`Z0T)p<t%LMl|`WrC3;=4pIpXp<c_E*$-%l&2U
zo<OMsjy*tp$w;SwaZQaL`kkP+VK5T?mbhMlzf&BCX)((Ad-^Pa!MSU*P5T3AAb85z
zyr-{4Mt4YG{XqG^agaOnz@FlKnsID`?>o4E!LN3Jhyop8S#*4RN3A9BoB}WT8YS*s
z(B}p8mqxn+hW3iAgV7|k`UD1>)ER{y$`XGB#}fE%f!{GWEP+p%-UosEjy|;B-OZgH
zN|tETORt&*Tj01(9qn<RVf05_572T9m^<)nkK+`5zH?AM&})%v&BG<f_d)88Lfu(L
z_m)yYTBFq=G$=vU3t%c=sQm((l_mP$2IEQa8=`E9de=~D3qEaw!v^<`=}Z3O0bD!=
z>lvWzG1eofe8aV*WQiWOC@DdsImUJdO?rUuKhihLP9IG%9?d#Q`x~c8^Vt4oy?O6d
z+b%lqX+4ae<NHclv^=A<42HL^jUJyooWHt<<0U64rB9xYJh;0&w1@R{M$n*XkEMcc
zG>_#Ny*!VmUqGi0q4_S+k2h%OV|3!4vyM|}-!hu+2<=_wd(NE&^sk;|8m9FOmZFz(
zc_AIZx}a8tvNgs#Pv0YG=?$(&fxm)A9d%Ym+I}9G8|dV5V4iU%|9T!xEiBfkJBwCU
zHb@@8zOx}O@fT)*Gf0{I;!U6_7SWST(_ru(yf-*1*E!DF6(bl&Z*RI$jbhoS_<q4I
z$TJ+KUs+9gYO=1&T+h*FgFX+i1?qE_k@nF_<G7-1-1WIgYxyY^S5vT780|+ec?r~)
z-023V3(mHIqCL>^e#SW4a4ol?@dB;o=WNl}9<4@b^A`BM?vAMX1$xdhf*D|Fx5FCu
zW%Cc9=oEd-JBv7pP1JRTF)22jfT}MU%}Zyid+75su=lC03~M)-4pVD^>r2|qJ4*La
z(hp|xu=}v1%it-`@y3;X;@&LK4&d1+&^|M^4(`cA8FrMB_1^~1LrQuXX9--c;l>SE
zD5{y_T;;O*;=Fcb$#a{e&6Sg?3(B@QyXLOAybSdQz<tO`*%akNjBDOuG)g}^+!rtV
zDcR?D4jQhw-YTxwF-F?UXyo}QQdM^1*nPY`m&f{TEqXEs_Ar(_*~gPTKSPS1G8R5N
zkd%j78H=R+JlXMYXUB`^-exiuvQ*OD@r=a@x^fZSJC9Z!<)}L2=-(F{i|E=B%BHz<
z#qku~J?wP!8s&P5Q*rYsntTzxyTDOdh#{_u=-heikF12W`U>}y-I~W5te~wwI_)p5
z{}HP(2~O9v9N_qcUi#_%jJk?c-_u$d6UFPw#0*gLGZ6aG`=flOxc><#n#=Rf!oI*h
zmKebowEr~6b1c*)R%8skuKC<BK1G3h+>=$B1$qZ<ij;Q%MbDlovR?)hc_S5QwvPo-
zZeR|aE`T%0*c5G_P)nF9$1+GAMbF(}w9l2`4bsOVqfz$b2sr0%!~^uN^>BF*!?f<^
zxI*hGAgb&wEp$iz!V)k#=vAJN@H}JWd%(G7JZH`l_HeE2zT)*FqgeuW2R$hI-Q&8O
zV?Xtk!Bp1f2#j=RoN;yoc^pc;;Pa0A%iNP}iI(0vj&Nsz76VZA6r99Kecn7`#2Z$A
z9>z8X_(?tZ6z6IU-Dln<!%vxfpM&>nsX=z0Y~r`GiONQ&W7{ui)g^T52ehGV-U7N!
zIl@bH_Z(K_13GRPtz1M)U-GM%q7PkpPCaF)i|ALyYKo9bXl}(hBk0Hy+EjX0QP()-
zT9xRbpAAZsAy&5doYp(&SJ_kbtvia4#wqK^dMIBy!ADuf4;;_Ap5>|xeqT8MOvxAQ
zq2k3U>Qp%1(Dyq^l{X(m7a!45dFMrNoj_+#&|`_KU9|KKp93)JrF@!kC~A}~TqZ(1
z1;#pUd+FuUS-?^Bx$M{sHsCWgKQW$7htC=%(@<p#+_frr!8nxlRLpe_+zNd!^690`
z3vlcQis(AX{eEEdJDBIR5Us|jF#{Ec=<O5NFTraVEQ>(@3{0&yXitz<ktdy{(JqNz
z$E`_f3{Y<uoXgbu#CVkh9%oGBlpk_+NS!`<xT4M>n266G!BcAl2lOU-_0YFg73K4Y
zYG>3C)eqtGI`Cx6FR`H7Y5$q>6`)HFbg!3kW%J)scOOW~aLX$Y{=M8$mi{vso>F_1
zt1-qPzu*jricGH<UpL<qYE@jj38=OQZp-w$LCH3EhM;+w7PIs{!bem&pg+l>u-SzN
zvfGOOkKm4?@-cd!0Lvln-Z<J#LhB`Z+v76{?j>-!1eRj!cih?Fd>>55sIScZ8m+bJ
zGzXnD)-lHPf|1E@(yr2%&~cIeC4>8v`%i0Q=lc0!y~!l(__sHi=&dx88m$Lw#>gMi
zdsehUYwvv7V+7hysZ{`9_ZhX7e~7<JMy+bs&3a2pmY-lx6D)#@)?Lq_qIP-KZ=sbX
z<=(W`s}|l0`=eIL?fnzlMXKzT?6W9fYv!Rv`kgD?@OhWID!+6)c5Id3KU<Mr=TEn{
zm493R)^FBWM00ymK0bcs`Q%H4wTm|n?__B^D=LNP557svr04ZkA{%cz982#hd*;?+
z3emsn?3c^JTvTXJP^ycu=)DfgV@cC`ivN^Jf%@woac<nzM|<=fZXGdl<N9;QH_d|}
zRcWefWj||#w*GY2jN7CyWe4PO%L}Zgh4$43Drlup_=qc;@Lash>ODVQvilQ-@=!;+
zNcE;18)d6#b-xj(XPTtp+m1S$hgqXFy{C0&MT?rTw%^kB4#~<Z6T8k=vs+p_>>Tp@
zLA66jI!Y}yOQidPUQ^aw8C}Vzo|cdv)NUMUgKWIz2_^N9G@!?G2^h8)dEvJA5wM%R
zh1~wNkNeJhJ>_BAQBrt-efMLPHmsHfdDmymxVZMK;2+4&D=G;XKBwL(^P!$p+uZl|
zq8%!}!K=}Z;9b7|;G4uuPb6u6%Uj&Jt=EB1luZfirT%>Pn#fZ{87A9bCM)AdR{+N}
zUcZ6w@9bhT3KglX@k_dt!P!K2>DfDzj7F(q*q9agfw%JAh0TxAkKj}LZWlPn&dLjU
z@9c@kLfTOo6g}VG2=(&PFilI%wq>xfIVUb=(J}Z}U0|<PCvaYSu|3w$p=jQn<HD&H
z9=}qalrzuIY&;5%tM--%Jx!^7am~WfXtK1Kr>BnDcGGHR*U7${g-5mKGLKg8)X=Kj
zv5OD1<3@WH<NP-564zeYI<k@Z>St<_>LyuF`m451$eMSp*I%APwdUR3dNh09sa@Xr
z{}_6-fF_nMt{&^dY1pLX2fbzQN!6UxehGOOnvHswSi7@L+HWB1oIMBQTF1_{&si~~
zvOn^Kv__%#Rx}PLTlX}gy{t}_ma2to@U^owZ8m;cy_(0VI7B-Fy;m6bI%|21K1Yy_
zY84-d+GhFeX&2S8=hDJX@DQCQz0~lgT_3&beir`Ky4|<bSgxJqSUw|Lo*U8J;*g({
zfdYR<e^TDVSH6knxxbh6{IdHu?(4TvOni&9blYefmu{1tEE@Zs3S^P=6tuEw^3cND
zhsAgCPH!R>$Bf^K6;+btw!fE@6Ca`I%?}}J32&rG!e|Uzug7iQzn5{dCEZAd$N0~$
zXBBv9IR6x_;v20pUVVRKM4jaPiu`IXbtjp<Reo3TpMS@fZ>MgpI=}N=z)#Vy4#uz4
zs#V9s`6snh^JiCkmETn$|H#vZtI>b)l));p^>4J+DiX4aKlMA1_0)mZh_kgr;9p~O
zt1VGoshQpGH0lAlRMQ=jf#<|OdbV`O)!hQ)XW;%LzrVPn@{ntsE1oFS!TPavnsPTG
zL#8Kb<hg4{eiqg0>7Qiesc5mx*s~xuHvheBr?Hm)Y0QgM3_M9)k5gkZ<n`YV&?-)^
z>@j%>Y;0_*orG>Nq2<W5FJJpBY#yhzef@Tgdl1<Yn0+^k!__hq&-lzR_V7-M5RZhM
zPdhqQIUfJsN+0EC^PoQMJ#TA6FQ6OKmacZqymqfXW|D}wR%*n$W%EZ6vv{QYdGcG&
zkjXgTEOH!Wj%fYF-qqg$%-R%dB<GX|o98vL(f(Ik{WxV+O3$TSqKOMwnePWLtyL=b
zQy;Hv{$+DNi}Tg9a}f_#^Q~UCASnS)v-ELhY4AxcgJTh1{F&S5U!^_$9-4}iGx7Ga
zt~T)6F>mgub#pOWze{5^rb#`;^cE!9aC@VUo`u$$fO+=v;x4#~=RS>2VXZWquJQ*J
zYl{=|`Sq*SOZ@}M0asda2zJh|T4c{^jZvT0@E~aC`)V8El&x{H?%L{nSYy}vy#8^;
zw6(6ZuR^=~b#Cv}$@}jp_xW!W{U46~8;bfC4$5y|P$pe1A74A%!rHd~KO4O_K8@#l
zw*q|XWJ{TyC1BY9tEg4_uF;{dW}oRd%~-Em+qHEl;VJpE<BmJ(|6J_MR>jiT%{e{q
z{i?906}Oz~Cs|Ke)`P26aP3U>*i}Qc8uej?y>pcec=1~GVJ7#fXTeR^tPeYB6|-Qc
zYsO)V!k(A@D7~d8pv=RP99HiyEFqU+|D|@X*uNg>xoSy<vbNG|TA$N(I(ltmN00W#
zgtu&;67zqczT|ev>98|O#+{AP%H)ZQcJsH=XcZgln8r$@H+=1wANpz&<LJU3DElY+
z>^Z#RSfpw1vtFan#B_l?_Ohc!Yv>weT63`1VdN=xAIyFsqZ6n8ePAVXA8l^*wV~&e
z=;ZrZ?l09{@aX(@?N`){U&m=tPZHDZ?nAp)@}ZTm{wh2zv0|?EdS%}?(MQ@*Bp*(B
zc=0&vejc7@!CB4hr3+kIr%_tT<5t4@tH?{W6_J!wm*$a;>ejU_&yyU8s$N@uTU$`g
zvuY2gwq#V-yPvF7!>cVl)&AF$Jbgd%w1~f`_we|g%90&<+V+0Z`Y~a;{o-v)!AalK
zs6Ax!oxMj`&vU6I^?GmF(Y-z0R@#zQ!m74Q+C8fHNUJFN*G|Py&1O554NCIeb`2&o
z_woJ1ubo#?+m8<#QD;7CHV#|%LFYR>xl%1pX*`OIv7Cz86^F(%59u~x4co^*_Qt-7
zlMeN({?mDoWKK(2f7Mb<>Gv>-!nGu?TB9W+N*}lG@Z3r*8(pnAlQF60iM3T$Bu-Do
zzaf*8AGdfWV*v@!KmTdeJ|iOj#d9vnh&@R$#g59dD^5@6W|G-~yE7@tdZraa_Q&TA
zH0C%@LTqVc2)V)h6!GJ4CO^>{c?qKl84vLx<Pg%)`(1nxK1ofQpB|0c@VLY$a}Td-
zX6H@!C-XPK7Azrk+OeyDuTn%L4W}HN|M%xh?yJo2j#sWby$+@fwmlhTJLI%0z}{FX
z-b#0Bw~9)_dqlM}Ts!5<#MA|}j$$!u6Y}Aj5!RnyzYbY-tv~6RCt+_h)7}T1d?%Fl
z?fU&I_Wvt-`;6XKuQ4fOQ{k(<EQ-1Gud3Z#>CHU0Tcex3Ceyd)+6C~2r`ZPB)zZWB
zYcJTbVR7VZC}-Ip(|(>BZ^(D`u^UFu8S06|5i-OB?3C!|(@A^5(q0+W=%J?e%jn&J
zV_fSkfkRvm@r2$W(v`N~UP|w_0BL<1&p`xvH*FWc*QgGRxB07TH`Bm(YoJLaRFayN
zNorI_RO@QJNhzs^E4NQ-NH@mmt9@Pe6p4QpMe9&WZB(H}){3oP71Gi4z3I8eB`7PS
zk(Q{ex{XR$7K|r}3;Fz{9AtS1*%FsU@9#qbtF3BU?y74vDs9y*pJc4{GFDCH?^Uv@
zV}<&%R^6s~>8pnIB#)0FkJWVlJ|r|9dncu_+Pj!b_@rableQ-g!V{-)iIUHe?xRuZ
zO}C4~{p&`%N#D%I5g(b~9he?{{m8bJex;9v)0qH|U6Hs&85keaX<t!tWVY`zz8hUD
zvdPFlJ;o#i)vnHw<=wB_Y;No>uh&yR|7EHOx0(*sK6EWungu>zS{-*;W+<K|Nz%sT
zCS*#|loaihJGgc+urgobmLha}E><z@k)y7yPbz1WKVtDx62~)*NfPg%Umh|iV!7n|
zWG*VuCZ0#P{dvkK*dBj-JAf#tH<)O*#TRl1dXtW7C=;;FdB}NmH56?d*Bj?sayBI?
zU9DOC{@yf)z7NgfvHSn4Sv&<ER<mf{#dFYl|D$#kYAz?w<2xUf!9GK-52*KlYu-ut

literal 0
HcmV?d00001


From 17b472ea2b839917ec9f39da6d6729d16e4e6f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?= <joaopbnogueira@gmail.com>
Date: Wed, 22 Feb 2017 08:46:49 +0000
Subject: [PATCH 2/4] support for controller-level route attribute

---
 Hyprlinkr/DefaultRouteDispatcher.cs | 38 ++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/Hyprlinkr/DefaultRouteDispatcher.cs b/Hyprlinkr/DefaultRouteDispatcher.cs
index ab07b8b..6da3d2d 100644
--- a/Hyprlinkr/DefaultRouteDispatcher.cs
+++ b/Hyprlinkr/DefaultRouteDispatcher.cs
@@ -70,17 +70,16 @@ public DefaultRouteDispatcher(string routeName)
         /// <paramref name="method" />.
         /// </para>
         /// </remarks>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "This method should produce URIs with lower-case letters, so ultimately, it would have to invoke some sort of ToLower method.")]
         public Rouple Dispatch(
             MethodCallExpression method,
             IDictionary<string, object> routeValues)
         {
             if (method == null)
                 throw new ArgumentNullException("method");
-
+          
             var methodRouteAttribute = method.Method.GetCustomAttribute<RouteAttribute>(false);
 
-            if (methodRouteAttribute?.Name != null)
+            if (methodRouteAttribute != null && methodRouteAttribute.Name != null)
             {
                 return new Rouple(methodRouteAttribute.Name, routeValues);
             }
@@ -97,21 +96,35 @@ public string RouteName
             get { return this.routeName; }
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "This method should produce URIs with lower-case letters, so ultimately, it would have to invoke some sort of ToLower method.")]
         private Rouple ExtractRoupleFromController(MethodCallExpression callExpression, IDictionary<string, object> routeValues)
-        {
-            var controllerRouteName = RouteName;
-            var newRouteValues = AddControllerNameAndMethodToRouteValues(callExpression, routeValues);
-            var controllerRouteAttribute = callExpression.Object.Type.GetCustomAttribute<RouteAttribute>(false);
+        {            
+            var controllerType = callExpression.Object.Type;
+                        
+            var controllerRouteAttribute = controllerType.GetCustomAttribute<RouteAttribute>(false);
             if (controllerRouteAttribute != null)
             {
-                if (controllerRouteAttribute.Name != null)
-                {
-                    controllerRouteName = controllerRouteAttribute.Name;
-                }
+                return ExtractRoupleFromControllerRouteAttribute(callExpression, routeValues, controllerRouteAttribute);
+            }
+
+            var controllerName = controllerType.Name.ToLowerInvariant().Replace("controller", "");
 
-                newRouteValues = RemoveControllerAndActionRouteValuesIfNeeded(controllerRouteAttribute, newRouteValues);
+            var newRouteValues = new Dictionary<string, object>(routeValues);
+            newRouteValues["controller"] = controllerName;
+
+            return new Rouple(this.routeName, newRouteValues);
+        }
+
+        private Rouple ExtractRoupleFromControllerRouteAttribute(MethodCallExpression callExpression, IDictionary<string, object> routeValues, RouteAttribute controllerRouteAttribute)
+        {
+            var controllerRouteName = this.routeName;
+            if (controllerRouteAttribute.Name != null)
+            {
+                controllerRouteName = controllerRouteAttribute.Name;
             }
 
+            var newRouteValues = AddControllerNameAndMethodToRouteValues(callExpression, routeValues);
+            newRouteValues = RemoveControllerAndActionRouteValuesIfNeeded(controllerRouteAttribute, newRouteValues);
             return new Rouple(controllerRouteName, newRouteValues);
         }
 
@@ -132,6 +145,7 @@ private static Dictionary<string, object> RemoveControllerAndActionRouteValuesIf
             return routeValues;
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "This method should produce URIs with lower-case letters, so ultimately, it would have to invoke some sort of ToLower method.")]
         private static Dictionary<string, object> AddControllerNameAndMethodToRouteValues(MethodCallExpression callExpression, IDictionary<string, object> routeValues)
         {
             var newRouteValues = new Dictionary<string, object>(routeValues);

From 39e705537e974b03eae07eca68803b35f0892aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?= <joaopbnogueira@gmail.com>
Date: Wed, 22 Feb 2017 17:48:03 +0000
Subject: [PATCH 3/4] limit line lengths to 120 characters

---
 Hyprlinkr/DefaultRouteDispatcher.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Hyprlinkr/DefaultRouteDispatcher.cs b/Hyprlinkr/DefaultRouteDispatcher.cs
index 6da3d2d..2900e9b 100644
--- a/Hyprlinkr/DefaultRouteDispatcher.cs
+++ b/Hyprlinkr/DefaultRouteDispatcher.cs
@@ -97,7 +97,9 @@ public string RouteName
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "This method should produce URIs with lower-case letters, so ultimately, it would have to invoke some sort of ToLower method.")]
-        private Rouple ExtractRoupleFromController(MethodCallExpression callExpression, IDictionary<string, object> routeValues)
+        private Rouple ExtractRoupleFromController(
+            MethodCallExpression callExpression, 
+            IDictionary<string, object> routeValues)
         {            
             var controllerType = callExpression.Object.Type;
                         
@@ -115,7 +117,10 @@ private Rouple ExtractRoupleFromController(MethodCallExpression callExpression,
             return new Rouple(this.routeName, newRouteValues);
         }
 
-        private Rouple ExtractRoupleFromControllerRouteAttribute(MethodCallExpression callExpression, IDictionary<string, object> routeValues, RouteAttribute controllerRouteAttribute)
+        private Rouple ExtractRoupleFromControllerRouteAttribute(
+            MethodCallExpression callExpression, 
+            IDictionary<string, object> routeValues, 
+            RouteAttribute controllerRouteAttribute)
         {
             var controllerRouteName = this.routeName;
             if (controllerRouteAttribute.Name != null)
@@ -128,7 +133,9 @@ private Rouple ExtractRoupleFromControllerRouteAttribute(MethodCallExpression ca
             return new Rouple(controllerRouteName, newRouteValues);
         }
 
-        private static Dictionary<string, object> RemoveControllerAndActionRouteValuesIfNeeded(RouteAttribute controllerRouteAttribute, Dictionary<string, object> routeValues)
+        private static Dictionary<string, object> RemoveControllerAndActionRouteValuesIfNeeded(
+            RouteAttribute controllerRouteAttribute, 
+            Dictionary<string, object> routeValues)
         {
             var controllerRouteTemplate = controllerRouteAttribute.Template;
             if (controllerRouteTemplate != null)
@@ -146,7 +153,9 @@ private static Dictionary<string, object> RemoveControllerAndActionRouteValuesIf
         }
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "This method should produce URIs with lower-case letters, so ultimately, it would have to invoke some sort of ToLower method.")]
-        private static Dictionary<string, object> AddControllerNameAndMethodToRouteValues(MethodCallExpression callExpression, IDictionary<string, object> routeValues)
+        private static Dictionary<string, object> AddControllerNameAndMethodToRouteValues(
+            MethodCallExpression callExpression, 
+            IDictionary<string, object> routeValues)
         {
             var newRouteValues = new Dictionary<string, object>(routeValues);
             var controllerName = callExpression.Object.Type.Name.ToLowerInvariant().Replace("controller", "");

From 832a20268635bcd5c0c104bbb31488e6d6638581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Nogueira?= <joaopbnogueira@gmail.com>
Date: Wed, 22 Feb 2017 20:40:32 +0000
Subject: [PATCH 4/4] delete UpgradeLog.htm

---
 UpgradeLog.htm | Bin 36888 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 UpgradeLog.htm

diff --git a/UpgradeLog.htm b/UpgradeLog.htm
deleted file mode 100644
index 26f76dbc66497fcfaa143cc8de29f07e62ff8184..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36888
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