ember-cli-rails 0.1.8 → 0.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +8 -0
  3. data/app/controllers/ember_tests_controller.rb +5 -1
  4. data/lib/ember-cli/app.rb +2 -2
  5. data/lib/ember-cli/engine.rb +4 -2
  6. data/lib/ember-cli/version.rb +1 -1
  7. metadata +17 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 946a0fb72121616c65e7110778d131fa596199e3
4
- data.tar.gz: f9f8e3f679bf7ad90898872f8649020f3a31b3a5
3
+ metadata.gz: 8ace965a0ccf7d16251382a73152dcf16f32a051
4
+ data.tar.gz: 40d851c77d3360d988a45ef43f1073cf2f0b76fe
5
5
  SHA512:
6
- metadata.gz: 38daa6f7bc8e97d26905996a9b0475089bd657b772a4c85ed1b40256ef9bd869bb4d995dd31acbf050eba10d4bcf4348b54484e8cbb2d534d9f78d7be98e8d7c
7
- data.tar.gz: 56a4eada98aa6ce76b1d5be08e4e53b1d5be8eb8e5303d5ee6c3401209817a0909816034f2326b163d95be3d7c975b9a0f510c7c6e5b071149b69825ddfe15a4
6
+ metadata.gz: 6000a0a0f708431d1a3652bfb453db22e882acc44b875d35d19290347d632efce7efba088c9d6c567e35e56df8f84353f385264a706f8466a98994a3fcfedf71
7
+ data.tar.gz: bc263fab3bd2e91bafffc3035152f8b3a9ac551207e7df7c58da7b8013b20c99ba4a31fd1ee397c15f96747f9ba8d2b760ff33f07c634bf9bbb71545acb61b1d
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ 0.1.9
2
+ -----
3
+
4
+ * Only set `BUNDLE_GEMFILE` to shell environment if it exists [#92](https://github.com/rwz/ember-cli-rails/issues/92) [@seanpdoyle](https://twitter.com/seanpdoyle)
5
+ * Add Support for Rails 3.1 [#99](https://github.com/rwz/ember-cli-rails/pull/99) [@seanpdoyle](https://twitter.com/seanpdoyle)
6
+ * Use Rails' configured asset prefix in tests [#104](https://github.com/rwz/ember-cli-rails/pull/104) [@seanpdoyle](https://twitter.com/seanpdoyle)
7
+
8
+
1
9
  0.1.8
2
10
  -----
3
11
 
data/app/controllers/ember_tests_controller.rb CHANGED
@@ -6,7 +6,7 @@ class EmberTestsController < ActionController::Base
6
6
  private
7
7
 
8
8
  def test_html_with_corrected_asset_urls
9
- test_html.gsub(%r{assets/}i, "assets/#{app_name}/")
9
+ test_html.gsub(%r{assets/}i, "#{asset_prefix}/#{app_name}/")
10
10
  end
11
11
 
12
12
  def test_html
@@ -24,4 +24,8 @@ class EmberTestsController < ActionController::Base
24
24
  def app_name
25
25
  params.fetch(:app_name)
26
26
  end
27
+
28
+ def asset_prefix
29
+ Rails.configuration.assets.prefix
30
+ end
27
31
  end
data/lib/ember-cli/app.rb CHANGED
@@ -119,7 +119,7 @@ module EmberCLI
119
119
  end
120
120
 
121
121
  def silence_build(&block)
122
- if ENV.fetch("EMBER_CLI_RAILS_VERBOSE"){ !Helpers.non_production? }
122
+ if ENV.fetch("EMBER_CLI_RAILS_VERBOSE"){ !non_production? }
123
123
  yield
124
124
  else
125
125
  silence_stream(STDOUT, &block)
@@ -270,7 +270,7 @@ module EmberCLI
270
270
  ENV.clone.tap do |vars|
271
271
  vars.store "DISABLE_FINGERPRINTING", "true"
272
272
  vars.store "EXCLUDE_EMBER_ASSETS", excluded_ember_deps
273
- vars.store "BUNDLE_GEMFILE", gemfile_path.to_s
273
+ vars.store "BUNDLE_GEMFILE", gemfile_path.to_s if gemfile_path.exist?
274
274
  end
275
275
  end
276
276
 
data/lib/ember-cli/engine.rb CHANGED
@@ -5,8 +5,10 @@ module EmberCLI
5
5
  end
6
6
 
7
7
  initializer "ember-cli-rails.inflector" do
8
- ActiveSupport::Inflector.inflections :en do |inflect|
9
- inflect.acronym "CLI"
8
+ if Rails.version > "3.2"
9
+ ActiveSupport::Inflector.inflections :en do |inflect|
10
+ inflect.acronym "CLI"
11
+ end
10
12
  end
11
13
  end
12
14
 
data/lib/ember-cli/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EmberCLI
2
- VERSION = "0.1.8".freeze
2
+ VERSION = "0.1.9".freeze
3
3
  end
metadata CHANGED
@@ -1,48 +1,56 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ember-cli-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8
4
+ version: 0.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Pravosud
8
8
  - Jonathan Jackson
9
+ - Sean Doyle
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2015-02-24 00:00:00.000000000 Z
13
+ date: 2015-03-06 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: railties
16
17
  requirement: !ruby/object:Gem::Requirement
17
18
  requirements:
18
- - - "~>"
19
+ - - ">="
19
20
  - !ruby/object:Gem::Version
20
- version: '4.0'
21
+ version: '3.1'
22
+ - - "<"
23
+ - !ruby/object:Gem::Version
24
+ version: '5'
21
25
  type: :runtime
22
26
  prerelease: false
23
27
  version_requirements: !ruby/object:Gem::Requirement
24
28
  requirements:
25
- - - "~>"
29
+ - - ">="
30
+ - !ruby/object:Gem::Version
31
+ version: '3.1'
32
+ - - "<"
26
33
  - !ruby/object:Gem::Version
27
- version: '4.0'
34
+ version: '5'
28
35
  - !ruby/object:Gem::Dependency
29
- name: sprockets-rails
36
+ name: sprockets
30
37
  requirement: !ruby/object:Gem::Requirement
31
38
  requirements:
32
- - - "~>"
39
+ - - ">="
33
40
  - !ruby/object:Gem::Version
34
41
  version: '2.0'
35
42
  type: :runtime
36
43
  prerelease: false
37
44
  version_requirements: !ruby/object:Gem::Requirement
38
45
  requirements:
39
- - - "~>"
46
+ - - ">="
40
47
  - !ruby/object:Gem::Version
41
48
  version: '2.0'
42
49
  description:
43
50
  email:
44
51
  - pavel@pravosud.com
45
52
  - jonathan.jackson1@me.com
53
+ - sean.p.doyle24@gmail.com
46
54
  executables: []
47
55
  extensions: []
48
56
  extra_rdoc_files: []