fixed asset precompile in production (major bug)

d0z0 · May 16, 2014 · b483ebe · b483ebe
1 parent a614c39
commit b483ebe
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/app/views/layouts/redis_analytics/application.html.erb b/app/views/layouts/redis_analytics/application.html.erb
@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>RedisAnalytics</title>
-  <%= stylesheet_link_tag    "redis_analytics/engine", :media => "all" %>
-  <%= javascript_include_tag "redis_analytics/engine" %>
+  <%= stylesheet_link_tag    "redis_analytics/redis_analytics", :media => "all" %>
+  <%= javascript_include_tag "redis_analytics/redis_analytics" %>
   <%= csrf_meta_tags %>
 </head>
 <body onload="changeTimeFrame('<%=@range%>')">
@@ -12,6 +12,6 @@
 <%= yield %>
 
 <%= render partial: 'footer', layout: false %>
-<%= javascript_include_tag "redis_analytics/bootstrap.min.js" %>
+<%# javascript_include_tag "redis_analytics/bootstrap.min.js" %>
 </body>
 </html>
diff --git a/lib/redis_analytics/engine.rb b/lib/redis_analytics/engine.rb
@@ -1,5 +1,5 @@
-require 'rails'
 require 'jquery-rails'
+require 'rails'
 
 module RedisAnalytics
   module Dashboard
@@ -13,6 +13,13 @@ class Engine < ::Rails::Engine
       initializer "redis_analytics.view_helpers" do |app|
         ActionController::Base.send :include, RedisAnalytics::Helpers
       end
+
+      initializer "redis_analytics.precompile.hook", group: :all do |app|
+        app.config.assets.precompile += %w[
+        redis_analytics/redis_analytics.js
+        redis_analytics/redis_analytics.css
+      ]
+      end
     end
   end
 end
diff --git a/lib/redis_analytics/version.rb b/lib/redis_analytics/version.rb
@@ -1,4 +1,4 @@
 module RedisAnalytics
-  VERSION = '0.7.1'
+  VERSION = '1.0.0'
 end
 
diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb
@@ -9,7 +9,7 @@
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_assets = true
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

diff --git a/...ets/javascripts/redis_analytics/engine.js → ...cripts/redis_analytics/redis_analytics.js b/...ets/javascripts/redis_analytics/engine.js → ...cripts/redis_analytics/redis_analytics.js
@@ -12,4 +12,9 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require_tree .
+//= require redis_analytics/jquery-jvectormap-1.2.2.min
+//= require redis_analytics/jquery-jvectormap-world-mill-en
+//= require redis_analytics/raphael-min
+//= require redis_analytics/morris.min
+//= require redis_analytics/bootstrap.min
+
diff --git a/...ts/stylesheets/redis_analytics/engine.css → ...heets/redis_analytics/redis_analytics.css b/...ts/stylesheets/redis_analytics/engine.css → ...heets/redis_analytics/redis_analytics.css
@@ -8,5 +8,7 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require_tree .
+ *= require redis_analytics/jquery-jvectormap-1.2.2
+ *= require redis_analytics/morris
+ *= require redis_analytics/bootstrap.min
  */