-
Notifications
You must be signed in to change notification settings - Fork 204
Include helper & extra modules when using API. #466
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
Closed
undergroundwebdesigns
wants to merge
8
commits into
tricknotes:sd-rails-5
from
UndergroundWebDevelopment:sd-rails-5
Closed
Include helper & extra modules when using API. #466
undergroundwebdesigns
wants to merge
8
commits into
tricknotes:sd-rails-5
from
UndergroundWebDevelopment:sd-rails-5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closes [tricknotes#376]. Required changes ---------------- Run test suite against the latest `5.0.0.betaX` and `master` branches of [`rails/rails`][rails]. Since `EmberController` extends `ApplicationController`, which can now extend from either `ActionController::Base` (which implements `helper_method`) and `ActionController::API` (which doesn't implement `helper_method`), we can't depend on that API existing. Remove call to `helper_method` from `EmberController`, as it is no longer supported. Support changes --------------- Rails 5 depends on `[email protected]`, which **requires** Ruby `2.2.2` or greater. In order to support Rails 5, we will no longer support versions of Ruby prior to `2.2.2`. [tricknotes#376]: tricknotes#376 [rails]: https://github.com/rails/rails
* Don't overwrite `gemfiles/` changes with `appraisal install` * Localize Ember setup to `bin/setup_ember` * Always invoke, let `bin/setup_ember` decide whether or not to no-op
The `EmberCli::EmberController` used to inherit from `ApplicationController` in order to reap the benefits of application-wide configurations and behavior (such as authentication-based `before_action` calls and other macros). Unfortunately, with the introduction of Rails 5's `rails new --api`, applications' `ApplicationController` can now inherit from [`ActionController::API`][api], which doesn't serve HTML by default. To support Rails 5's default `--api` behavior, `EmberCli::EmberController` must inherit from `ActionController::Base`, forcing the controller to forfeit all the benefits of sharing behavior with `ApplicationController`. [api]: http://edgeapi.rubyonrails.org/classes/ActionController/API.html
Adds logic to conditionally load extra controller modules and manually include the EmberCLI helper when inheriting from an ApplicationController that inherits from ActionController::API instead of ActionController::Base.
| # ).each do |mod| | ||
| # include mod | ||
| # end | ||
| unless self.ancestors.include? ActionController::Base |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Redundant self detected.
Closed
|
+1 |
4227314 to
8838c07
Compare
ceed542 to
876720b
Compare
Contributor
|
Closing in favor of #400. If you think this shouldn't be closed, please comment and I'll reopen. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds logic to conditionally load extra controller modules and manually include the EmberCLI helper when inheriting from an ApplicationController that inherits from ActionController::API instead of ActionController::Base. Allows the gem to work as expected with Rails 5 apps that use the
--apioption when generating the app.