instance_environment.rb in radiant-0.8.0

- old
+ new
@@ -8,79 +8,71 @@
 require File.join(File.dirname(__FILE__), 'boot')
 
 require 'radius'
 
 Radiant::Initializer.run do |config|
-  # Settings in config/environments/* take precedence over those specified here.
-  # Application configuration should go into files in config/initializers
-  # -- all .rb files in that directory are automatically loaded.
-  # See Rails::Configuration for more options.
-
   # Skip frameworks you're not going to use (only works if using vendor/rails).
   # To use Rails without a database, you must remove the Active Record framework
   config.frameworks -= [ :action_mailer ]
-  
-  # Only load the plugins named here, in the order given. By default, all plugins 
-  # in vendor/plugins are loaded in alphabetical order.
-  # :all can be used as a placeholder for all plugins not explicitly named
-  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-  
-  # Only load the extensions named here, in the order given. By default all 
-  # extensions in vendor/extensions are loaded, in alphabetical order. :all 
-  # can be used as a placeholder for all extensions not explicitly named. 
-  # config.extensions = [ :all ] 
 
-  # Force all environments to use the same logger level 
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
-  
+  # Only load the extensions named here, in the order given. By default all
+  # extensions in vendor/extensions are loaded, in alphabetical order. :all
+  # can be used as a placeholder for all extensions not explicitly named.
+  # config.extensions = [ :all ]
+
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
-  # Make sure the secret is at least 30 characters and all random, 
+  # Make sure the secret is at least 30 characters and all random,
   # no regular words or you'll be exposed to dictionary attacks.
   config.action_controller.session = {
-    :session_key => '_radiant_session',
+    :session_key => '_<%= app_name %>_session',
     :secret      => <% require 'digest/sha1' %>'<%= Digest::SHA1.hexdigest("--#{app_name}--#{Time.now.to_s}--#{rand(10000000)}--") %>'
   }
-  
+
+  # Comment out this line if you want to turn off all caching, or
+  # add options to modify the behavior. In the majority of deployment 
+  # scenarios it is desirable to leave Radiant's cache enabled and in
+  # the default configuration.
+  #
+  # Additional options:
+  #  :use_x_sendfile => true
+  #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd.
+  #  :use_x_accel_redirect => '/some/virtual/path'
+  #    Turns on X-Accel-Redirect support for nginx. You have to provide
+  #    a path that corresponds to a virtual location in your webserver 
+  #    configuration.
+  #  :entitystore => "radiant:cache/entity"
+  #    Sets the entity store type (preceding the colon) and storage 
+  #   location (following the colon, relative to Rails.root).
+  #    We recommend you use radiant: since this will enable manual expiration.
+  #  :metastore => "radiant:cache/meta"
+  #    Sets the meta store type and storage location.  We recommend you use
+  #    radiant: since this will enable manual expiration and acceleration headers.
+  config.middleware.use ::Radiant::Cache
+
   # Use the database for sessions instead of the cookie-based default,
   # which shouldn't be used to store highly confidential information
   # (create the session table with 'rake db:sessions:create')
   config.action_controller.session_store = :cookie_store
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-  
-  # Enable page/fragment caching by setting a file-based store
-  # (remember to create the caching directory and make it readable to the application)
-  # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/fragment_cache"
-  config.action_controller.page_cache_directory = "#{RAILS_ROOT}/cache"
-  
   # Activate observers that should always be running
   config.active_record.observers = :user_action_observer
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc
-  
+
   # Set the default field error proc
   config.action_view.field_error_proc = Proc.new do |html, instance|
-    %{<div class="error-with-field">#{html} <small class="error">&bull; #{[instance.error_message].flatten.first}</small></div>}
+    if html !~ /label/
+      %{<div class="error-with-field">#{html} <small class="error">&bull; #{[instance.error_message].flatten.first}</small></div>}
+    else
+      html
+    end
   end
-  
+
   config.after_initialize do
     # Add new inflection rules using the following format:
     ActiveSupport::Inflector.inflections do |inflect|
       inflect.uncountable 'config'
     end
-
-    # Auto-require text filters
-    Dir["#{RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
-      require_dependency File.basename(filter).sub(/\.rb$/, '')
-    end
-
-    # Response Caching Defaults
-    ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
-    ResponseCache.defaults[:logger]    = ActionController::Base.logger
   end
 end
\ No newline at end of file