[WIP] Fix #59 - Improved Middlewares #127

delgermurun · May 27, 2015

Add support for #59

delgermurun · May 27, 2015

I've made quick middleware => triggersEnter change.

@arunoda am I heading right direction?

arunoda · May 27, 2015

arunoda reviewed May 27, 2015

View changes

arunoda · May 27, 2015

client/router.js

-  _.each(self._middleware, function(fn) {
-    self._page("*", fn);
+
+  self._page('*', function(ctx, next) {


Any reason for running this in a different page middleware and differ it?

There is no reason, just experiment. Moved to initialize.

arunoda · May 27, 2015

Yep. You are on the right track :)
For now, we need to keep the middleware API as it is until we release 2.0

delgermurun · May 28, 2015

@arunoda I've just added exit triggers support. Can you quickly glance through it? Thanks.

arunoda · May 28, 2015

arunoda reviewed May 28, 2015

View changes

arunoda · May 28, 2015

client/router.js

+  self._page("*", function(ctx, next) {
+    _.each(self._triggersEnter, function(fn) {
+      if (typeof fn === 'function') {
+        fn(ctx);


This ctx should be ._current.
It should be the same for others as well.

Do you mean calling every triggers with self._current like fn(self._current)?

Yes.

On Thu, May 28, 2015 at 2:45 PM Delgermurun Purevkhuu <
notifications@github.com> wrote:

In client/router.js
#127 (comment)
:

self._page.callbacks = [];

self._page.exits = [];

// add global enter triggers

self._page("*", function(ctx, next) {

_.each(self._triggersEnter, function(fn) {

if (typeof fn === 'function') {

fn(ctx);

Do you mean calling every triggers with self._current like
fn(self._current)?

—
Reply to this email directly or view it on GitHub
https://github.com/meteorhacks/flow-router/pull/127/files#r31215724.

But _current is empty ({}) on global triggersEnter?

What if we call triggersEnter inside our main tracker rather than, doing it inside `page(*)
see: https://github.com/delgermurun/flow-router/blob/improved-middlewares/client/router.js#L313

arunoda · May 28, 2015

arunoda reviewed May 28, 2015

View changes

arunoda · May 28, 2015

client/router.js

+  });
+
+  // add global exit triggers
+  self._page.exit("*", function(ctx, next) {


updateCallback function seems pretty lengthy now. How abotu moving breaking these into multiple functions. We can write it like this.

... self._page("*", self._processTriggersBefore.bind(self)) self._page.exit("*", self._processTriggersExit.bind(self)) ...

delgermurun · May 28, 2015

@arunoda updated.

arunoda · May 28, 2015

arunoda reviewed May 28, 2015

View changes

arunoda · May 28, 2015

client/router.js

  _.each(self._middleware, function(fn) {
    self._page("*", fn);
  });

  _.each(self._routes, function(route) {
    self._page(route.path, route._handler);
+


May be we can isolate this into a seperate function.

arunoda · May 28, 2015

Overall this looks great to me.
But I didnt try it out locally.
Let's have some tests too.

delgermurun · May 28, 2015

Today I'll implement only and except. Then I'm going to add tests.

arunoda · May 28, 2015

Superb.
On 2015 මැයි 29, සිකු at පෙ.ව. 4.20 Delgermurun Purevkhuu <
notifications@github.com> wrote:

Today I'll implement only and except. Then I'm going to add tests.

—
Reply to this email directly or view it on GitHub
#127 (comment)
.

delgermurun · May 29, 2015

@arunoda only and except support added. Please check this out.

P.S: Sorry for interrupting too much :)

arunoda · May 29, 2015

arunoda reviewed May 29, 2015

View changes

arunoda · May 29, 2015

client/router.js

+    return false;
+  }
+
+  if (!name) {


This one affect to the only logic. So, even if it's only for one route
It's possible to call unnamed routes.

How should we declare only for this case? only: [''], only:[] or something else?

Oh, I understand incorrectly. Ignore above comment.

I just realized there is bug, sorry.

arunoda · May 29, 2015

arunoda reviewed May 29, 2015

View changes

arunoda · May 29, 2015

client/router.js

+    return true;
+  }
+
+  if (!!fn._only && _.indexOf(fn._only, name) === -1) {


It's better if we can create a map based on only and except routes
at the beginning.
Then we don't need to use indexOf.
Not only about a performance issue. It's easy to read without it.

created maps

delgermurun · May 29, 2015

Does !! need on if statement (maybe for performance)? I guess I've read something about it, but can't remember exactly.

It looks so ugly.

arunoda · May 29, 2015

I don't think so. For if statements it's okay.
You may need to do it if you really need to send a boolean

arunoda · May 29, 2015

arunoda reviewed May 29, 2015

View changes

arunoda · May 29, 2015

client/router.js

@@ -369,3 +427,56 @@ Router.prototype._updateCallbacks = function () {

 Router.prototype._page = page;
 Router.prototype._qs = qs;
+
+function shouldCallTrigger(current, fn) {


You can create these as methods in the Router class. Then we can test them individually.

I did that because of I don't want to make bigger Router class. How does it affect performance?

Don't we have other way to test :)?

We've other ways to test.
If you feel router getting bigger, try to move them to a util namespace.
I really don't like to have private methods hidden inside like this.
(I sometimes do it although if I were lazy)

arunoda · May 29, 2015

arunoda reviewed May 29, 2015

View changes

arunoda · May 29, 2015

client/router.js

+  return true;
+}
+
+function getRegisterTriggersFn(triggers) {


Same as above

arunoda · May 29, 2015

arunoda reviewed May 29, 2015

View changes

arunoda · May 29, 2015

client/router.js

+    return false;
+  }
+
+  if (!fn._only && !name) {


How about if we branch these multiples ifs into three.

if(fn._only) { // ... } else if(fn._except) { // ... } else { // ... }

For my small brain, it's super hard to read this logic :)

good idea :)

delgermurun · May 29, 2015

@arunoda updated.

Regarding class size, yeah it feels bigger. But let's just create method. Later we can improve.

arunoda · Jun 2, 2015

This implementation looks good to me. I didn't catch your last comment. Sorry for that.
When we can see tests :)
I'm eager to push this into a release.

delgermurun · Jun 2, 2015

@arunoda no problem, I'm glad that you liked it :D.

I'm going to push tests tomorrow.

arunoda · Jun 2, 2015

Awesome :)

On Tue, Jun 2, 2015 at 4:19 PM Delgermurun Purevkhuu <
notifications@github.com> wrote:

@arunoda https://github.com/arunoda no problem, I'm glad that you liked
it :D.

I'm going to push tests tomorrow.

—
Reply to this email directly or view it on GitHub
#127 (comment)
.

delgermurun · Jun 2, 2015

@arunoda added tests.

arunoda · Jun 3, 2015

I think test cases covers all the cases (or at least most of the cases)
I'll do a full code review again and get this PR.

delgermurun · Jun 3, 2015

Awesome.

delgermurun · Jun 3, 2015

Oh. Should I rebase it? @arunoda

arunoda · Jun 3, 2015

I don't think there are any conflicting changes. If you like, rebase squash it.

delgermurun · Jun 3, 2015

I mean "sqaushing" and sqaushed :D

arunoda · Jun 3, 2015

Yeah :)
On 2015 ජූනි 3, බදාදා at පෙ.ව. 11.26 Delgermurun Purevkhuu <
notifications@github.com> wrote:

I mean "sqaushing" and sqaushed :D

—
Reply to this email directly or view it on GitHub
#127 (comment)
.

arunoda · Jun 4, 2015

arunoda reviewed Jun 4, 2015

View changes

arunoda · Jun 4, 2015

client/router.js

-      next();
-    }, 0);
+  this._triggersEnter.push(function(ctx) {
+    var str = location.search.slice(1);


I think here we can't depend on the location. I think right now, location is not yet changed?
Quite not sure, I'll check.

Edit: I think, I might be wrong, since now we are not depends on pagejs middleware for this

arunoda · Jun 4, 2015

arunoda reviewed Jun 4, 2015

View changes

arunoda · Jun 4, 2015

client/router.js

+  self._page.exits = [];
+
+  self._page("*", function(ctx, next) {
+    var str = location.search.slice(1);


Why two places processing qs?

Oh, I forgot to delete it.

arunoda · Jun 4, 2015

arunoda reviewed Jun 4, 2015

View changes

arunoda · Jun 4, 2015

client/router.js

  _.each(self._middleware, function(fn) {
    self._page("*", fn);
  });

  _.each(self._routes, function(route) {
    self._page(route.path, route._handler);
+    self._processRouteTriggersExit(route);


I think this function should be _registerRouteTriggersExit

arunoda · Jun 4, 2015

@delgermurun don't do any changes I requested. I simply did them :)

delgermurun · Jun 4, 2015

@arunoda okay. Thanks.

delgermurun · Jun 4, 2015

@arunoda Oh, one thing to mention. How did you refactor ctx.params.query = self._qs.parse(str); section. It inserts on last of the global enter triggers. I think we should move it to contructor function.

arunoda · Jun 4, 2015

I did this in place where we set _current. here: https://goo.gl/jrqwgi

delgermurun · Jun 4, 2015

Okay. You already noticed that :).

arunoda · Jun 4, 2015

I manually took the PR. It's alive.

delgermurun · Jun 4, 2015

🎉

delgermurun force-pushed the delgermurun:improved-middlewares branch from ff5a803 to b16cd1c May 27, 2015

delgermurun force-pushed the delgermurun:improved-middlewares branch from 94ea27d to 7c2b6c6 May 29, 2015

Implement triggers. Fix #59.

Loading status checks…

52e0867

delgermurun force-pushed the delgermurun:improved-middlewares branch from a6f2edc to 52e0867 Jun 3, 2015

arunoda closed this Jun 4, 2015

delgermurun deleted the delgermurun:improved-middlewares branch Jun 4, 2015

kadirahq/flow-router

Join GitHub today

[WIP] Fix #59 - Improved Middlewares #127

Conversation

delgermurun commented May 27, 2015

delgermurun force-pushed the delgermurun:improved-middlewares branch from ff5a803 to b16cd1c May 27, 2015

This comment has been minimized.

delgermurun commented May 27, 2015

arunoda reviewed May 27, 2015 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

arunoda commented May 27, 2015

This comment has been minimized.

delgermurun commented May 28, 2015

arunoda reviewed May 28, 2015 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

arunoda reviewed May 28, 2015 View changes

This comment has been minimized.

This comment has been minimized.

delgermurun commented May 28, 2015

arunoda reviewed May 28, 2015 View changes

This comment has been minimized.

This comment has been minimized.

arunoda commented May 28, 2015

This comment has been minimized.

delgermurun commented May 28, 2015

This comment has been minimized.

arunoda commented May 28, 2015

This comment has been minimized.

delgermurun commented May 29, 2015

arunoda reviewed May 29, 2015 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

arunoda reviewed May 29, 2015 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

delgermurun commented May 29, 2015

This comment has been minimized.

arunoda commented May 29, 2015

arunoda reviewed May 29, 2015 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

arunoda reviewed May 29, 2015 View changes

This comment has been minimized.

delgermurun force-pushed the delgermurun:improved-middlewares branch from 94ea27d to 7c2b6c6 May 29, 2015

arunoda reviewed May 29, 2015 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

delgermurun commented May 29, 2015

This comment has been minimized.

arunoda commented Jun 2, 2015

This comment has been minimized.

delgermurun commented Jun 2, 2015

This comment has been minimized.

arunoda commented Jun 2, 2015

This comment has been minimized.

delgermurun commented Jun 2, 2015

This comment has been minimized.

arunoda commented Jun 3, 2015

This comment has been minimized.

delgermurun commented Jun 3, 2015

This comment has been minimized.

delgermurun commented Jun 3, 2015

This comment has been minimized.

arunoda commented Jun 3, 2015

delgermurun force-pushed the delgermurun:improved-middlewares branch from a6f2edc to 52e0867 Jun 3, 2015

This comment has been minimized.

delgermurun commented Jun 3, 2015

This comment has been minimized.

delgermurun force-pushed the delgermurun:improved-middlewares branch from `ff5a803` to `b16cd1c` May 27, 2015

arunoda reviewed May 27, 2015

View changes

arunoda reviewed May 28, 2015

View changes

arunoda reviewed May 28, 2015

View changes

arunoda reviewed May 28, 2015

View changes

arunoda reviewed May 29, 2015

View changes

arunoda reviewed May 29, 2015

View changes

arunoda reviewed May 29, 2015

View changes

arunoda reviewed May 29, 2015

View changes

delgermurun force-pushed the delgermurun:improved-middlewares branch from `94ea27d` to `7c2b6c6` May 29, 2015

arunoda reviewed May 29, 2015

View changes

delgermurun force-pushed the delgermurun:improved-middlewares branch from `a6f2edc` to `52e0867` Jun 3, 2015

arunoda reviewed Jun 4, 2015

View changes

arunoda reviewed Jun 4, 2015

View changes

arunoda reviewed Jun 4, 2015

View changes