Changeset 1260

Timestamp:

01/10/08 09:29:04 (9 months ago)

Author:

in..@loobmedia.com

Message:

put json library loading into BootLoader? (after Sass plugin) - now it finally respects Merb::Config[:disable_json_gem]

Files:

• trunk/app_generators/merb/templates/spec/spec_helper.rb (modified) (1 diff)
• trunk/lib/merb.rb (modified) (1 diff)
• trunk/lib/merb/boot_loader.rb (modified) (1 diff)

trunk/app_generators/merb/templates/spec/spec_helper.rb

@@ -1 @@
-Merb.environment="test"
-$TESTING=true
-require File.join(File.dirname(__FILE__), "..", 'config', 'boot')
+Merb.environment="test"
-require File.join(Merb.root, 'config', 'merb_init')
-

trunk/lib/merb.rb

@@ -182 +182 @@
-Merb.logger.level = Merb::Logger.const_get(Merb::Config[:log_level].upcase) rescue Merb::Logger::INFO
-
-# If you don't use the JSON gem, disable auto-parsing of json params too
-if Merb::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
-
-if $TESTING
-  test_files = File.join(Merb.lib_path, 'test', '*.rb')

trunk/lib/merb/boot_loader.rb

@@ -149 +149 @@
-        load_inline_helpers
-        @app_loaded = true
+        load_libraries
-        (@after_app_blocks || []).each { |b| b.call }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-