ember-cli-rails 0.8.5 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ff30b30d60cf45b946c688fc355c29c2ac79e1a5
-  data.tar.gz: 89d52810daf83b9b675f8a59f83aef69dfb76370
+SHA256:
+  metadata.gz: ae81b97b3eedcb84768b305b7c69d78ebf6d9a00ee3cf9b09e61d570fd82d72e
+  data.tar.gz: 8faab1baa2ba94bb79520e2413c9a1dac154bc1ae17af17c41b91ebb176f99b0
 SHA512:
-  metadata.gz: f0353db532b3c66bd5bc9183a40ea5399c44e35ed7343f285488a1803b85c980cbf4b76b7ac8b6f085e173e857dd1e23a4c3a2835a5964f07819d2936d3dc2f4
-  data.tar.gz: 7ff75f83a0be222d214d878356621b4dc27c9c4da9af965654c0937090bc134c67411eb675d1657c61ed5e978aad46825c289a6874105771c77d738f62c40759
+  metadata.gz: d91b224e3a2dc5658153616c962ee6e035446f1656be54298fb95f3188350adc8e438fcb0d50ad69046ce066ae297aa2dc0146fcb2ca2a5a156b1c5a48188865
+  data.tar.gz: 49d65db9d74a115f36ad74ef9fdcdd6450d7456448188190476089b83ced25cfda82fe7ef78d3b0f988c0c4e8c5258cff3b896c551c05ca50e03295460185a04

data/CHANGELOG.md

@@ -1,6 +1,55 @@
 master
 ------
 
+0.11.0
+------
+
+* Switch from TravisCI to GitHub Actions for Continuous Integration
+* Redirect Ember routes with paths that don't end in `/` to corresponding paths
+  that end in `/`.
+* Don't route requests to `/rails/active_storage` through the mounted Ember application.
+
+
+0.10.0
+------
+
+* Remove `bin/heroku_install` to simplify Heroku setup.
+  To upgrade, remove your project's generated `bin/heroku_install`.
+  Next, execute `rake ember:heroku`. [#544]
+* Generate an empty `yarn.lock` so that Heroku understands that the
+  application's deployment target requires `yarn`. Closes [#538]. [#540]
+* No longer support `rails < 4.2`. [#543]
+* Generate an empty `yarn.lock` so that Heroku understands that the
+  application's deployment target requires `yarn`. Closes [#538]. [#540]
+
+[#543]: https://github.com/thoughtbot/ember-cli-rails/pull/543
+[#544]: https://github.com/thoughtbot/ember-cli-rails/pull/544
+[#538]: https://github.com/thoughtbot/ember-cli-rails/issues/538
+[#540]: https://github.com/thoughtbot/ember-cli-rails/pull/540
+
+0.9.0
+-----
+
+* Don't require `bower` installation if `bower.json` is missing [#532]
+
+[#532]: https://github.com/thoughtbot/ember-cli-rails/pull/532
+
+0.8.7
+-----
+
+* Revert [`34ff6dd`][reverted-commit] so that it can be reintroduced as a
+  breaking change, [requiring a major version bump][#532-comment]
+
+[reverted-commit]: https://github.com/thoughtbot/ember-cli-rails/commit/34ff6dd
+[#532-comment]: https://github.com/thoughtbot/ember-cli-rails/pull/532#issuecomment-308141408
+
+0.8.6
+-----
+
+* Don't require `bower` installation if `bower.json` is missing [#532]
+
+[#532]: https://github.com/thoughtbot/ember-cli-rails/pull/532
+
 0.8.5
 -----
 

data/README.md

@@ -270,7 +270,8 @@ To configure your EmberCLI-Rails applications for Heroku:
 1. Execute `rails generate ember:heroku`.
 1. Commit the newly generated files.
 1. [Add the NodeJS buildpack][buildpack] and configure NPM to include the
-   `bower` dependency's executable file.
+   `bower` dependency's executable file (if your build process requires
+   `bower`).
 
 ```sh
 $ heroku buildpacks:clear
@@ -328,11 +329,16 @@ contains the directory or directories that contain the `bower` and `npm`
 executables.
 
 #### For faster deployments
-Place the following in your deploy/<environment>.rb
+
+Place the following in your `deploy/<environment>.rb`
+
 ```ruby
 set :linked_dirs, %w{<ember-app-name>/node_modules <ember-app-name>/bower_components}
 ```
-to avoid rebuilding all the node modules and bower components with every deploy. Replace `<ember-app-name>` with the name of your ember app (default is `frontend`).
+
+to avoid rebuilding all the node modules and bower components with every deploy.
+Replace `<ember-app-name>` with the name of your ember app (default is
+`frontend`).
 
 ## Override
 
@@ -415,7 +421,7 @@ To override this behavior, you can specify [any of Rails' routing options]
 For the sake of this example, override the `controller` and `action` options:
 
 ```rb
-# config/routes
+# config/routes.rb
 
 Rails.application.routes.draw do
   mount_ember_app :frontend, to: "/", controller: "application", action: "index"
@@ -470,13 +476,13 @@ EmberCli.configure do |c|
 end
 ```
 
-Next, mount the applications alongside the rest of Rails' routes:
+Next, mount the applications alongside the rest of Rails' routes. Note that `admin_panel` route is added before the `frontend` route because it's more specific:
 
 ```rb
 # /config/routes.rb
 Rails.application.routes.draw do
-  mount_ember_app :frontend, to: "/"
   mount_ember_app :admin_panel, to: "/admin_panel"
+  mount_ember_app :frontend, to: "/"
 end
 ```
 
@@ -655,7 +661,7 @@ This project supports:
 This project supports:
 
 * Ruby versions `>= 2.2.0`
-* Rails versions `>=4.1.x`.
+* Rails versions `>=4.2.x`.
 
 To learn more about supported versions and upgrades, read the [upgrading guide].
 

data/lib/ember-cli-rails.rb

@@ -1,69 +1,3 @@
-require "fileutils"
-require "ember-cli-rails-assets"
-require "ember_cli/engine"
-require "ember_cli/configuration"
-require "ember_cli/helpers"
-require "ember_cli/errors"
-
-module EmberCli
-  extend self
-
-  def configure
-    yield configuration
-  end
-
-  def configuration
-    Configuration.instance
-  end
-
-  def app(name)
-    apps.fetch(name) do
-      fail KeyError, "#{name.inspect} app is not defined"
-    end
-  end
-
-  def build(name)
-    app(name).build
-  end
-
-  alias_method :[], :app
-
-  def skip?
-    ENV["SKIP_EMBER"].present?
-  end
-
-  def install_dependencies!
-    each_app(&:install_dependencies)
-  end
-
-  def test!
-    each_app(&:test)
-  end
-
-  def compile!
-    cleanup!
-    each_app(&:compile)
-  end
-
-  def root
-    @root ||= Rails.root.join("tmp", "ember-cli").tap(&:mkpath)
-  end
-
-  def env
-    @env ||= Helpers.current_environment
-  end
-
-  delegate :apps, to: :configuration
-
-  private
-
-  def cleanup!
-    root.children.each { |tmp_file| FileUtils.rm_rf(tmp_file) }
-  end
-
-  def each_app
-    apps.each { |_, app| yield app }
-  end
-end
+require "ember_cli"
 
 EmberCLI = EmberCli

data/lib/ember_cli.rb

@@ -0,0 +1,72 @@
+require "fileutils"
+require "ember-cli-rails-assets"
+require "ember_cli/engine"
+require "ember_cli/configuration"
+require "ember_cli/helpers"
+require "ember_cli/errors"
+
+module EmberCli
+  extend self
+
+  def configure
+    yield configuration
+  end
+
+  def configuration
+    Configuration.instance
+  end
+
+  def app(name)
+    apps.fetch(name) do
+      fail KeyError, "#{name.inspect} app is not defined"
+    end
+  end
+  alias_method :[], :app
+
+  def apps
+    configuration.apps
+  end
+
+  def build(name)
+    app(name).build
+  end
+
+  def any?(*arguments, &block)
+    apps.values.any?(*arguments, &block)
+  end
+
+  def skip?
+    ENV["SKIP_EMBER"].present?
+  end
+
+  def install_dependencies!
+    each_app(&:install_dependencies)
+  end
+
+  def test!
+    each_app(&:test)
+  end
+
+  def compile!
+    cleanup!
+    each_app(&:compile)
+  end
+
+  def root
+    @root ||= Rails.root.join("tmp", "ember-cli").tap(&:mkpath)
+  end
+
+  def env
+    @env ||= Helpers.current_environment
+  end
+
+  private
+
+  def cleanup!
+    root.children.each { |tmp_file| FileUtils.rm_rf(tmp_file) }
+  end
+
+  def each_app
+    apps.each { |_, app| yield app }
+  end
+end

data/lib/ember_cli/app.rb

@@ -33,6 +33,10 @@ module EmberCli
       paths.dist
     end
 
+    def cached_directories
+      paths.cached_directories
+    end
+
     def compile
       @compiled ||= begin
         prepare
@@ -83,6 +87,14 @@ module EmberCli
       deploy.mountable?
     end
 
+    def yarn_enabled?
+      options.fetch(:yarn, false)
+    end
+
+    def bower?
+      paths.bower_json.exist?
+    end
+
     def to_rack
       deploy.to_rack
     end

data/lib/ember_cli/command.rb

@@ -1,4 +1,4 @@
-require "cocaine"
+require "terrapin"
 
 module EmberCli
   class Command
@@ -8,7 +8,7 @@ module EmberCli
     end
 
     def test
-      line = Cocaine::CommandLine.new(paths.ember, "test --environment test")
+      line = Terrapin::CommandLine.new(paths.ember, "test --environment test")
 
       line.command
     end
@@ -30,7 +30,7 @@ module EmberCli
     end
 
     def ember_build(watch: false)
-      line = Cocaine::CommandLine.new(paths.ember, [
+      line = Terrapin::CommandLine.new(paths.ember, [
         "build",
         ("--watch" if watch),
         ("--watcher :watcher" if process_watcher),

data/lib/ember_cli/ember_constraint.rb

@@ -1,7 +1,9 @@
 module EmberCli
   class EmberConstraint
     def matches?(request)
-      html_request?(request) && !rails_info_request?(request)
+      html_request?(request) &&
+        !rails_info_request?(request) &&
+        !rails_active_storage_request?(request)
     end
 
     private
@@ -10,6 +12,10 @@ module EmberCli
       request.fullpath.start_with?("/rails/info", "/rails/mailers")
     end
 
+    def rails_active_storage_request?(request)
+      request.fullpath.start_with?("/rails/active_storage")
+    end
+
     def html_request?(request)
       request.format.html?
     end

data/lib/ember_cli/path_set.rb

@@ -35,6 +35,10 @@ module EmberCli
       @gemfile ||= root.join("Gemfile")
     end
 
+    def bower_json
+      root.join("bower.json")
+    end
+
     def ember
       @ember ||= begin
         root.join("node_modules", "ember-cli", "bin", "ember").tap do |path|
@@ -46,6 +50,7 @@ module EmberCli
 
                   $ cd #{root}
                   $ #{package_manager} install
+
             MSG
           end
         end
@@ -62,16 +67,15 @@ module EmberCli
 
     def bower
       @bower ||= begin
-        bower_path = app_options.fetch(:bower_path) { which("bower") }
-
-        bower_path.tap do |path|
-          unless Pathname(path.to_s).executable?
+        path_for_executable("bower").tap do |bower_path|
+          if bower_json.exist? && (bower_path.blank? || !bower_path.executable?)
             fail DependencyError.new <<-MSG.strip_heredoc
-            Bower is required by EmberCLI
+                Bower is required by EmberCLI
 
-            Install it with:
+                Install it with:
+
+                    $ npm install -g bower
 
-                $ npm install -g bower
             MSG
           end
         end
@@ -83,12 +87,21 @@ module EmberCli
     end
 
     def npm
-      @npm ||= app_options.fetch(:npm_path) { which("npm") }
+      @npm ||= path_for_executable("npm")
     end
 
     def yarn
       if yarn?
-        @yarn ||= app_options.fetch(:yarn_path) { which("yarn") }
+        @yarn ||= path_for_executable("yarn").tap do |yarn|
+          unless File.executable?(yarn.to_s)
+            fail DependencyError.new(<<-MSG.strip_heredoc)
+                EmberCLI has been configured to install NodeJS dependencies with Yarn, but the Yarn executable is unavailable.
+
+                Install it by following the instructions at https://yarnpkg.com/lang/en/docs/install/
+
+            MSG
+          end
+        end
       end
     end
 
@@ -97,17 +110,32 @@ module EmberCli
     end
 
     def tee
-      @tee ||= app_options.fetch(:tee_path) { which("tee") }
+      @tee ||= path_for_executable("tee")
     end
 
     def bundler
-      @bundler ||= app_options.fetch(:bundler_path) { which("bundler") }
+      @bundler ||= path_for_executable("bundler")
+    end
+
+    def cached_directories
+      [
+        node_modules,
+        (bower_components if bower_json.exist?),
+      ].compact
     end
 
     private
 
     attr_reader :app, :ember_cli_root, :environment, :rails_root
 
+    def path_for_executable(command)
+      path = app_options.fetch("#{command}_path") { which(command) }
+
+      if path.present?
+        Pathname.new(path)
+      end
+    end
+
     def package_manager
       if yarn?
         "yarn"
@@ -125,7 +153,7 @@ module EmberCli
     end
 
     def app_options
-      app.options
+      app.options.with_indifferent_access
     end
 
     def which(executable)

data/lib/ember_cli/route_helpers.rb

@@ -1,4 +1,5 @@
 require "ember_cli/ember_constraint"
+require "ember_cli/trailing_slash_constraint"
 
 module ActionDispatch
   module Routing
@@ -15,7 +16,15 @@ module ActionDispatch
         )
 
         scope constraints: ::EmberCli::EmberConstraint.new do
-          get("#{to}(*rest)", routing_options)
+          redirect_if_missing_trailing_slash = {
+            constraints: EmberCli::TrailingSlashConstraint.new,
+            to: redirect(-> (_, request) {
+              File.join(request.original_fullpath, "")
+            }),
+          }
+
+          get(to, redirect_if_missing_trailing_slash)
+          get(File.join(to, "(*rest)"), routing_options)
         end
 
         mount_ember_assets(app_name, to: to)

data/lib/ember_cli/shell.rb

@@ -47,7 +47,9 @@ module EmberCli
         run! "#{paths.npm} prune && #{paths.npm} install"
       end
 
-      run! "#{paths.bower} prune && #{paths.bower} install"
+      if paths.bower_json.exist?
+        run! "#{paths.bower} prune && #{paths.bower} install"
+      end
     end
 
     def test

data/lib/ember_cli/trailing_slash_constraint.rb

@@ -0,0 +1,7 @@
+module EmberCli
+  class TrailingSlashConstraint
+    def matches?(request)
+      !request.original_fullpath.to_s.ends_with?("/")
+    end
+  end
+end

data/lib/ember_cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCli
-  VERSION = "0.8.5".freeze
+  VERSION = "0.11.0".freeze
 end

data/lib/generators/ember/heroku/USAGE

@@ -4,9 +4,8 @@ Description:
     Once the generator is complete, execute the following:
 
         $ heroku buildpacks:clear
-        $ heroku buildpacks:add --index 1 https://github.com/heroku/heroku-buildpack-nodejs
-        $ heroku buildpacks:add --index 2 https://github.com/heroku/heroku-buildpack-ruby
-        $ heroku config:set NPM_CONFIG_PRODUCTION=false
+        $ heroku buildpacks:add --index 1 heroku/nodejs
+        $ heroku buildpacks:add --index 2 heroku/ruby
         $ heroku config:unset SKIP_EMBER
 
 Example:
@@ -16,5 +15,4 @@ Example:
         rails_12factor
 
     This will create:
-        bin/heroku_install
         package.json

data/lib/generators/ember/heroku/heroku_generator.rb

@@ -8,19 +8,44 @@ module EmberCli
       template "package.json.erb", "package.json"
     end
 
-    def copy_setup_heroku_file
-      template "bin_heroku_install.erb", "bin/heroku_install"
-      run "chmod a+x bin/heroku_install"
+    def identify_as_yarn_project
+      if EmberCli.any?(&:yarn_enabled?)
+        template "yarn.lock.erb", "yarn.lock"
+      end
     end
 
     def inject_12factor_gem
       gem "rails_12factor", group: [:staging, :production]
     end
 
+    private
+
+    def cache_directories
+      all_cached_directories.map do |cached_directory|
+        cached_directory.relative_path_from(Rails.root).to_s
+      end
+    end
+
+    def all_cached_directories
+      app_specific_cached_directories + project_root_cached_directories
+    end
+
+    def app_specific_cached_directories
+      apps.flat_map(&:cached_directories)
+    end
+
+    def project_root_cached_directories
+      [Rails.root.join("node_modules")]
+    end
+
     def app_paths
       EmberCli.apps.values.map do |app|
         app.root_path.relative_path_from(Rails.root)
       end
     end
+
+    def apps
+      EmberCli.apps.values
+    end
   end
 end

data/lib/generators/ember/heroku/templates/package.json.erb

@@ -1,15 +1,8 @@
 {
-  "scripts": {
-    "postinstall": "sh bin/heroku_install"
-  },
+  <% if EmberCli.any?(&:bower?) %>
   "dependencies": {
     "bower": "*"
   },
-  "cacheDirectories": [
-    <%- app_paths.each do |app_path| -%>
-    "<%= app_path %>/node_modules",
-    "<%= app_path %>/bower_components",
-    <%- end -%>
-    "node_modules"
-  ]
+  <% end %>
+  "cacheDirectories": <%= cache_directories.to_json %>
 }

data/lib/generators/ember/heroku/templates/yarn.lock.erb

@@ -0,0 +1 @@
+

data/lib/tasks/ember-cli.rake

@@ -16,10 +16,5 @@ namespace :ember do
 end
 
 unless EmberCli.skip?
-  # Hook into assets:precompile:all for Rails 3.1+
-  if Rails::VERSION::MAJOR < 4
-    task "assets:precompile:all" => "ember:compile"
-  else
-    task "assets:precompile" => "ember:compile"
-  end
+  task "assets:precompile" => "ember:compile"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.11.0
 platform: ruby
 authors:
 - Pavel Pravosud
 - Jonathan Jackson
 - Sean Doyle
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-cli-rails-assets
@@ -32,28 +32,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: cocaine
+  name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: html_page
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +68,63 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-description: 
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+- !ruby/object:Gem::Dependency
+  name: capybara-selenium
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+description:
 email:
 - pavel@pravosud.com
 - jonathan.jackson1@me.com
@@ -84,6 +140,7 @@ files:
 - app/helpers/ember_rails_helper.rb
 - app/views/ember_cli/ember/index.html.erb
 - lib/ember-cli-rails.rb
+- lib/ember_cli.rb
 - lib/ember_cli/app.rb
 - lib/ember_cli/build_monitor.rb
 - lib/ember_cli/command.rb
@@ -97,11 +154,12 @@ files:
 - lib/ember_cli/route_helpers.rb
 - lib/ember_cli/runner.rb
 - lib/ember_cli/shell.rb
+- lib/ember_cli/trailing_slash_constraint.rb
 - lib/ember_cli/version.rb
 - lib/generators/ember/heroku/USAGE
 - lib/generators/ember/heroku/heroku_generator.rb
-- lib/generators/ember/heroku/templates/bin_heroku_install.erb
 - lib/generators/ember/heroku/templates/package.json.erb
+- lib/generators/ember/heroku/templates/yarn.lock.erb
 - lib/generators/ember/init/USAGE
 - lib/generators/ember/init/init_generator.rb
 - lib/generators/ember/init/templates/initializer.rb
@@ -110,7 +168,7 @@ homepage: https://github.com/thoughtbot/ember-cli-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,9 +183,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Integration between Ember CLI and Rails
 test_files: []

data/lib/generators/ember/heroku/templates/bin_heroku_install.erb

@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-bower="$(pwd)/node_modules/.bin/bower"
-
-for app in <%= app_paths.map { |app_path| %{"#{app_path}"} }.join(" ") -%>; do
-  cd $app &&
-    npm install &&
-    $bower install &&
-    cd -
-done