ember-cli-rails 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0ced9f81d08893b0a32775f612145b178f26186
-  data.tar.gz: da368e823ef425a5dd400d87cac02ed2d4761142
+  metadata.gz: e2050418a47d41c4dadef58815563fc33f790182
+  data.tar.gz: 389762dcb79129cb6d0f774c5be0d2cb430c51af
 SHA512:
-  metadata.gz: f097c1b1201e2a1d46ae8f78eaf0ba550dadb36ea10768dbce51840ad1d9a633d80a22160e5cb41e03f4c3727b15f923b9b5c73b685888c65322ba56a216129e
-  data.tar.gz: e2829b586d65a12e8592e3f74ebe501eb443f1ab713bd241ef42215d4772cf24c61f2dcfdec05ac1bdad4d285595ac3bd549b9711fdd0e868dc36ffa0ca83600
+  metadata.gz: ca28ef57e18cbad4df443df774a3c089f3859073ee076567c99213ae1b302fda2b89659162793ae44f33c5e53adc0dade4c1473c15b29df3b8853d8eea8d3a8a
+  data.tar.gz: ee03a4aae56dc0db75380856cd77dc58d579763b87115df771ca84d66f4b7d735449e5a1836a6318bf97d4b7bfe59d33f91ea26bf96ceb6f1681bc8673ab5895

data/CHANGELOG.md

@@ -1,15 +1,28 @@
 master
 ------
 
+0.4.1
+-----
+
+* `<%= head.append do %>` will now return `nil` so that accidentally using
+  `<%= %>` variety of ERB tags won't render the contents of the capture [#231]
+
+[#231]: https://github.com/thoughtbot/ember-cli-rails/pull/231
+
 0.4.0
 -----
 
 * Extend `include_ember_index_html` helper to accept a block. The contents of
-  the block will be injected into the page
-* Drop support for Ruby `< 2.1.0` and Rails `4.0.0, < 3.2.0`
+  the block will be injected into the page [#228]
+* Drop support for Ruby `< 2.1.0` and Rails `4.0.0, < 3.2.0` [#227]
 * Introduce `rails g ember-cli:heroku` generator to configure a project for
-  deploying to Heroku
-* Introduce `include_ember_index_html` helper
+  deploying to Heroku [#230]
+* Introduce `include_ember_index_html` helper [#226]
+
+[#226]: https://github.com/thoughtbot/ember-cli-rails/pull/226
+[#227]: https://github.com/thoughtbot/ember-cli-rails/pull/227
+[#228]: https://github.com/thoughtbot/ember-cli-rails/pull/228
+[#230]: https://github.com/thoughtbot/ember-cli-rails/pull/230
 
 0.3.5
 -----

data/README.md

@@ -122,7 +122,7 @@ To inject markup into page, pass in a block that accepts the `head`, and
 ```erb
 <!-- /app/views/application/index.html.erb -->
 <%= include_ember_index_html :frontend do |head| %>
-  <%= head.append do %>
+  <% head.append do %>
     <%= csrf_meta_tags %>
   <% end %>
 <% end %>
@@ -317,8 +317,11 @@ To configure your Ember CLI Rails app to be ready to deploy on Heroku:
    `bower` dependency's executable file.
 
 ```sh
-heroku buildpacks:add --index 1 https://github.com/heroku/heroku-buildpack-nodejs
-heroku config:set NPM_CONFIG_PRODUCTION=false
+$ 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 config:unset SKIP_EMBER
 ```
 
 You should be ready to deploy.

data/lib/ember-cli/capture.rb

@@ -9,7 +9,7 @@ module EmberCLI
 
     def capture
       if block.present?
-        capture_block
+        capture_content
       else
         SKIP_CAPTURE
       end
@@ -19,24 +19,24 @@ module EmberCLI
 
     attr_reader :block, :sprockets
 
-    def capture_block
+    def capture_content
       if block.arity > 0
         block.call(*block_arguments)
       end
 
-      [captured_head.content, captured_body.content]
+      [head.content, body.content]
     end
 
     def block_arguments
-      [captured_head, captured_body].first(block.arity)
+      [head, body].first(block.arity)
     end
 
-    def captured_body
-      @captured_body ||= Block.new(sprockets)
+    def body
+      @body ||= Block.new(sprockets)
     end
 
-    def captured_head
-      @captured_head ||= begin
+    def head
+      @head ||= begin
         if block.arity < 1
           BlockWithoutArguments.new(sprockets, &block)
         else
@@ -52,7 +52,7 @@ module EmberCLI
       end
 
       def content
-        @sprockets.capture(&@block)
+        @sprockets.with_output_buffer(&@block)
       end
     end
     private_constant :BlockWithoutArguments
@@ -64,7 +64,8 @@ module EmberCLI
       end
 
       def append(&block)
-        @content.push(@sprockets.capture(&block))
+        @content.push(@sprockets.with_output_buffer(&block))
+        nil
       end
 
       def content

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties