ember-cli-rails 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76353b506d35c0822340fbe4811403afd3078b42
-  data.tar.gz: c70a6346f869e47826c2a56b27cb5fe01a6d506c
+  metadata.gz: ddb6dc3742597e8044ab777f9497be13fa30bd10
+  data.tar.gz: 65afcdf3aedec901b2fd606624f5117c1cee659a
 SHA512:
-  metadata.gz: a8c2bf094b44381b615e9077a7d4e0951e5d55c07d240a229ab18f21a70905d057da6f9b83961a1c574d126d5aa9c6a10c238a643a4898f9a532198e11bcac7e
-  data.tar.gz: 00447aca1034efe20b110828bcc0d363077192c2dfe58e90a604afddf3d14e3dd56b4a644cedcf770c7a00d9be118b8bf78d7ef4862cf81b6f8a35a0bedfe883
+  metadata.gz: aabc433601664fa93b54d67612517f57771841f090829f2b0f5c84e61d2a0333f9c61d417794c586302073940fcafed7a63648cab4d733b67d098356568efc1e
+  data.tar.gz: e4e4652c381c9182e8cc95bd486e078a2e2ffe4a2c12abc7fa24861a8bc0f928b89680199299371d74345717c73afc475a680ba12bc1c0de1e86531df30fc6dc

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 master
 ------
 
+0.5.2
+-----
+
+* Register EmberCLI app with Sprockets on application initialization
+* Rename `ember-cli` to `ember_cli` in Ruby.
+
 0.5.1
 -----
 

data/app/helpers/ember_rails_helper.rb

@@ -1,4 +1,4 @@
-require "ember-cli/capture"
+require "ember_cli/capture"
 
 module EmberRailsHelper
   def include_ember_index_html(name, &block)

data/lib/ember-cli-rails.rb

@@ -1,13 +1,13 @@
-require "ember-cli/engine" if defined?(Rails)
-require "ember-cli/errors"
+require "ember_cli/engine" if defined?(Rails)
+require "ember_cli/errors"
 
 module EmberCli
   extend self
 
-  autoload :App,           "ember-cli/app"
-  autoload :Configuration, "ember-cli/configuration"
-  autoload :Helpers,       "ember-cli/helpers"
-  autoload :PathSet,       "ember-cli/path_set"
+  autoload :App,           "ember_cli/app"
+  autoload :Configuration, "ember_cli/configuration"
+  autoload :Helpers,       "ember_cli/helpers"
+  autoload :PathSet,       "ember_cli/path_set"
 
   def configure
     yield configuration

data/lib/{ember-cli → ember_cli}/app.rb

@@ -1,6 +1,6 @@
-require "ember-cli/shell"
-require "ember-cli/sprockets"
-require "ember-cli/build_monitor"
+require "ember_cli/shell"
+require "ember_cli/sprockets"
+require "ember_cli/build_monitor"
 
 module EmberCli
   class App
@@ -84,7 +84,6 @@ module EmberCli
       @prepared ||= begin
         @build.reset
         symlink_to_assets_root
-        sprockets.register!
         true
       end
     end

data/lib/{ember-cli → ember_cli}/configuration.rb

@@ -13,7 +13,9 @@ module EmberCli
         deprecate_enable
       end
 
-      apps.store name, App.new(name, options)
+      app = App.new(name, options)
+      app.sprockets.register!
+      apps.store(name, app)
     end
 
     def apps

data/lib/{ember-cli → ember_cli}/engine.rb

@@ -1,8 +1,8 @@
 module EmberCli
   class Engine < Rails::Engine
     initializer "ember-cli-rails.rendering" do
-      require "ember-cli/ember_controller"
-      require "ember-cli/route_helpers"
+      require "ember_cli/ember_controller"
+      require "ember_cli/route_helpers"
     end
 
     initializer "ember-cli-rails.enable" do
@@ -15,7 +15,7 @@ module EmberCli
 
     config.after_initialize do
       if defined?(ApplicationController)
-        require "ember-cli/controller_extension"
+        require "ember_cli/controller_extension"
 
         ApplicationController.include(EmberCli::ControllerExtension)
       end

data/lib/{ember-cli → ember_cli}/route_helpers.rb

@@ -1,4 +1,4 @@
-require "ember-cli/constraint"
+require "ember_cli/constraint"
 
 module ActionDispatch
   module Routing

data/lib/{ember-cli → ember_cli}/shell.rb

@@ -1,4 +1,4 @@
-require "ember-cli/command"
+require "ember_cli/command"
 
 module EmberCli
   class Shell

data/lib/{ember-cli → ember_cli}/sprockets.rb

@@ -1,17 +1,17 @@
+require "ember_cli/errors"
 require "non-stupid-digest-assets"
-require "ember-cli/html_page"
+require "ember_cli/html_page"
 
 module EmberCli
   class Sprockets
+    class AssetPipelineError < BuildError; end
     def initialize(app)
       @app = app
     end
 
     def register!
-      assets = %r{\A#{app.name}/}
-
-      Rails.configuration.assets.precompile << assets
-      NonStupidDigestAssets.whitelist << assets
+      register_or_raise!(Rails.configuration.assets.precompile)
+      register_or_raise!(NonStupidDigestAssets.whitelist)
     end
 
     def index_html(head:, body:)
@@ -40,5 +40,19 @@ module EmberCli
       @package_json ||=
         JSON.parse(app.paths.package_json_file.read).with_indifferent_access
     end
+
+    def asset_matcher
+      %r{\A#{app.name}/}
+    end
+
+    def register_or_raise!(precompiled_assets)
+      if precompiled_assets.include?(asset_matcher)
+        raise AssetPipelineError.new <<-MSG.strip_heredoc
+          EmberCLI application #{app.name.inspect} already registered!
+        MSG
+      else
+        precompiled_assets << asset_matcher
+      end
+    end
   end
 end

data/lib/ember_cli/version.rb

@@ -0,0 +1,3 @@
+module EmberCli
+  VERSION = "0.5.2".freeze
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -72,26 +72,26 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- app/controller/ember-cli/ember_controller.rb
+- app/controller/ember_cli/ember_controller.rb
 - app/helpers/ember_rails_helper.rb
 - app/views/ember_cli/ember/index.html.erb
 - lib/ember-cli-rails.rb
-- lib/ember-cli/app.rb
-- lib/ember-cli/build_monitor.rb
-- lib/ember-cli/capture.rb
-- lib/ember-cli/command.rb
-- lib/ember-cli/configuration.rb
-- lib/ember-cli/constraint.rb
-- lib/ember-cli/controller_extension.rb
-- lib/ember-cli/engine.rb
-- lib/ember-cli/errors.rb
-- lib/ember-cli/helpers.rb
-- lib/ember-cli/html_page.rb
-- lib/ember-cli/path_set.rb
-- lib/ember-cli/route_helpers.rb
-- lib/ember-cli/shell.rb
-- lib/ember-cli/sprockets.rb
-- lib/ember-cli/version.rb
+- lib/ember_cli/app.rb
+- lib/ember_cli/build_monitor.rb
+- lib/ember_cli/capture.rb
+- lib/ember_cli/command.rb
+- lib/ember_cli/configuration.rb
+- lib/ember_cli/constraint.rb
+- lib/ember_cli/controller_extension.rb
+- lib/ember_cli/engine.rb
+- lib/ember_cli/errors.rb
+- lib/ember_cli/helpers.rb
+- lib/ember_cli/html_page.rb
+- lib/ember_cli/path_set.rb
+- lib/ember_cli/route_helpers.rb
+- lib/ember_cli/shell.rb
+- lib/ember_cli/sprockets.rb
+- lib/ember_cli/version.rb
 - lib/generators/ember-cli/heroku/USAGE
 - lib/generators/ember-cli/heroku/heroku_generator.rb
 - lib/generators/ember-cli/heroku/templates/bin_heroku_install.erb

data/lib/ember-cli/version.rb

@@ -1,3 +0,0 @@
-module EmberCli
-  VERSION = "0.5.1".freeze
-end