From: Tom Hughes <tom@compton.nu>
Date: Thu, 6 Dec 2007 18:42:45 +0000 (+0000)
Subject: Try and make asset tagging actually work.
X-Git-Tag: live~8058
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/15c492ebfe7aa6527f7b24fe23056ee9947286d1

Try and make asset tagging actually work.
---

diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml
index 4e9482f3c..7ee1eeaed 100644
--- a/app/views/diary_entry/new.rhtml
+++ b/app/views/diary_entry/new.rhtml
@@ -32,8 +32,8 @@
   <% zoom = '12' %>
 <% end %>
 
-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
-<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 4cd01dcc9..5b1b81108 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -43,7 +43,7 @@
     <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available
     for editing OpenStreetMap.
 </div>
-<script type="text/javascript" src="/javascripts/swfobject.js"></script>
+<%= javascript_include_tag 'swfobject.js' %>
 <script type="text/javascript">
   var brokenContentSize = $("content").offsetWidth == 0;
   var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF");
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index e88643588..a83053c07 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -72,8 +72,8 @@ by the OpenStreetMap project and it's contributors.
 <% end %>
 <% end %>
 
-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
-<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 
diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index 851815506..c5312686a 100644
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -46,8 +46,8 @@
   <% zoom =  '12' %>
 <% end %>
 
-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
-<script type="text/javascript" src="/openlayers/OpenStreetMap.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
diff --git a/config/environment.rb b/config/environment.rb
index 0d98c70bd..2bc029767 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -7,9 +7,6 @@ Process.setrlimit Process::RLIMIT_AS, 640*1024*1024, Process::RLIM_INFINITY
 # you don't control web/app server and can't set it the proper way
 ENV['RAILS_ENV'] ||= 'production'
 
-# Don't add asset tags
-ENV["RAILS_ASSET_ID"] = ''
-
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '1.2.3'
 
@@ -77,6 +74,24 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
+# Hack the AssetTagHelper to make asset tagging work better
+module ActionView
+  module Helpers
+    module AssetTagHelper
+      private
+        alias :old_compute_public_path :compute_public_path
+
+        def compute_public_path(source, dir, ext)
+          path = old_compute_public_path(source, dir, ext)
+          if path =~ /(.+)\?(\d+)\??$/
+            path = "#{$1}/#{$2}"
+          end
+          path
+        end
+    end
+  end
+end
+
 # Set to :readonly to put the API in read-only mode or :offline to
 # take it completely offline
 API_STATUS = :online
diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index 75647f248..5455e266d 100644
--- a/config/lighttpd.conf
+++ b/config/lighttpd.conf
@@ -7,6 +7,7 @@ server.modules = (
   "mod_cgi",
   "mod_compress",
   "mod_evasive",
+  "mod_expire",
   "mod_fastcgi",
   "mod_redirect",
   "mod_status"
@@ -78,6 +79,16 @@ compress.filetype = (
   "text/plain"
 )
 
+#
+# Set expiry for static content
+#
+expire.url = (
+  "/images/" => "access 10 years",
+  "/javascripts/" => "access 10 years",
+  "/openlayers/" => "access 10 years",
+  "/stylesheets/" => "access 10 years"
+)
+
 #
 # Cache compressed content
 #