ember-cli-rails 0.5.8 → 0.6.0

data/app/controller/ember_cli/ember_controller.rb

@@ -1,9 +1,12 @@
 module EmberCli
   class EmberController < ::ApplicationController
     def index
-      @app = params[:ember_app]
-
       render layout: false
     end
+
+    def ember_app
+      params[:ember_app]
+    end
+    helper_method :ember_app
   end
 end

data/app/helpers/ember_rails_helper.rb

@@ -1,59 +1,34 @@
 require "ember_cli/capture"
+require "ember_cli/assets"
 
 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)
+    EmberCli[name].build
+
     markup_capturer = EmberCli::Capture.new(sprockets: self, &block)
 
     head, body = markup_capturer.capture
 
-    render inline: EmberCli[name].sprockets.index_html(head: head, body: body)
+    render inline: EmberCli[name].index_html(head: head, body: body)
   end
 
   def include_ember_script_tags(name, **options)
-    Warnings.warn_asset_helper
-
-    javascript_include_tag(*EmberCli[name].sprockets.javascript_assets, options)
-  end
+    EmberCli[name].build
 
-  def include_ember_stylesheet_tags(name, **options)
-    Warnings.warn_asset_helper
+    assets = EmberCli::Assets.new(EmberCli[name])
 
-    stylesheet_link_tag(*EmberCli[name].sprockets.stylesheet_assets, options)
+    assets.javascript_assets.
+      map { |src| %{<script src="#{src}"></script>}.html_safe }.
+      reduce(&:+)
   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
-          `ember-cli-rails` no longer supports Sprockets-based helpers for Rails
-          versions below 4.0.
-
-          Replace usage of
-            * `include_ember_script_tags`
-            * `include_ember_stylesheet_tags`
-
-          with `render_ember_app` invocations.
+  def include_ember_stylesheet_tags(name, **options)
+    EmberCli[name].build
 
-          To learn more, please read:
+    assets = EmberCli::Assets.new(EmberCli[name])
 
-          * https://github.com/thoughtbot/ember-cli-rails#configuring-the-ember-controller
-          * https://github.com/thoughtbot/ember-cli-rails/pull/316
-        MSG
-      end
-    end
+    assets.stylesheet_assets.
+      map { |src| %{<link rel="stylesheet" href="#{src}">}.html_safe }.
+      reduce(&:+)
   end
 end

data/app/views/ember_cli/ember/index.html.erb

@@ -1,4 +1,4 @@
-<%= render_ember_app @app do |head| %>
+<%= render_ember_app ember_app do |head| %>
   <% head.append do %>
     <%= csrf_meta_tags %>
   <% end %>

data/lib/ember-cli-rails.rb

@@ -24,37 +24,31 @@ module EmberCli
     end
   end
 
+  def build(name)
+    app(name).build
+  end
+
   alias_method :[], :app
 
   def skip?
     ENV["SKIP_EMBER"].present?
   end
 
-  def enable!
-    @enabled ||= begin
-      Rails.configuration.assets.paths << root.join("assets").to_s
-      cleanup
-      true
-    end
-  end
-
   def install_dependencies!
-    enable!
     each_app(&:install_dependencies)
   end
 
   def test!
-    enable!
     each_app(&:test)
   end
 
   def compile!
-    enable!
+    cleanup!
     each_app(&:compile)
   end
 
   def root
-    @root ||= tmp.join("ember-cli-#{uid}")
+    @root ||= Rails.root.join("tmp", "ember-cli").tap(&:mkpath)
   end
 
   def env
@@ -65,22 +59,8 @@ module EmberCli
 
   private
 
-  def cleanup
-    previous_builds.each do |path|
-      FileUtils.rm_rf(path)
-    end
-  end
-
-  def previous_builds
-    Pathname.glob(tmp.join("ember-cli-*"))
-  end
-
-  def tmp
-    Rails.root.join("tmp")
-  end
-
-  def uid
-    @uid ||= SecureRandom.uuid
+  def cleanup!
+    root.children.each { |tmp_file| FileUtils.rm_rf(tmp_file) }
   end
 
   def each_app

data/lib/ember_cli/app.rb

@@ -1,5 +1,5 @@
 require "ember_cli/shell"
-require "ember_cli/sprockets"
+require "ember_cli/html_page"
 require "ember_cli/build_monitor"
 
 module EmberCli
@@ -33,7 +33,6 @@ module EmberCli
         prepare
         @shell.compile
         @build.check!
-        copy_index_html_file
         true
       end
     end
@@ -48,6 +47,24 @@ module EmberCli
       @build.wait!
     end
 
+    def index_html(head:, body:)
+      if index_file.exist?
+        html = HtmlPage.new(
+          head: head,
+          body: body,
+          content: index_file.read,
+        )
+
+        html.render
+      else
+        @build.check!
+
+        raise BuildError.new <<-MSG
+          EmberCLI failed to generate an `index.html` file.
+        MSG
+      end
+    end
+
     def install_dependencies
       @shell.install
     end
@@ -58,22 +75,14 @@ module EmberCli
       @shell.test
     end
 
-    def sprockets
-      EmberCli::Sprockets.new(self)
-    end
+    private
+
+    delegate :development?, :test?, to: :env
 
     def index_file
-      if production?
-        paths.applications.join("#{name}.html")
-      else
-        paths.dist.join("index.html")
-      end
+      paths.index_file
     end
 
-    private
-
-    delegate :development?, :production?, :test?, to: :env
-
     def env
       EmberCli.env
     end
@@ -81,30 +90,15 @@ module EmberCli
     def build_and_watch
       prepare
       @shell.build_and_watch
-      copy_index_html_file
     end
 
     def prepare
       @prepared ||= begin
         @build.reset
-        symlink_to_assets_root
         true
       end
     end
 
-    def copy_index_html_file
-      if production?
-        FileUtils.cp(paths.app_assets.join("index.html"), index_file)
-      end
-    end
-
-    def symlink_to_assets_root
-      paths.app_assets.make_symlink paths.dist
-    rescue Errno::EEXIST
-      # Sometimes happens when starting multiple Unicorn workers.
-      # Ignoring...
-    end
-
     def excluded_ember_deps
       Array.wrap(options[:exclude_ember_deps]).join(?,)
     end

data/lib/ember_cli/asset_map.rb

@@ -0,0 +1,64 @@
+require "ember_cli/errors"
+
+module EmberCli
+  class AssetMap
+    def initialize(ember_app_name:, asset_map:)
+      @ember_app_name = ember_app_name
+      @asset_map = asset_map
+    end
+
+    def javascripts
+      assert_asset_map!
+
+      [
+        asset_matching(%r{vendor(.*)\.js\z}),
+        asset_matching(%r{#{ember_app_name}(.*)\.js\z}),
+      ]
+    end
+
+    def stylesheets
+      assert_asset_map!
+
+      [
+        asset_matching(%r{vendor(.*)\.css\z}),
+        asset_matching(%r{#{ember_app_name}(.*)\.css\z}),
+      ]
+    end
+
+    private
+
+    attr_reader :app_name, :ember_app_name, :asset_map
+
+    def asset_matching(regex)
+      matching_asset = files.detect { |asset| asset =~ regex }
+
+      if matching_asset.blank?
+        raise_missing_asset(regex)
+      end
+
+      prepend + matching_asset
+    end
+
+    def prepend
+      asset_map["prepend"].to_s
+    end
+
+    def files
+      Array(assets.values)
+    end
+
+    def assets
+      asset_map["assets"] || {}
+    end
+
+    def raise_missing_asset(regex)
+      raise BuildError.new("Failed to find assets matching `#{regex}`")
+    end
+
+    def assert_asset_map!
+      if assets.empty?
+        raise BuildError.new("Missing `#{ember_app_name}/assets/assetMap.json`")
+      end
+    end
+  end
+end

data/lib/ember_cli/assets.rb

@@ -1,66 +1,51 @@
+require "ember_cli/errors"
+require "ember_cli/asset_map"
+require "ember_cli/directory_asset_map"
+
 module EmberCli
   class Assets
-    def initialize(app_name:, ember_app_name:, manifest:)
-      @app_name = app_name
-      @ember_app_name = ember_app_name
-      @manifest = manifest
+    def initialize(app)
+      @app = app
     end
 
-    def javascripts
-      if empty_manifest?
-        fallback_assets
-      else
-        [
-          latest_matching(%r{#{app_name}/assets/vendor(.*)\.js\z}),
-          latest_matching(%r{#{app_name}/assets/#{ember_app_name}(.*)\.js\z}),
-        ]
-      end
+    def javascript_assets
+      asset_map.javascripts
     end
 
-    def stylesheets
-      if empty_manifest?
-        fallback_assets
-      else
-        [
-          latest_matching(%r{#{app_name}/assets/vendor(.*)\.css\z}),
-          latest_matching(%r{#{app_name}/assets/#{ember_app_name}(.*)\.css\z}),
-        ]
-      end
+    def stylesheet_assets
+      asset_map.stylesheets
     end
 
     private
 
-    attr_reader :app_name, :ember_app_name, :manifest
+    attr_reader :app
 
-    def fallback_assets
-      ["#{app_name}/assets/vendor", "#{app_name}/assets/#{ember_app_name}"]
+    def asset_map
+      AssetMap.new(
+        ember_app_name: ember_app_name,
+        asset_map: asset_map_hash.to_h,
+      )
     end
 
-    def empty_manifest?
-      files.empty?
+    def asset_map_file
+      app.paths.asset_map
     end
 
-    def latest_matching(regex)
-      asset, = assets.detect { |(_, digest)| digest == latest_file_for(regex) }
-
-      asset
-    end
-
-    def latest_file_for(regex)
-      file, = files.
-        select { |key, _| key =~ regex }.
-        sort_by { |_, data| data["mtime"] }.
-        last
-
-      file
+    def asset_map_hash
+      if asset_map_file.present? && asset_map_file.exist?
+        JSON.parse(asset_map_file.read)
+      else
+        DirectoryAssetMap.new(app.paths.assets)
+      end
     end
 
-    def assets
-      manifest.assets
+    def ember_app_name
+      @ember_app_name ||= app.options.fetch(:name) { package_json.fetch(:name) }
     end
 
-    def files
-      manifest.files
+    def package_json
+      @package_json ||=
+        JSON.parse(app.paths.package_json_file.read).with_indifferent_access
     end
   end
 end

data/lib/ember_cli/command.rb

@@ -14,31 +14,39 @@ module EmberCli
     end
 
     def build(watch: false)
+      "#{ember_build(watch: watch)} | #{tee}"
+    end
+
+    private
+
+    attr_reader :options, :paths
+
+    def process_watcher
+      options.fetch(:watcher) { EmberCli.configuration.watcher }
+    end
+
+    def tee
+      Cocaine::CommandLine.
+        new(paths.tee, "-a :log").
+        command(log: paths.log)
+    end
+
+    def ember_build(watch: false)
       line = Cocaine::CommandLine.new(paths.ember, [
         "build",
         ("--watch" if watch),
         ("--watcher :watcher" if process_watcher),
         "--environment :environment",
         "--output-path :output_path",
-        "2> :error_file",
       ].compact.join(" "))
 
       line.command(
         environment: build_environment,
         output_path: paths.dist,
         watcher: process_watcher,
-        error_file: paths.build_error_file,
       )
     end
 
-    private
-
-    attr_reader :options, :paths
-
-    def process_watcher
-      options.fetch(:watcher) { EmberCli.configuration.watcher }
-    end
-
     def build_environment
       if EmberCli.env == "production"
         "production"