Remove Asset management code

CHANGELOG.md

@@ -1,9 +1,14 @@
 master
 ------
 
+* Extract `include_ember_*_tags` and the associated code to the
+  `ember-cli-rails-assets` gem. Add `ember-cli-rails-assets` as a dependency.
+  [#363]
 * Introduce `mount_ember_assets` to serve Ember assets in asset-helper style
   projects.
 
+[#363]: https://github.com/thoughtbot/ember-cli-rails/pull/363
+
 0.6.0
 -----
 

app/helpers/ember_rails_helper.rb

@@ -1,5 +1,4 @@
 require "html_page/capture"
-require "ember_cli/assets"
 
 module EmberRailsHelper
   def render_ember_app(name, &block)
@@ -11,24 +10,4 @@ def render_ember_app(name, &block)
 
     render inline: EmberCli[name].index_html(head: head, body: body)
   end
-
-  def include_ember_script_tags(name, **options)
-    EmberCli[name].build
-
-    assets = EmberCli::Assets.new(EmberCli[name])
-
-    assets.javascript_assets.
-      map { |src| %{<script src="#{src}"></script>}.html_safe }.
-      reduce(&:+)
-  end
-
-  def include_ember_stylesheet_tags(name, **options)
-    EmberCli[name].build
-
-    assets = EmberCli::Assets.new(EmberCli[name])
-
-    assets.stylesheet_assets.
-      map { |src| %{<link rel="stylesheet" href="#{src}">}.html_safe }.
-      reduce(&:+)
-  end
 end

ember-cli-rails.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.1.0"
 
+  spec.add_dependency "ember-cli-rails-assets", ">= 0.6.1"
   spec.add_dependency "railties", ">= 3.2", "< 5"
   spec.add_dependency "cocaine", "~> 0.5.8"
   spec.add_dependency "html_page", "~> 0.1.0"

lib/ember-cli-rails.rb

@@ -1,5 +1,6 @@
 require "fileutils"
-require "ember_cli/engine" if defined?(Rails)
+require "ember_cli/engine"
+require "ember-cli-rails-assets"
 require "ember_cli/errors"
 
 module EmberCli

lib/ember_cli/app.rb

@@ -24,10 +24,14 @@ def initialize(name, **options)
       @build = BuildMonitor.new(name, @paths)
     end
 
-    def root
+    def root_path
       paths.root
     end
 
+    def dist_path
+      paths.dist
+    end
+
     def compile
       @compiled ||= begin
         prepare

lib/ember_cli/path_set.rb

@@ -34,22 +34,10 @@ def dist
       @dist ||= ember_cli_root.join("apps", app_name).tap(&:mkpath)
     end
 
-    def asset_map
-      @asset_map ||= Pathname.glob(assets.join("assetMap*.json")).first
-    end
-
-    def assets
-      @assets ||= dist.join("assets").tap(&:mkpath)
-    end
-
     def gemfile
       @gemfile ||= root.join("Gemfile")
     end
 
-    def package_json_file
-      @package_json_file ||= root.join("package.json")
-    end
-
     def ember
       @ember ||= begin
         root.join("node_modules", ".bin", "ember").tap do |path|

lib/ember_cli/route_helpers.rb

@@ -3,12 +3,6 @@
 module ActionDispatch
   module Routing
     class Mapper
-      def mount_ember_assets(app_name, to: "/")
-        dist_directory = EmberCli[app_name].paths.dist
-
-        mount Rack::File.new(dist_directory.to_s) => to
-      end
-
       def mount_ember_app(app_name, to:, **options)
         routing_options = options.deep_merge(
           defaults: { ember_app: app_name },
@@ -25,7 +19,9 @@ def mount_ember_app(app_name, to:, **options)
             get("#{to}(*rest)", routing_options)
           end
 
-          mount_ember_assets app_name, to: to
+          dist_directory = EmberCli[app_name].paths.dist
+
+          mount Rack::File.new(dist_directory.to_s) => to
         end
       end
     end

lib/generators/ember/heroku/heroku_generator.rb

@@ -19,7 +19,7 @@ def inject_12factor_gem
 
     def app_paths
       EmberCli.apps.values.map do |app|
-        app.root.relative_path_from(Rails.root)
+        app.root_path.relative_path_from(Rails.root)
       end
     end
   end

spec/lib/ember_cli/app_spec.rb

@@ -17,17 +17,33 @@
     end
   end
 
-  describe "#root" do
+  describe "#root_path" do
     it "delegates to PathSet" do
       root_path = Pathname(".")
-      allow_any_instance_of(EmberCli::PathSet).
-        to receive(:root).
-        and_return(root_path)
+      stub_paths(root: root_path)
       app = EmberCli::App.new("foo")
 
-      root = app.root
+      root_path = app.root_path
 
-      expect(root).to eq root_path
+      expect(root_path).to eq root_path
     end
   end
+
+  describe "#dist_path" do
+    it "delegates to PathSet" do
+      dist_path = Pathname(".")
+      stub_paths(dist: dist_path)
+      app = EmberCli::App.new("foo")
+
+      dist_path = app.dist_path
+
+      expect(dist_path).to eq dist_path
+    end
+  end
+
+  def stub_paths(method_to_value)
+    allow_any_instance_of(EmberCli::PathSet).
+      to receive(method_to_value.keys.first).
+      and_return(method_to_value.values.first)
+  end
 end