Skip to content

Commit

Permalink
Remove Deprecated Methods
Browse files Browse the repository at this point in the history
* Removes deprecated `include_ember_index_html` helper.
* Removes deprecated `build_timeout` and `enabled` configuration values.
  • Loading branch information
seanpdoyle committed Dec 9, 2015
1 parent 167a1b7 commit e5954df
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 50 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
master
------

* Remove deprecated `include_ember_index_html` helper and deprecated
`build_timeout` and `enabled` configurations. [#334]
* Raise build errors for `render_ember_app` failures. [#325]
* Remove `before_{action,filter}` in favor of explicit `EmberCli.build(app)`
call. [#327]

[#334]: https://github.com/thoughtbot/ember-cli-rails/pull/334
[#327]: https://github.com/thoughtbot/ember-cli-rails/pull/327
[#325]: https://github.com/thoughtbot/ember-cli-rails/pull/325

Expand Down
14 changes: 0 additions & 14 deletions app/helpers/ember_rails_helper.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
require "ember_cli/capture"

module EmberRailsHelper
def include_ember_index_html(name, &block)
Warnings.warn_include_index_html

render_ember_app(name, &block)
end

def render_ember_app(name, &block)
markup_capturer = EmberCli::Capture.new(sprockets: self, &block)

Expand All @@ -28,14 +22,6 @@ def include_ember_stylesheet_tags(name, **options)
end

module Warnings
def self.warn_include_index_html
warn <<-MSG.strip_heredoc
The `include_ember_index_html` helper has been deprecated.
Rename all invocations to `render_ember_app`
MSG
end

def self.warn_asset_helper
if Rails::VERSION::MAJOR < 4
warn <<-MSG.strip_heredoc
Expand Down
36 changes: 0 additions & 36 deletions lib/ember_cli/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@ class Configuration
include Singleton

def app(name, **options)
if options.has_key? :build_timeout
deprecate_timeout
end

if options.has_key? :enable
deprecate_enable
end

app = App.new(name, options)
app.sprockets.register!
apps.store(name, app)
Expand All @@ -34,34 +26,6 @@ def bundler_path
@bundler_path ||= Helpers.which("bundler")
end

def build_timeout=(*)
deprecate_timeout
end

attr_accessor :watcher

private

def deprecate_enable
warn <<-WARN.strip_heredoc
The `enable` lambda configuration has been removed.
Please read https://github.com/thoughtbot/ember-cli-rails/pull/261 for
details.
WARN
end

def deprecate_timeout
warn <<-WARN.strip_heredoc
The `build_timeout` configuration has been removed.
Please read https://github.com/thoughtbot/ember-cli-rails/pull/259 for
details.
WARN
end
end
end

0 comments on commit e5954df

Please sign in to comment.