emipair-merb_global 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/config/geminstaller.yml

@@ -0,0 +1,35 @@
+---
+# You don't need all these gems to use merb_global, but you do need them
+# to run the full test suite. This is incomplete, but it is a start.
+defaults:
+  install_options: --no-rdoc --no-ri --ignore-dependencies
+gemcutter_options: &gemcutter_options
+  install_options: --no-rdoc --no-ri --ignore-dependencies --source http://gemcutter.org
+
+active_support_gems_version: &active_support_gems_version
+  version: 2.3.4
+data_mapper_gems_version: &data_mapper_gems_version
+  version: 0.9.11
+gettext_gems_version: &gettext_gems_version
+  version: 2.0.4
+
+gems:
+- name: activesupport
+  <<: *active_support_gems_version
+- name: activerecord
+  <<: *active_support_gems_version
+- name: locale
+  <<: *gettext_gems_version
+- name: gettext
+  <<: *gettext_gems_version
+# The sequel tests are failing; may need an older version?
+# - name: sequel
+#   version: 3.6.0
+- name: mocha
+  version: 0.9.8
+- name: composite_primary_keys
+  version: 2.3.2
+- name: do_sqlite3
+  <<: *data_mapper_gems_version
+- name: data_objects
+  <<: *data_mapper_gems_version

data/lib/merb_global/locale.rb

@@ -101,6 +101,7 @@ module Merb
             return lang if lang && Merb::Global::Locale.support?(lang)
           end
         end
+        return nil
       end
 
       # Returns current locale

data/spec/controller_spec.rb

@@ -37,6 +37,14 @@ describe Merb::Controller do
     Merb::Global::Locale.current.should == Merb::Global::Locale.new('fr')
   end
 
+  it 'should use default locale when none of the ACCEPT_LANGUAGEs are supported' do
+    Merb::Global::Locale.stubs(:support?).returns(false)
+    controller = dispatch_to(TestController, :index) do |controller|
+      controller.request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr-FR'
+    end
+    Merb::Global::Locale.current.should == Merb::Global::Locale.new('en')
+  end
+
   it 'should take the weights into account' do
     de = Merb::Global::Locale.new('de')
     Merb::Global.stubs(:config).with('locales', ['en']).returns(['de', 'es'])

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'rubygems'
+lib_dir = File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift(lib_dir);
 
 # Providers
 def load_provider_lib(*libs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emipair-merb_global
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matt Kent
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 -07:00
+date: 2009-11-02 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,7 @@ files:
 - activerecord_generators/translations_migration/templates/translations_migration.erb
 - activerecord_generators/translations_migration/translations_migration_generator.rb
 - benchmarks/database1.rb
+- config/geminstaller.yml
 - examples/active_record_example/README.txt
 - examples/active_record_example/application.rb
 - examples/active_record_example/config/database.yml
@@ -144,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Localization (L10n) and Internationalization (i18n) support for the Merb MVC Framework