@@ -4,4 +4,6 @@ doc log pkg pkg/* +tmp/ +tmp/* *.db .gitignore @@ -39,13 +39,12 @@ module Merb if defined? RUBY_ENGINE and RUBY_ENGINE == "jruby" def java_locale require 'java' - @java_locale ||= do + @java_locale ||= if @country.nil? java.util.Locale.new(@language.downcase) else java.util.Locale.new(@language.downcase, @country.upcase) end - end end else def java_locale lib/merb_global/locale.rb @@ -1,14 +1,4 @@ require 'rubygems' -require 'pathname' -require 'merb-core' - -Merb::Plugins.config[:merb_global] = { - :provider => 'mock', - :localedir => File.join('spec', 'locale') -} - -require 'spec' -require Pathname(__FILE__).dirname.parent.expand_path + 'lib/merb_global' # Providers def load_provider_lib(*libs) @@ -26,8 +16,20 @@ HAS_DM = load_provider_lib 'dm-core', 'dm-validations', 'dm-aggregates' HAS_GETTEXT = load_provider_lib 'gettext' HAS_SEQUEL = load_provider_lib 'sequel' +require 'merb-core' + +Merb::Plugins.config[:merb_global] = { + :provider => 'mock', + :localedir => File.join('spec', 'locale') +} + +require 'pathname' +require Pathname(__FILE__).dirname.parent.expand_path.to_s + '/lib/merb_global' + Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test') +require 'spec' + Spec::Runner.configure do |config| config.include(Merb::Test::ControllerHelper) config.mock_with :mocha spec/spec_helper.rb 9f26b59a577c2324d8e00e717937e6335c2f08fe Maciej Piechotka uzytkownik2@gmail.com http://github.com/myabc/merb_global/commit/169ede72eef7b74c53afc7bf0c77d1116ad47c19 169ede72eef7b74c53afc7bf0c77d1116ad47c19 2009-01-29T05:56:53-08:00 2009-01-29T05:56:53-08:00 Fixes for upstream dm-core/merb-core 61dacc0fa7b8b90f03127ff1ccdb0b8bd02d25f7 Maciej Piechotka uzytkownik2@gmail.com