Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plug Updates #38

Merged
merged 3 commits into from
Feb 12, 2014
Merged

Plug Updates #38

merged 3 commits into from
Feb 12, 2014

Conversation

slogsdon
Copy link
Contributor

fixes #36.

Latest version of plug breaks routing/dispatching. The plug adapters are expecting just a conn returned, no {:ok, conn}. Plus, the router (which is acting as a plug) needs to have init/1 defined for initialization of the options.

Also updates the deprecated // to \\ to remove compile warning messages.

Latest version of plug breaks routing/dispatching.
The plug adapters are expecting just a conn returned,
no {:ok, conn}. Plus, the router (which is acting as
a plug) needs to have init/1 defined for initialization
of the options.
@ericmj
Copy link
Contributor

ericmj commented Feb 11, 2014

@slogsdon Change mix.exs to depend on elixir v0.12.3 if you change // to \\.

@slogsdon
Copy link
Contributor Author

@ericmj I'll update the mix file here shortly. I had forgotten about it because of the latest version of plug requiring v0.12.4-dev.

@slogsdon
Copy link
Contributor Author

Updated to reflect the Elxiir v012.4-dev requirement of Plug. Thanks for catching that, @ericmj.

@chrismccord
Copy link
Member

Thanks @slogsdon . I need to pull this down and tweak the dispatch/controller code since it is still returning {:ok, conn}, i.e. when there's an error in the Controller. This is nice start though.

@slogsdon
Copy link
Contributor Author

@chrismccord No problem. I thought I had caught all of the instances where {:ok, conn} was being returned. I can finish the changes if you haven't already started.

@chrismccord
Copy link
Member

Please go ahead with the changes!

corrects tests as well. not sure why i didn't do this in the first place
@slogsdon
Copy link
Contributor Author

Pushed a fix to properly match on errors @chrismccord. Tests have been updated as well (sorry about not doing this in the first place) and are green.

@chrismccord chrismccord merged commit 00c731d into phoenixframework:master Feb 12, 2014
@chrismccord
Copy link
Member

Thank you!

@slogsdon
Copy link
Contributor Author

No problem!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants