ember-appkit-rails 0.2.1 → 0.2.2

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 (31) hide show
  1. checksums.yaml +4 -4
  2. data/lib/ember/appkit/rails/engine.rb +8 -2
  3. data/lib/ember/appkit/rails/version.rb +1 -1
  4. data/test/dummy/config/initializers/secret_token.rb +1 -1
  5. data/test/dummy/log/test.log +9 -9
  6. data/test/dummy/tmp/cache/assets/test/sprockets/07a9ce16127008e142b1b0223c4d7784 +0 -0
  7. data/test/dummy/tmp/cache/assets/test/sprockets/07afa5d8ceda557642e2330ab45eb203 +0 -0
  8. data/test/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705 +0 -0
  9. data/test/dummy/tmp/cache/assets/test/sprockets/1f15c49a05b13c3a7ee50d2ac3900f38 +0 -0
  10. data/test/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953 +0 -0
  11. data/test/dummy/tmp/cache/assets/test/sprockets/660bc633c8899c6c1b20514637fa0169 +0 -0
  12. data/test/dummy/tmp/cache/assets/test/sprockets/67afcba9807cd5e57b80b5fdf9f26758 +0 -0
  13. data/test/dummy/tmp/cache/assets/test/sprockets/6870da13c3305651063dc22ccce27d5c +0 -0
  14. data/test/dummy/tmp/cache/assets/test/sprockets/8ebc8c58233ab12eee6edfc0feca2492 +0 -0
  15. data/test/dummy/tmp/cache/assets/test/sprockets/9160f792acb62d1f7721c714681fcfe6 +0 -0
  16. data/test/dummy/tmp/cache/assets/test/sprockets/a2f615309ade94c14ae81d7ebc94fd67 +0 -0
  17. data/test/dummy/tmp/cache/assets/test/sprockets/a9648a765fed0738b076bd24099109a3 +0 -0
  18. data/test/dummy/tmp/cache/assets/test/sprockets/ae884a1acda0e6f9bb27a856a22bb08d +0 -0
  19. data/test/dummy/tmp/cache/assets/test/sprockets/b340d5578308bb4c197a8ca3538b0e24 +0 -0
  20. data/test/dummy/tmp/cache/assets/test/sprockets/bf689240392e7355c0de5cfd47272146 +0 -0
  21. data/test/dummy/tmp/cache/assets/test/sprockets/c8c4c1b316845f30168739b5795846d6 +0 -0
  22. data/test/dummy/tmp/cache/assets/test/sprockets/d5a48c6656341c56cac8a8e42bb925a5 +0 -0
  23. data/test/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6 +0 -0
  24. data/test/dummy/tmp/cache/assets/test/sprockets/de0932670a6c856bc6eda1586fd29061 +0 -0
  25. data/test/dummy/tmp/cache/assets/test/sprockets/e22019b3c13c20bc08e899fb2b7248ea +0 -0
  26. data/test/dummy/tmp/cache/assets/test/sprockets/e9abb671d48f6ff2be6ffb463ea652bf +0 -0
  27. data/test/dummy/tmp/cache/assets/test/sprockets/eeb5bd38d1dad0d908461fd114f702bc +0 -0
  28. data/test/dummy/tmp/cache/assets/test/sprockets/fde9e78f8d55a70f4ef757638fc6cde0 +0 -0
  29. data/test/dummy/tmp/cache/assets/test/sprockets/fdfac6623944c5a23737724cbd90e58e +0 -0
  30. data/test/dummy/tmp/ember-rails/ember.js +0 -1
  31. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c9e3fdb3f5f7b22a5ac6e91f058f3c037e237d7a
4
- data.tar.gz: bf08926c25cc603242677d3bdc62d2363100c124
3
+ metadata.gz: f2b1db9996d11655c9e51f451b311bc4bd96e9ae
4
+ data.tar.gz: 4f7c70e1d77f5d23b1cdfa534e72cf6ce0ae1e5d
5
5
  SHA512:
6
- metadata.gz: d5c17b3ddf19c555a81a536f216b74ff3e54ed419a1050829f5b5a2ffb79467f40e22ae7e13e03073e5b8346a1d66b185acb0753f9bd44b7ae106e92db45a34a
7
- data.tar.gz: 41bee1669d93a9f7180c8d5a4b0f4f285e4703410955d054e2d8fccc4d94b29eb682e7d08dd12abc876e2635e142c1ba8d3c833d15f87325cd1dfee97840583e
6
+ metadata.gz: a40f03ec57dc1cdbf11ed29a957a71deb752c31a8450189d87eb4f7e63301e49dce247fb570850a3dec161fc81bc530b7d2f818c5c356eb00df12b38edee3e2f
7
+ data.tar.gz: f8eed6a405ff3b987da28ba4081df1be25d2aaf7d549ce64baf6ae30547969dda7f3bf125eb2f18e04527eea455ba065ee4b110dee3bd42a30704e2d3d269474
data/lib/ember/appkit/rails/engine.rb CHANGED
@@ -35,7 +35,13 @@ class Ember::Appkit::Rails::Engine < ::Rails::Engine
35
35
  end
36
36
 
37
37
  initializer :appkit_sprockets do
38
- Sprockets::Railtie.config.assets.paths.unshift(File.join(::Rails.root, config.ember.appkit.paths.config))
39
- Sprockets::Railtie.config.assets.paths.unshift(File.join(::Rails.root, config.ember.appkit.paths.app))
38
+ assets = Sprockets::Railtie.config.assets
39
+
40
+ assets_javascript = assets.paths.delete(::Rails.root.join('app','assets','javascripts').to_s)
41
+
42
+ index_of_last_app_assets = assets.paths.rindex{|s| s.start_with?(::Rails.root.join('app').to_s) } + 1
43
+ assets.paths.insert(index_of_last_app_assets, assets_javascript) if assets_javascript
44
+ assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.appkit.paths.config))
45
+ assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.appkit.paths.app))
40
46
  end
41
47
  end
data/lib/ember/appkit/rails/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Ember
2
2
  module Appkit
3
3
  module Rails
4
- VERSION = '0.2.1'
4
+ VERSION = '0.2.2'
5
5
  end
6
6
  end
7
7
  end
data/test/dummy/config/initializers/secret_token.rb CHANGED
@@ -9,4 +9,4 @@
9
9
 
10
10
  # Make sure your secret_key_base is kept private
11
11
  # if you're sharing your code publicly.
12
- Dummy::Application.config.secret_key_base = 'a8d2ff964fb34f8befd5c8bfc6c32c0c022f9ff4d7d23677d0619c0e64397616ae69a3b7bdbecb87e86ef241849c535bb871b7a8cac1c96cf3dfb9628d9ab2e2'
12
+ Dummy::Application.config.secret_key_base = '4b4d7fb6c5c5bb1fbbdc8599a13db9cb1f554f025593b17276329db151252d373a5679452021e951c41b93bced489a5856d8389054f2af5e4b3478aec25d3248'
data/test/dummy/log/test.log CHANGED
@@ -133,17 +133,17 @@ ViewGeneratorTest: test_create_view_without_a_template
133
133
  ----------------------------------------------------
134
134
  NavigationTest: test_can_render_default_landing_page
135
135
  ----------------------------------------------------
136
- Started GET "/" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
136
+ Started GET "/" for 127.0.0.1 at 2013-12-04 12:10:49 -0500
137
137
  Processing by LandingController#index as HTML
138
- Rendered inline template within layouts/application (0.8ms)
139
- Completed 200 OK in 371ms (Views: 370.6ms)
140
- Started GET "/assets/application.css" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
141
- Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
138
+ Rendered inline template within layouts/application (1.0ms)
139
+ Completed 200 OK in 390ms (Views: 389.5ms)
140
+ Started GET "/assets/application.css" for 127.0.0.1 at 2013-12-04 12:10:49 -0500
141
+ Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-04 12:10:49 -0500
142
142
  ---------------------------------------------------
143
143
  NavigationTest: test_can_using_simple_"ember_magic"
144
144
  ---------------------------------------------------
145
- Started GET "/" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
145
+ Started GET "/" for 127.0.0.1 at 2013-12-04 12:10:50 -0500
146
146
  Processing by LandingController#index as HTML
147
- Completed 200 OK in 1ms (Views: 1.1ms)
148
- Started GET "/assets/application.css" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
149
- Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
147
+ Completed 200 OK in 1ms (Views: 1.0ms)
148
+ Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-04 12:10:50 -0500
149
+ Started GET "/assets/application.css" for 127.0.0.1 at 2013-12-04 12:10:50 -0500
data/test/dummy/tmp/ember-rails/ember.js CHANGED
@@ -34631,7 +34631,6 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
34631
34631
  @param {Hash} options
34632
34632
  */
34633
34633
  EmberHandlebars.registerHelper('action', function(actionName) {
34634
- debugger;
34635
34634
  var options = arguments[arguments.length - 1],
34636
34635
  contexts = a_slice.call(arguments, 1, -1);
34637
34636
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ember-appkit-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brian Cardarella
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-02 00:00:00.000000000 Z
11
+ date: 2013-12-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails