ember-cli-rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80bff7ddf6a25ed99c090e4098e2da8929bc0fb0
-  data.tar.gz: 74c0f4b34f36bc24de522d6a151613e5fa6bae41
+  metadata.gz: 030d5f1596ebae3fecc96c480954a9e4cb4e3151
+  data.tar.gz: f677b7c8673737370c96f354af72a7b6db07df61
 SHA512:
-  metadata.gz: e4a9a91135ae46175d12f511a5a0615e48ed279b7db29db47d7ca031f810948daa91c85f64074f5b44bfad32dadc61d8672bb2e4368b95f6f583a9950fcbc4ca
-  data.tar.gz: a16d659d8628c992e022622f89e1ae22e3af88798cd9db65dff7e8c6bf6b5e616be80a9c2a2e9c8aed3983c5414ae339e0f1c3d4db86225c97f830b224f38ddb
+  metadata.gz: 377903d80e5ee92956235ecc98fa4337b81ace80869d44ec8627adcba014e33ec433e523b0c5fdfa1c651c3f47d995fd4e3e8a6a280344360ad32d8d40dafb75
+  data.tar.gz: 0b0fa9d57c95603281445df2ab1e8e3db21b0471c9103dac625e18b61e03a77e5a2c4b72f20b93b9b312fd88626944399b56f4a63f566a141b02db6931f6c282

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.1.3
+-----
+
+* Make sure setting optional config parameters override defaults [#70](https://github.com/rwz/ember-cli-rails/issues/70)
+
 0.1.2
 -----
 

data/README.md

@@ -83,7 +83,7 @@ end
 
 ## Usage
 
-You render your Ember CLI app by including the corresponding JS/CSS tags in whichever
+You render your EmberCLI app by including the corresponding JS/CSS tags in whichever
 Rails view you'd like the Ember app to appear.
 
 For example, if you had the following Rails app
@@ -123,26 +123,79 @@ init` and then add the following to your `Guardfile`.
 ```ruby
 guard "livereload" do
   # ...
-  watch %r{app/<your-appname>/\w+/.+\.(js|hbs|html|css|<other-extensions>)}
+  watch %r{app/<your-appname>/app/\w+/.+\.(js|hbs|html|css|<other-extensions>)}
   # ...
 end
 ```
 
 This tells Guard to watch your EmberCLI app for any changes to the JavaScript,
-Handlebars, HTML, or CSS files. Take note that other extensions can be added to
-the line (such as `coffee` for CoffeeScript) to watch them for changes as well.
+Handlebars, HTML, or CSS files within `app` path. Take note that other
+extensions can be added to the line (such as `coffee` for CoffeeScript) to
+watch them for changes as well.
+
+## Heroku
+
+In order to deploy EmberCLI Rails app to Heroku you need to follow the steps
+below:
+
+First, enable Heroku Multi Buildpack by running the following command:
+
+```sh
+heroku config:add BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-multi
+```
+
+Next, check in `.buildpacks` file to specify which buildpacks to use:
+
+```
+https://github.com/heroku/heroku-buildpack-nodejs
+https://github.com/heroku/heroku-buildpack-ruby
+```
+
+Add `rails_12factor` gem to your production group in Gemfile, then run `bundle
+install`:
+
+```ruby
+gem "rails_12factor", group: :production
+```
+
+Add a `package.json` to the root of your Rails project. This is to make sure
+it'll be detected by the NodeJS buildpack.
+
+```javascript
+{
+  "dependencies": {
+    "bower": "*"
+  }
+}
+```
+
+Add a `postinstall` task to your EmberCLI app's `package.json`. This will
+ensure that during the deployment process, Heroku will install all dependencies
+found in both `node_modules` and `bower_components`.
+
+```javascript
+{
+  # ...
+  "scripts": {
+    # ...
+    "postinstall": "../../node_modules/bower/bin/bower install"
+  }
+}
+```
+
+Now you should be ready to deploy.
 
 ## Additional Information
 
-When running in the development environment, EmberCLI Rails runs `ember build` 
-with the `--output-path` and `--watch` flags on. The `--watch` flag tells 
-EmberCLI to watch for file system events and rebuild when an EmberCLI file is changed. 
-The `--output-path` flag specifies where the distribution files will be put.
-EmberCLI Rails does some fancy stuff to get it into your asset path without
-polluting your git history. Note that for this to work, you must have
+When running in the development environment, EmberCLI Rails runs `ember build`
+with the `--output-path` and `--watch` flags on. The `--watch` flag tells
+EmberCLI to watch for file system events and rebuild when an EmberCLI file is
+changed. The `--output-path` flag specifies where the distribution files will
+be put. EmberCLI Rails does some fancy stuff to get it into your asset path
+without polluting your git history. Note that for this to work, you must have
 `config.consider_all_requests_local = true` set in
 `config/environments/development.rb`, otherwise the middleware responsible for
-building Ember CLI will not be enabled.
+building EmberCLI will not be enabled.
 
 Alternatively, if you want to override the default behavior in any given Rails
 environment, you can manually set the `config.use_ember_middleware` and

data/lib/ember-cli/helpers.rb

@@ -26,16 +26,16 @@ module EmberCLI
     end
 
     def use_middleware?
-      rails_config_for(:use_ember_middleware) || non_production?
+      rails_config_for(:use_ember_middleware, non_production?)
     end
 
     def use_live_recompilation?
-      rails_config_for(:use_ember_live_recompilation) || Rails.env.development?
+      rails_config_for(:use_ember_live_recompilation, Rails.env.development?)
     end
 
-    def rails_config_for(key)
+    def rails_config_for(key, default=false)
       config = Rails.configuration
-      config.respond_to?(key) && config.public_send(key)
+      config.respond_to?(key) ? config.public_send(key) : default
     end
 
     def override_assets_precompile_task!

data/lib/ember-cli/version.rb

@@ -1,3 +1,3 @@
 module EmberCLI
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Pavel Pravosud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties