Changeset 1087

Timestamp:

12/13/07 03:11:04 (1 year ago)

Author:

in..@loobmedia.com

Message:

config/merb.yml is now correctly loaded from Rake and test environment - using Merb::Server.load_config
added config option to disable loading of the JSON gem - still enabled by default

Files:

• trunk/app_generators/merb/templates/Rakefile (modified) (1 diff)
• trunk/app_generators/merb/templates/config/merb.yml (modified) (1 diff)
• trunk/lib/merb.rb (modified) (2 diffs)
• trunk/lib/merb/server.rb (modified) (2 diffs)

trunk/app_generators/merb/templates/Rakefile

@@ -7 +7 @@
-
-MERB_ENV = ENV['MERB_ENV'] if ENV['MERB_ENV']
+$RAKE_ENV = true
-
-require File.dirname(__FILE__)+'/config/boot.rb'

trunk/app_generators/merb/templates/config/merb.yml

@@ -72 +72 @@
-# change the configuration only for development create
-# config/environments/development.yml
+
+# If you don't intend to parse JSON, use ActiveSupport, or want to roll your own
+# set this to true, to disable the loading of the JSON gem
+# :disable_json_gem: true

trunk/lib/merb.rb

@@ -30 +30 @@
-require 'merb/erubis_ext'
-require 'merb/logger'
-begin
-  require 'json/ext'
-rescue LoadError
-  puts "Using pure ruby JSON lib"
-  require 'json/pure'
-end
-
-require 'set'
@@ -120 +114 @@
-  Dir[test_files].each { |file| require file }
-end
+
+# If we're in the TEST environment or if running from Rake make sure to load 
+# config/merb.yml - which is normally done by Merb::Server.run
+Merb::Server.load_config if $TESTING || $RAKE_ENV
+
+# If you don't use the JSON gem, disable auto-parsing of json params too
+if Merb::Server.config[:disable_json_gem]
+  Merb::Request::parse_json_params = false
+else
+  begin
+    require 'json/ext'
+  rescue LoadError
+    puts "Using pure ruby JSON lib"
+    require 'json/pure'
+  end
+end

trunk/lib/merb/server.rb

@@ -391 +391 @@
-
-      def run
-
-
+
-
-        if @@merb_opts[:generate] #|| @@merb_opts.size == 1
@@ -627 +626 @@
-      def config
-        @@merb_opts
+      end
+      
+      def load_config
+        @@merb_raw_opts = ARGV
+        merb_config
-      end 
-