Permalink
Browse files

tidying up some lib files looking for errors

  • Loading branch information...
1 parent 9f0df4f commit 4fbab66eee30c7b4a82899e279f3baa1f4df1095 Dirk Kelly committed Dec 25, 2010
Showing with 9 additions and 16 deletions.
  1. +2 −2 lib/radiant.rb
  2. +7 −14 lib/radiant/engine.rb
View
@@ -17,7 +17,7 @@ module Version
Minor = version[1]
Tiny = version[2]
Patch = version[3]
-
+
class << self
def to_s
[Major, Minor, Tiny, Patch].delete_if{|v| v.nil? }.join('.')
@@ -30,7 +30,7 @@ def to_s
def self.loaded_via_gem?
false
end
-
+
def self.app?
true
end
View
@@ -1,32 +1,25 @@
-require 'radiant'
-require 'rails'
-
module Radiant
- #class Application < Rails::Engine
- #
- #end
-
class Engine < Rails::Engine
require 'radiant/core_ext'
# 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.
-
+
# Add additional load paths for your own custom dirs
# config.autoload_paths += %W( #{config.root}/extras )
-
+
# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
+
# Activate observers that should always be running
config.active_record.observers = :user_action_observer
-
+
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
# config.time_zone = 'Central Time (US & Canada)'
-
+
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
# config.i18n.default_locale = :de
@@ -53,10 +46,10 @@ class Engine < Rails::Engine
g.template_engine :haml
g.test_framework :rspec, :fixture => false
end
-
+
# Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8"
-
+
initializer "haml" do
require 'haml'
require 'sass'

0 comments on commit 4fbab66

Please sign in to comment.