Introduce EmberCli::Assets::Paths

Decorates `EmberCli::App#{root,dist}_path` for asset-specific
directories and files.

Author: seanpdoyle

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/thoughtbot/ember-cli-rails.git
-  revision: f1de6c17dab6f40cd8b947351328611f7bca63f8
+  revision: 2adf53b1544a31a8acd347b67d7bae21ebfcf93f
   branch: remove-assets
   specs:
     ember-cli-rails (0.6.0)

gemfiles/3.2.gemfile

@@ -8,10 +8,10 @@ gem "rails", :git => "https://github.com/rails/rails.git", :branch => "3-2-stabl
 
 group :development, :test do
   gem "pry"
+  gem "ember-cli-rails", :github => "thoughtbot/ember-cli-rails", :branch => "remove-assets"
 end
 
 group :test do
-  gem "ember-cli-rails", :github => "thoughtbot/ember-cli-rails", :branch => "1.0.0-beta"
   gem "poltergeist", "~> 1.8.0"
   gem "rspec-rails"
 end

gemfiles/4.1.gemfile

@@ -7,10 +7,10 @@ gem "rails", "~> 4.1.1"
 
 group :development, :test do
   gem "pry"
+  gem "ember-cli-rails", :github => "thoughtbot/ember-cli-rails", :branch => "remove-assets"
 end
 
 group :test do
-  gem "ember-cli-rails", :github => "thoughtbot/ember-cli-rails", :branch => "1.0.0-beta"
   gem "poltergeist", "~> 1.8.0"
   gem "rspec-rails"
 end

gemfiles/4.2.gemfile

@@ -7,10 +7,10 @@ gem "rails", "~> 4.2.1"
 
 group :development, :test do
   gem "pry"
+  gem "ember-cli-rails", :github => "thoughtbot/ember-cli-rails", :branch => "remove-assets"
 end
 
 group :test do
-  gem "ember-cli-rails", :github => "thoughtbot/ember-cli-rails", :branch => "1.0.0-beta"
   gem "poltergeist", "~> 1.8.0"
   gem "rspec-rails"
 end

lib/ember_cli/assets/asset_map.rb

@@ -3,8 +3,8 @@
 module EmberCli
   module Assets
     class AssetMap
-      def initialize(ember_app_name:, asset_map:)
-        @ember_app_name = ember_app_name
+      def initialize(name:, asset_map:)
+        @name = name
         @asset_map = asset_map
       end
 
@@ -13,7 +13,7 @@ def javascripts
 
         [
           asset_matching(/vendor(.*)\.js\z/),
-          asset_matching(/#{ember_app_name}(.*)\.js\z/),
+          asset_matching(/#{name}(.*)\.js\z/),
         ]
       end
 
@@ -22,13 +22,13 @@ def stylesheets
 
         [
           asset_matching(/vendor(.*)\.css\z/),
-          asset_matching(/#{ember_app_name}(.*)\.css\z/),
+          asset_matching(/#{name}(.*)\.css\z/),
         ]
       end
 
       private
 
-      attr_reader :app_name, :ember_app_name, :asset_map
+      attr_reader :name, :asset_map
 
       def asset_matching(regex)
         matching_asset = files.detect { |asset| asset =~ regex }
@@ -59,7 +59,7 @@ def raise_missing_asset(regex)
       def assert_asset_map!
         if assets.empty?
           raise BuildError.new <<-MSG
-            Missing `#{ember_app_name}/assets/assetMap.json`
+            Missing `#{name}/assets/assetMap.json`
           MSG
         end
       end

lib/ember_cli/assets/lookup.rb

@@ -1,3 +1,4 @@
+require "ember_cli/assets/paths"
 require "ember_cli/assets/asset_map"
 require "ember_cli/assets/directory_asset_map"
 
@@ -6,6 +7,7 @@ module Assets
     class Lookup
       def initialize(app)
         @app = app
+        @paths = Paths.new(app)
       end
 
       def javascript_assets
@@ -18,36 +20,33 @@ def stylesheet_assets
 
       private
 
-      attr_reader :app
+      attr_reader :app, :paths
 
       def asset_map
         AssetMap.new(
-          ember_app_name: ember_app_name,
+          name: name_from_package_json,
           asset_map: asset_map_hash.to_h,
         )
       end
 
       def asset_map_file
-        app.paths.asset_map
+        paths.asset_map
       end
 
       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)
+          DirectoryAssetMap.new(paths.assets)
         end
       end
 
-      def ember_app_name
-        @ember_app_name ||= app.options.fetch(:name) do
-          package_json.fetch(:name)
-        end
+      def name_from_package_json
+        package_json.fetch("name")
       end
 
       def package_json
-        @package_json ||=
-          JSON.parse(app.paths.package_json_file.read).with_indifferent_access
+        @package_json ||= JSON.parse(paths.package_json.read)
       end
     end
   end

lib/ember_cli/assets/paths.rb

@@ -0,0 +1,25 @@
+module EmberCli
+  module Assets
+    class Paths
+      def initialize(app)
+        @app = app
+      end
+
+      def assets
+        app.dist_path.join("assets")
+      end
+
+      def asset_map
+        Pathname.glob(assets.join("assetMap*.json")).first
+      end
+
+      def package_json
+        app.root_path.join("package.json")
+      end
+
+      protected
+
+      attr_reader :app
+    end
+  end
+end

spec/lib/ember_cli/assets/asset_map_spec.rb

@@ -11,10 +11,7 @@
         },
         "prepend" => "foo/",
       }
-      assets = build_assets(
-        ember_app_name: "bar",
-        asset_map: asset_map,
-      )
+      assets = build_assets(name: "bar", asset_map: asset_map)
 
       javascripts = assets.javascripts
 
@@ -26,10 +23,7 @@
 
     context "when the asset_map is empty" do
       it "raises a BuildError" do
-        assets = build_assets(
-          asset_map: {},
-          ember_app_name: "bar",
-        )
+        assets = build_assets(asset_map: {}, name: "bar")
 
         expect { assets.javascripts }.to raise_build_error
       end
@@ -46,10 +40,7 @@
         },
         "prepend" => "foo/",
       }
-      assets = build_assets(
-        ember_app_name: "bar",
-        asset_map: asset_map,
-      )
+      assets = build_assets(name: "bar", asset_map: asset_map)
 
       stylesheets = assets.stylesheets
 
@@ -61,10 +52,7 @@
 
     context "when the asset_map is empty" do
       it "raises a BuildError" do
-        assets = build_assets(
-          asset_map: {},
-          ember_app_name: "bar",
-        )
+        assets = build_assets(asset_map: {}, name: "bar")
 
         expect { assets.stylesheets }.to raise_build_error
       end

spec/lib/ember_cli/assets/paths_spec.rb

@@ -0,0 +1,53 @@
+require "ember_cli/assets/paths"
+require "fileutils"
+require "pathname"
+require "tmpdir"
+
+describe EmberCli::Assets::Paths do
+  describe "#package_json" do
+    it "is a child of EmberCli::App#root_path" do
+      app = build_app
+      paths = EmberCli::Assets::Paths.new(app)
+
+      expect(paths.package_json).to eq app.root_path.join("package.json")
+    end
+  end
+
+  describe "#assets" do
+    it "is a child of EmberCli::App#dist_path" do
+      app = build_app
+      paths = EmberCli::Assets::Paths.new(app)
+
+      expect(paths.assets).to eq app.dist_path.join("assets")
+    end
+  end
+
+  describe "#asset_map" do
+    it "globs the EmberCli::App#dist_path directory for an `asset_map.json`" do
+      app = build_app
+      paths = EmberCli::Assets::Paths.new(app)
+      asset_map = app.dist_path.join("assets", "assetMap-abc123.json")
+      create_file(asset_map)
+
+      expect(paths.asset_map).to exist
+      expect(paths.asset_map).to eq(asset_map)
+    end
+  end
+
+  def build_app
+    root_path = Pathname.new(Dir.mktmpdir)
+
+    double(
+      root_path: root_path,
+      dist_path: root_path.join("dist").tap(&:mkpath),
+    )
+  end
+
+  def create_file(path)
+    path.parent.mkpath
+
+    FileUtils.touch(path)
+
+    path
+  end
+end