ember-cli-rails 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0428e24dab02b22384c818ae31d5e862bfb0927a
-  data.tar.gz: 9b827a565cee652b9a757bf98445fcbfa14ecfd7
+  metadata.gz: 7da213bce2e711701b48dbfa52fdac73ae86520f
+  data.tar.gz: bfdb3787798a02a1bfe7ce3563532ac354718605
 SHA512:
-  metadata.gz: 511a4adc88ce2a166f85962e52701ffc4d69598c0e0c2a50721fc0f82e1182d94b1f04e794d871172beb537a3f20c20b1e004dc85185f18d3d11ed4509ca65ee
-  data.tar.gz: 210e20c73c81deab80a60b5532afd58bd9a01088ac19270213f322810dceb5c84a95e95ab4cf15352f5a793ffc0d2805e12b55daa279ea8986724298e5303977
+  metadata.gz: d497a65f5083432417e4267bb2c89aad7e7487513598bf78636862082a6fde99e24feef45b99adbb927fbb2a144a9e7055205396a60ad738e530670cd8bce46b
+  data.tar.gz: 6b76aab9d8f823906413783547c4cee3f919f54d699d6c634c9ff3fe26f677a4d324d3d83e7d7dce20100c41eb1f7ca3fa67d578b1cc93fbae5ce72fc572beab

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 master
 ------
 
+0.8.0
+-----
+
+* `EmberCli::EmberController` now inherits from `ActionController::Base` instead
+  of `ApplicationController`. [#400]
+* Remove support for Ruby 2.1.x. [#400]
+* Don't route requests to `/rails/info` through the mounted Ember application.
+
 0.7.4
 -----
 
@@ -31,6 +39,7 @@ master
 * `EmberCli::Deploy::File` serves assets with Rails' `static_cache_control`
   value. [#403]
 
+[#400]: https://github.com/thoughtbot/ember-cli-rails/pull/400
 [#396]: https://github.com/thoughtbot/ember-cli-rails/pull/396
 [#403]: https://github.com/thoughtbot/ember-cli-rails/pull/403
 

data/README.md

@@ -303,6 +303,13 @@ you're not using `nvm`, make sure the string you prepend to the `$PATH` variable
 contains the directory or directories that contain the `bower` and `npm`
 executables.
 
+#### For faster deployments
+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`).
+
 ## Override
 
 By default, routes defined by `ember_app` will be rendered with the internal
@@ -623,7 +630,7 @@ This project supports:
 
 This project supports:
 
-* Ruby versions `>= 2.1.0`
+* Ruby versions `>= 2.2.0`
 * Rails versions `>=4.1.x`.
 
 To learn more about supported versions and upgrades, read the [upgrading guide].

data/app/controller/ember_cli/ember_controller.rb

@@ -3,10 +3,5 @@ module EmberCli
     def index
       render layout: false
     end
-
-    def ember_app
-      params[:ember_app]
-    end
-    helper_method :ember_app
   end
 end

data/app/helpers/ember_rails_helper.rb

@@ -8,6 +8,6 @@ module EmberRailsHelper
 
     head, body = markup_capturer.capture
 
-    render inline: EmberCli[name].index_html(head: head, body: body)
+    render text: EmberCli[name].index_html(head: head, body: body).html_safe
   end
 end

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

@@ -1,4 +1,4 @@
-<%= render_ember_app ember_app do |head| %>
+<%= render_ember_app params[:ember_app] do |head| %>
   <% head.append do %>
     <%= csrf_meta_tags %>
   <% end %>

data/lib/ember_cli/build_monitor.rb

@@ -6,7 +6,7 @@ module EmberCli
     end
 
     def check!
-      if build_error?
+      if has_build_errors?
         raise_build_error!
       end
 
@@ -14,7 +14,7 @@ module EmberCli
     end
 
     def reset
-      if build_error?
+      if error_file_exists?
         error_file.delete
       end
     end
@@ -35,17 +35,43 @@ module EmberCli
       !paths.lockfile.exist?
     end
 
-    def build_error?
+    def error_file_exists?
       error_file.exist? && error_file.size?
     end
 
+    def build_errors
+      error_lines.
+        reject { |line| is_blank_or_backtrace?(line) }.
+        reject { |line| is_deprecation_warning?(line) }
+    end
+
+    def has_build_errors?
+      build_errors.any?
+    end
+
+    def is_blank_or_backtrace?(line)
+      line =~ /(^\s*$|^\s{4}at .+$)/
+    end
+
+    def is_deprecation_warning?(line)
+      line =~ /^(\e[^\s]+)?DEPRECATION:/
+    end
+
+    def error_lines
+      if error_file_exists?
+        error_file.readlines
+      else
+        [""]
+      end
+    end
+
     def error_file
       paths.build_error_file
     end
 
     def raise_build_error!
-      backtrace = error_file.readlines.reject(&:blank?)
-      message = "#{name.inspect} has failed to build: #{backtrace.first}"
+      backtrace = build_errors.first
+      message = "#{name.inspect} has failed to build: #{backtrace}"
 
       error = BuildError.new(message)
       error.set_backtrace(backtrace)

data/lib/ember_cli/ember_constraint.rb

@@ -0,0 +1,19 @@
+module EmberCli
+  class EmberConstraint
+    def matches?(request)
+      html_request?(request) && !rails_info_request?(request)
+    end
+
+    private
+
+    def rails_info_request?(request)
+      request.fullpath.start_with?("/rails/info")
+    end
+
+    def html_request?(request)
+      index = request.format.to_s =~ /html/ || -1
+
+      index > -1
+    end
+  end
+end

data/lib/ember_cli/route_helpers.rb

@@ -1,4 +1,4 @@
-require "ember_cli/html_constraint"
+require "ember_cli/ember_constraint"
 
 module ActionDispatch
   module Routing
@@ -14,7 +14,7 @@ module ActionDispatch
           format: :html,
         )
 
-        scope constraints: ::EmberCli::HtmlConstraint.new do
+        scope constraints: ::EmberCli::EmberConstraint.new do
           get("#{to}(*rest)", routing_options)
         end
 

data/lib/ember_cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCli
-  VERSION = "0.7.4".freeze
+  VERSION = "0.8.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-cli-rails-assets
@@ -33,9 +33,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,9 +40,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
@@ -95,10 +89,10 @@ files:
 - lib/ember_cli/command.rb
 - lib/ember_cli/configuration.rb
 - lib/ember_cli/deploy/file.rb
+- lib/ember_cli/ember_constraint.rb
 - lib/ember_cli/engine.rb
 - lib/ember_cli/errors.rb
 - lib/ember_cli/helpers.rb
-- lib/ember_cli/html_constraint.rb
 - lib/ember_cli/path_set.rb
 - lib/ember_cli/route_helpers.rb
 - lib/ember_cli/runner.rb
@@ -124,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/ember_cli/html_constraint.rb

@@ -1,9 +0,0 @@
-module EmberCli
-  class HtmlConstraint
-    def matches?(request)
-      matches = request.format.to_s =~ /html/ || -1
-
-      matches > -1
-    end
-  end
-end