ember-appkit-rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e3fdb3f5f7b22a5ac6e91f058f3c037e237d7a
-  data.tar.gz: bf08926c25cc603242677d3bdc62d2363100c124
+  metadata.gz: f2b1db9996d11655c9e51f451b311bc4bd96e9ae
+  data.tar.gz: 4f7c70e1d77f5d23b1cdfa534e72cf6ce0ae1e5d
 SHA512:
-  metadata.gz: d5c17b3ddf19c555a81a536f216b74ff3e54ed419a1050829f5b5a2ffb79467f40e22ae7e13e03073e5b8346a1d66b185acb0753f9bd44b7ae106e92db45a34a
-  data.tar.gz: 41bee1669d93a9f7180c8d5a4b0f4f285e4703410955d054e2d8fccc4d94b29eb682e7d08dd12abc876e2635e142c1ba8d3c833d15f87325cd1dfee97840583e
+  metadata.gz: a40f03ec57dc1cdbf11ed29a957a71deb752c31a8450189d87eb4f7e63301e49dce247fb570850a3dec161fc81bc530b7d2f818c5c356eb00df12b38edee3e2f
+  data.tar.gz: f8eed6a405ff3b987da28ba4081df1be25d2aaf7d549ce64baf6ae30547969dda7f3bf125eb2f18e04527eea455ba065ee4b110dee3bd42a30704e2d3d269474

data/lib/ember/appkit/rails/engine.rb

@@ -35,7 +35,13 @@ class Ember::Appkit::Rails::Engine < ::Rails::Engine
   end
 
   initializer :appkit_sprockets do
-    Sprockets::Railtie.config.assets.paths.unshift(File.join(::Rails.root, config.ember.appkit.paths.config))
-    Sprockets::Railtie.config.assets.paths.unshift(File.join(::Rails.root, config.ember.appkit.paths.app))
+    assets = Sprockets::Railtie.config.assets
+
+    assets_javascript = assets.paths.delete(::Rails.root.join('app','assets','javascripts').to_s)
+
+    index_of_last_app_assets = assets.paths.rindex{|s| s.start_with?(::Rails.root.join('app').to_s) } + 1
+    assets.paths.insert(index_of_last_app_assets, assets_javascript) if assets_javascript
+    assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.appkit.paths.config))
+    assets.paths.insert(index_of_last_app_assets, File.join(::Rails.root, config.ember.appkit.paths.app))
   end
 end

data/lib/ember/appkit/rails/version.rb

@@ -1,7 +1,7 @@
 module Ember
   module Appkit
     module Rails
-      VERSION = '0.2.1'
+      VERSION = '0.2.2'
     end
   end
 end

data/test/dummy/config/initializers/secret_token.rb

@@ -9,4 +9,4 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
-Dummy::Application.config.secret_key_base = 'a8d2ff964fb34f8befd5c8bfc6c32c0c022f9ff4d7d23677d0619c0e64397616ae69a3b7bdbecb87e86ef241849c535bb871b7a8cac1c96cf3dfb9628d9ab2e2'
+Dummy::Application.config.secret_key_base = '4b4d7fb6c5c5bb1fbbdc8599a13db9cb1f554f025593b17276329db151252d373a5679452021e951c41b93bced489a5856d8389054f2af5e4b3478aec25d3248'

data/test/dummy/log/test.log

@@ -133,17 +133,17 @@ ViewGeneratorTest: test_create_view_without_a_template
 ----------------------------------------------------
 NavigationTest: test_can_render_default_landing_page
 ----------------------------------------------------
-Started GET "/" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
+Started GET "/" for 127.0.0.1 at 2013-12-04 12:10:49 -0500
 Processing by LandingController#index as HTML
-  Rendered inline template within layouts/application (0.8ms)
-Completed 200 OK in 371ms (Views: 370.6ms)
-Started GET "/assets/application.css" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
-Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
+  Rendered inline template within layouts/application (1.0ms)
+Completed 200 OK in 390ms (Views: 389.5ms)
+Started GET "/assets/application.css" for 127.0.0.1 at 2013-12-04 12:10:49 -0500
+Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-04 12:10:49 -0500
 ---------------------------------------------------
 NavigationTest: test_can_using_simple_"ember_magic"
 ---------------------------------------------------
-Started GET "/" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
+Started GET "/" for 127.0.0.1 at 2013-12-04 12:10:50 -0500
 Processing by LandingController#index as HTML
-Completed 200 OK in 1ms (Views: 1.1ms)
-Started GET "/assets/application.css" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
-Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-02 14:34:26 -0500
+Completed 200 OK in 1ms (Views: 1.0ms)
+Started GET "/assets/application.js" for 127.0.0.1 at 2013-12-04 12:10:50 -0500
+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

@@ -34631,7 +34631,6 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
     @param {Hash} options
   */
   EmberHandlebars.registerHelper('action', function(actionName) {
-    debugger;
     var options = arguments[arguments.length - 1],
         contexts = a_slice.call(arguments, 1, -1);
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-appkit-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails