@@ -117,4 +117,4 @@ namespace :manage do end -end \ No newline at end of file +end Rakefile @@ -52,7 +52,6 @@ module Marley def load raw_config = YAML.load_file( File.join(MARLEY_ROOT, 'config', 'config.yml') ) @@config = nested_hash_to_openstruct(raw_config) - @@theme = Theme.new(@@config) end @@ -72,8 +71,8 @@ module Marley # Delegate configuration methods to @@config def method_missing(method_name, *attributes) - if has = @@config.send(method_name) - return has + if @@config.respond_to?(method_name.to_sym) + return @@config.send(method_name.to_sym) else super end app/lib/configuration.rb @@ -1,12 +1,16 @@ # Inspired by Ryan Tomayko, http://github.com/rtomayko/wink/tree/master/lib/wink/models.rb#L276 -ActiveRecord::Schema.define(:version => 1) do - create_table :comments do |t| - t.string :post_id, :null => false - t.string :author, :email, :url, :ip, :referrer , :user_agent, :referrer, :permalink, :comment_type - t.text :body - t.datetime :created_at, :default => 'NOW()' - t.boolean :checked, :default => false - t.boolean :spam, :default => false +begin + ActiveRecord::Schema.define(:version => 1) do + create_table :comments do |t| + t.string :post_id, :null => false + t.string :author, :email, :url, :ip, :referrer , :user_agent, :referrer, :permalink, :comment_type + t.text :body + t.datetime :created_at, :default => 'NOW()' + t.boolean :checked, :default => false + t.boolean :spam, :default => false + end + add_index :comments, :post_id end - add_index :comments, :post_id +rescue Exception => e + puts e end \ No newline at end of file config/db_create_comments.rb ed63c0bee69175b4cc9604af0d30d0d3e987eb4c Karel Minarik karmi@karmi.cz http://github.com/karmi/marley/commit/15704653081013580d209b6f6f359c74ee065e92 15704653081013580d209b6f6f359c74ee065e92 2009-02-14T13:45:50-08:00 2009-02-14T13:45:50-08:00 [FIX] Take care of nil issue in ga_code c59310513ddb2a97048571fab0bacd3cbb76190a Karel Minarik karmi@karmi.cz