Try and make asset tagging actually work.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 003a7b832ce1e6ca468281de77aa4e47804d65d4..2bc029767b0e0043017e1a00e3e5577df212477a 100644 (file)
--- 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'
 
 # 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'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '1.2.3'
 


@@ -17,7 +14,7 @@ RAILS_GEM_VERSION = '1.2.3'
 require File.join(File.dirname(__FILE__), 'boot')
 
 # Application constants needed for routes.rb - must go before Initializer call
 require File.join(File.dirname(__FILE__), 'boot')
 
 # Application constants needed for routes.rb - must go before Initializer call

-API_VERSION = ENV['OSM_API_VERSION'] || '0.4'
+API_VERSION = ENV['OSM_API_VERSION'] || '0.5'

 
 # Custom logger class to format messages sensibly
 class OSMLogger < Logger
 
 # Custom logger class to format messages sensibly
 class OSMLogger < Logger


@@ -77,8 +74,27 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
 #   inflect.uncountable %w( fish sheep )
 # end
 

-# Set to true to put the API in read-only mode
-API_READONLY = false
+# 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

 
 # Include your application configuration below
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 
 # Include your application configuration below
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'