merb_global 0.0.6 → 0.0.7

data/HISTORY

@@ -1,7 +1,12 @@
+=== 0.0.7
+ * More consistent configuration of supported languages
+ * JRuby Numeric provider
+ * Some small fixes
+
 === 0.0.6
  * Introduction of Locale object
  * Change of MessageProviders interface
- * Per-enviroment configuration
+ * Per-environment configuration
 
 === 0.0.5
  * Handles lang_REGION as lang

data/Rakefile

@@ -1,50 +1,47 @@
 require 'rubygems'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
-require 'fileutils'
 
 PLUGIN = "merb_global"
 NAME = "merb_global"
-GEM_VERSION = "0.0.6"
+GEM_VERSION = "0.0.7"
 AUTHORS = ["Alex Coles", "Maciej Piechotka"]
-EMAIL = "alex@alexcolesportfolio.com"
+EMAIL = "merb_global@googlegroups.com"
 HOMEPAGE = "http://trac.ikonoklastik.com/merb_global/"
 SUMMARY = "Localization (L10n) and Internationalization (i18n) support for the Merb MVC Framework"
 
-spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.authors = AUTHORS
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.rubyforge_project = 'merb-global'
-  s.add_dependency('merb-core', '>= 0.9.1')
-  s.add_dependency('treetop', '>= 1.2.3') # Tested on 1.2.3
-  s.require_path = 'lib'
-  s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO HISTORY) +
-            Dir.glob("{lib,specs,*_generators}/**/*")
-
-  # rdoc
-  s.has_rdoc = true
-  s.extra_rdoc_files = %w(README LICENSE TODO HISTORY)
+def spec
+  require 'spec/rake/spectask'
+  Gem::Specification.new do |s|
+    s.name = NAME
+    s.version = GEM_VERSION
+    s.platform = Gem::Platform::RUBY
+    s.summary = SUMMARY
+    s.description = s.summary
+    s.authors = AUTHORS
+    s.email = EMAIL
+    s.homepage = HOMEPAGE
+    s.rubyforge_project = 'merb-global'
+    s.add_dependency('merb-core', '>= 0.9.1')
+    s.add_dependency('treetop', '>= 1.2.3') # Tested on 1.2.3
+    s.require_path = 'lib'
+    s.autorequire = PLUGIN
+    s.files = %w(LICENSE README Rakefile TODO HISTORY) +
+              Dir.glob("{lib,specs,*_generators,examples}/**/*")
+    
+    # rdoc
+    s.has_rdoc = true
+    s.extra_rdoc_files = %w(README LICENSE TODO HISTORY)
+  end
 end
 
-windows = (PLATFORM =~ /win32|cygwin/) rescue nil
-
-SUDO = windows ? "" : "sudo"
-
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
 desc "Install merb_global"
 task :install => [:package] do
-  sh %{#{SUDO} gem install pkg/#{NAME}-#{GEM_VERSION}}
+  sh %{gem install pkg/#{NAME}-#{GEM_VERSION}}
 end
 
 Rake::RDocTask.new do |rd|
@@ -54,6 +51,7 @@ end
 
 desc "Creates database for examples"
 task :populate_db do
+  require 'fileutils'
   pwd = File.dirname __FILE__
   db = "#{pwd}/examples/database.db"
   sh %{sqlite3 #{db} < #{pwd}/examples/database.sql}
@@ -61,7 +59,7 @@ task :populate_db do
   FileUtils.cp db, "#{pwd}/examples/data_mapper_example/database.db"
   FileUtils.cp db, "#{pwd}/examples/sequel_example/database.db"
 end
-task :gem => :populate_db
+task "pkg/#{NAME}-#{GEM_VERSION}" => [:populate_db]
 
 desc "Run all specs"
 Spec::Rake::SpecTask.new('specs') do |st|

data/TODO

@@ -1,3 +1,4 @@
 = TODO
 
-This list will be added shortly. The list of things to do is long.
+Please see http://trac.ikonoklastik.com/merb_global/ for the MerbGlobal issue
+tracker.

data/examples/active_record_example/README.txt

@@ -0,0 +1,9 @@
+Merb Flat
+==============
+
+An example of a small Merb application. Uses a single views directory and one
+controller file.
+
+Start with
+
+  merb

data/examples/active_record_example/application.rb

@@ -0,0 +1,5 @@
+class ActiveRecordExample < Merb::Controller
+  def index
+    _('Hi! Hello world!')
+  end
+end

data/examples/active_record_example/config/database.yml

@@ -0,0 +1,9 @@
+:development: &defaults
+  :adapter: sqlite3
+  :database: database.db
+
+:test:
+  <<: *defaults
+
+:production:
+  <<: *defaults

data/examples/active_record_example/config/framework.rb

@@ -0,0 +1,5 @@
+Merb::Config[:framework] = {
+  :application => 'application.rb',
+  :view => 'views',
+  :config => 'config'
+}

data/examples/active_record_example/config/init.rb

@@ -0,0 +1,24 @@
+# Load the merb_global from current tree
+Gem.clear_paths
+Gem.path.unshift((Pathname(__FILE__).dirname + '../../../pkg').expand_path)
+$LOAD_PATH.unshift((Pathname(__FILE__).dirname + '../../../lib').expand_path)
+
+Merb::Router.prepare do |r|
+  r.match('/').to(:controller => 'active_record_example', :action =>'index')
+end
+
+use_orm :activerecord
+dependency 'merb_global'
+
+Merb::Config.use { |c|
+  c[:environment]         = 'production',
+  c[:framework]           = {},
+  c[:log_level]           = 'debug',
+  c[:use_mutex]           = false,
+  c[:session_store]       = 'cookie',
+  c[:session_id_key]      = '_session_id',
+  c[:session_secret_key]  = '779c710d6a7b90faf17cba97c156fc133a9884c9',
+  c[:exception_details]   = true,
+  c[:reload_classes]      = true,
+  c[:reload_time]         = 0.5
+}

data/examples/active_record_example/config/plugins.yml

@@ -0,0 +1,3 @@
+:merb_global:
+  :message_provider: active_record
+  :locales: ['en', 'pl']

data/examples/active_record_example/log/merb.4000.pid

@@ -0,0 +1 @@
+25822

data/examples/active_record_example/log/merb.main.log

@@ -0,0 +1,9 @@
+Sun, 23 Nov 2008 22:30:17 GMT  ~  info  ~  Logfile created
+ ~ 
+ ~ FATAL: The gem merb_global (>= 0, runtime), [] was not found
+ ~ 
+ ~ Connecting to database...
+ ~ Parent pid: 17770
+ ~ 
+ ~ FATAL: The gem merb_global, [] was not found
+ ~ 

data/examples/data_mapper_example/README.txt

@@ -0,0 +1,9 @@
+Merb Flat
+==============
+
+An example of a small Merb application. Uses a single views directory and one
+controller file.
+
+Start with
+
+  merb

data/examples/data_mapper_example/application.rb

@@ -0,0 +1,5 @@
+class DataMapperExample < Merb::Controller
+  def index
+    _('Hi! Hello world!')
+  end
+end

data/examples/data_mapper_example/config/database.yml

@@ -0,0 +1,9 @@
+:development: &defaults
+  :adapter: sqlite3
+  :database: database.db
+
+:test:
+  <<: *defaults
+
+:production:
+  <<: *defaults

data/examples/data_mapper_example/config/framework.rb

@@ -0,0 +1,5 @@
+Merb::Config[:framework] = {
+  :application => 'application.rb',
+  :view => 'views',
+  :config => 'config'
+}

data/examples/data_mapper_example/config/init.rb

@@ -0,0 +1,24 @@
+# Load the merb_global from current tree
+Gem.clear_paths
+Gem.path.unshift((Pathname(__FILE__).dirname + '../../../pkg').expand_path)
+$LOAD_PATH.unshift((Pathname(__FILE__).dirname + '../../../lib').expand_path)
+
+Merb::Router.prepare do |r|
+  r.match('/').to(:controller => 'data_mapper_example', :action =>'index')
+end
+
+use_orm :datamapper
+dependency 'merb_global'
+
+Merb::Config.use { |c|
+  c[:environment]         = 'production',
+  c[:framework]           = {},
+  c[:log_level]           = 'debug',
+  c[:use_mutex]           = false,
+  c[:session_store]       = 'cookie',
+  c[:session_id_key]      = '_session_id',
+  c[:session_secret_key]  = '5b587281e1b277c3e90f5de2e42e5125dc649837',
+  c[:exception_details]   = true,
+  c[:reload_classes]      = true,
+  c[:reload_time]         = 0.5
+}

data/examples/data_mapper_example/config/plugins.yml

@@ -0,0 +1,3 @@
+:merb_global:
+  :message_provider: data_mapper
+  :locales: ['en', 'pl']

data/examples/data_mapper_example/log/dm.log

@@ -0,0 +1,3 @@
+Fri, 30 May 2008 22:23:32 GMT  ~  info  ~  Logfile created
+Fri, 30 May 2008 22:24:01 GMT  ~  info  ~  Logfile created
+Fri, 30 May 2008 22:45:22 GMT  ~  info  ~  Logfile created

data/examples/data_mapper_example/log/merb.4000.pid

@@ -0,0 +1 @@
+29001

data/examples/database.sql

@@ -0,0 +1,28 @@
+DROP TABLE IF EXISTS merb_global_languages;
+CREATE TABLE merb_global_languages (
+id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+name VARCHAR(50),
+nplural INTEGER,
+plural TEXT
+);
+
+DROP TABLE IF EXISTS merb_global_translations;
+CREATE TABLE merb_global_translations (
+language_id INTEGER NOT NULL,
+msgid TEXT NOT NULL,
+msgid_plural TEXT,
+msgstr TEXT NOT NULL,
+msgstr_index INTEGER,
+PRIMARY KEY(language_id, msgid, msgstr_index));
+
+
+CREATE UNIQUE INDEX unique_index_merb_global_languages_name
+ON merb_global_languages (name);
+
+INSERT INTO merb_global_languages (name, nplural, plural)
+VALUES ("pl", 3, "(n==1?0:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?1:2)");
+
+INSERT INTO merb_global_translations (language_id, msgid, msgstr)
+SELECT id, "Hi! Hello world!", "Cześć. Witaj świecie!"
+FROM merb_global_languages
+WHERE name = "pl";

data/examples/gettext_example/README.txt

@@ -0,0 +1,9 @@
+Merb Flat
+==============
+
+An example of a small Merb application. Uses a single views directory and one
+controller file.
+
+Start with
+
+  merb

data/examples/gettext_example/application.rb

@@ -0,0 +1,8 @@
+class GettextExample < Merb::Controller
+  language do
+    'pl' # It'll be always in Polish
+  end
+  def index
+    _('Hi! Hello world!')
+  end
+end

data/examples/gettext_example/config/framework.rb

@@ -0,0 +1,5 @@
+Merb::Config[:framework] = {
+  :application => 'application.rb',
+  :view => 'views',
+  :config => 'config'
+}

data/examples/gettext_example/config/init.rb

@@ -0,0 +1,24 @@
+# Load the merb_global from current tree
+Gem.clear_paths
+Gem.path.unshift((Pathname(__FILE__).dirname + '../../../pkg').expand_path)
+$LOAD_PATH.unshift((Pathname(__FILE__).dirname + '../../../lib').expand_path)
+
+Merb::Router.prepare do |r|
+  r.match('/').to(:controller => 'gettext_example', :action =>'index')
+  r.default_routes
+end
+
+dependency 'merb_global'
+
+Merb::Config.use { |c|
+  c[:environment]         = 'production',
+  c[:framework]           = {},
+  c[:log_level]           = 'debug',
+  c[:use_mutex]           = false,
+  c[:session_store]       = 'cookie',
+  c[:session_id_key]      = '_session_id',
+  c[:session_secret_key]  = '489739417a2edcb2ae6ec7390fc467992e313ed8',
+  c[:exception_details]   = true,
+  c[:reload_classes]      = true,
+  c[:reload_time]         = 0.5
+}

data/examples/gettext_example/config/plugins.yml

@@ -0,0 +1,4 @@
+:merb_global:
+  :message_provider: gettext
+  :flat: true
+  :locales: ['en', 'pl']

data/examples/gettext_example/locale/merbapp.pot

@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-22 13:59+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: gettext_example.rb:21
+msgid "Hi! Hello world!"
+msgstr ""

data/examples/gettext_example/locale/pl.po

@@ -0,0 +1,23 @@
+# Polish translations for PACKAGE package
+# Polskie tłumaczenia dla pakietu PACKAGE.
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#  <uzytkownik2@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-22 13:59+0200\n"
+"PO-Revision-Date: 2008-05-22 21:42+0100\n"
+"Last-Translator: Maciej Piechotka <uzytkownik2@gmail.com>\n"
+"Language-Team: Polish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: gettext_example.rb:21
+msgid "Hi! Hello world!"
+msgstr "Cześć. Witaj świecie!"
+

data/examples/mock_example/README.txt

@@ -0,0 +1,9 @@
+Merb Flat
+==============
+
+An example of a small Merb application. Uses a single views directory and one
+controller file.
+
+Start with
+
+  merb

data/examples/mock_example/application.rb

@@ -0,0 +1,5 @@
+class MockExample < Merb::Controller
+  def index
+    _('Hi! Hello world!')
+  end
+end

data/examples/mock_example/config/framework.rb

@@ -0,0 +1,5 @@
+Merb::Config[:framework] = {
+  :application => 'application.rb',
+  :view => 'views',
+  :config => 'config'
+}

data/examples/mock_example/config/init.rb

@@ -0,0 +1,23 @@
+Gem.clear_paths
+Gem.path.unshift((Pathname(__FILE__).dirname + '../../../pkg').expand_path)
+$LOAD_PATH.unshift((Pathname(__FILE__).dirname + '../../../lib').expand_path)
+
+Merb::Router.prepare do |r|
+  r.match('/').to(:controller => 'mock_example', :action =>'index')
+  r.default_routes
+end
+
+dependency 'merb_global'
+
+Merb::Config.use { |c|
+  c[:environment]         = 'production',
+  c[:framework]           = {},
+  c[:log_level]           = 'debug',
+  c[:use_mutex]           = false,
+  c[:session_store]       = 'cookie',
+  c[:session_id_key]      = '_session_id',
+  c[:session_secret_key]  = 'd729662a1de4755ac16f34d1bb012fe5c9e6a965',
+  c[:exception_details]   = true,
+  c[:reload_classes]      = true,
+  c[:reload_time]         = 0.5
+}

data/examples/mock_example/config/plugins.yml

@@ -0,0 +1,3 @@
+:merb_global:
+  :message_provider: mock
+  :locales: ['en', 'pl']

data/examples/sequel_example/README.txt

@@ -0,0 +1,9 @@
+Merb Flat
+==============
+
+An example of a small Merb application. Uses a single views directory and one
+controller file.
+
+Start with
+
+  merb

data/examples/sequel_example/application.rb

@@ -0,0 +1,5 @@
+class GettextExample < Merb::Controller
+  def index
+    _('Hi! Hello world!')
+  end
+end

data/examples/sequel_example/config/database.yml

@@ -0,0 +1,9 @@
+:development: &defaults
+  :adapter: sqlite
+  :database: database.db
+
+:test:
+  <<: *defaults
+
+:production:
+  <<: *defaults

data/examples/sequel_example/config/framework.rb

@@ -0,0 +1,5 @@
+Merb::Config[:framework] = {
+  :application => 'application.rb',
+  :view => 'views',
+  :config => 'config'
+}

data/examples/sequel_example/config/init.rb

@@ -0,0 +1,24 @@
+# Load the merb_global from current tree
+Gem.clear_paths
+Gem.path.unshift((Pathname(__FILE__).dirname + '../../../pkg').expand_path)
+$LOAD_PATH.unshift((Pathname(__FILE__).dirname + '../../../lib').expand_path)
+
+Merb::Router.prepare do |r|
+  r.match('/').to(:controller => 'gettext_example', :action =>'index')
+end
+
+use_orm :sequel
+dependency 'merb_global'
+
+Merb::Config.use { |c|
+  c[:environment]         = 'production',
+  c[:framework]           = {},
+  c[:log_level]           = 'debug',
+  c[:use_mutex]           = false,
+  c[:session_store]       = 'cookie',
+  c[:session_id_key]      = '_session_id',
+  c[:session_secret_key]  = 'dd578852e40789695203305439f3ee2cf77b0cfc',
+  c[:exception_details]   = true,
+  c[:reload_classes]      = true,
+  c[:reload_time]         = 0.5
+}

data/examples/sequel_example/config/plugins.yml

@@ -0,0 +1,3 @@
+:merb_global:
+  :message_provider: sequel
+  :locales: ['en', 'pl']

data/examples/yaml_example/README.txt

@@ -0,0 +1,9 @@
+Merb Flat
+==============
+
+An example of a small Merb application. Uses a single views directory and one
+controller file.
+
+Start with
+
+  merb

data/examples/yaml_example/application.rb

@@ -0,0 +1,5 @@
+class YamlExample < Merb::Controller
+  def index
+    _('Hi! Hello world!')
+  end
+end

data/examples/yaml_example/config/framework.rb

@@ -0,0 +1,5 @@
+Merb::Config[:framework] = {
+  :application => 'application.rb',
+  :view => 'views',
+  :config => 'config'
+}

data/examples/yaml_example/config/init.rb

@@ -0,0 +1,24 @@
+# Load the merb_global from current tree
+Gem.clear_paths
+Gem.path.unshift((Pathname(__FILE__).dirname + '../../../pkg').expand_path)
+$LOAD_PATH.unshift((Pathname(__FILE__).dirname + '../../../lib').expand_path)
+
+Merb::Router.prepare do |r|
+  r.match('/').to(:controller => 'yaml_example', :action =>'index')
+  r.default_routes
+end
+
+dependency 'merb_global'
+
+Merb::Config.use { |c|
+  c[:environment]         = 'production',
+  c[:framework]           = {},
+  c[:log_level]           = 'debug',
+  c[:use_mutex]           = false,
+  c[:session_store]       = 'cookie',
+  c[:session_id_key]      = '_session_id',
+  c[:session_secret_key]  = 'ceb534866f8bb368f8e935b31604e45b818c6dd4',
+  c[:exception_details]   = true,
+  c[:reload_classes]      = true,
+  c[:reload_time]         = 0.5
+}

data/examples/yaml_example/config/plugins.yml

@@ -0,0 +1,4 @@
+:merb_global:
+  :message_provider: yaml
+  :flat: true
+  :locales: [en, pl]

data/examples/yaml_example/locale/en.yaml

@@ -0,0 +1,2 @@
+:plural: "n==1 ? 0 : 1"
+"Hi! Hello world!": "Hi! Hello world!"

data/examples/yaml_example/locale/pl.yaml

@@ -0,0 +1,2 @@
+:plural: "(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)"
+"Hi! Hello world!": "Cześć. Witaj świecie!"

data/lib/merb_global/controller.rb

@@ -13,34 +13,8 @@ module Merb
         Merb::Global::Locale.new(params[:locale]) ||
         (self._mg_locale &&
          Merb::Global::Locale.new(self.instance_eval(&self._mg_locale))) ||
-        begin
-          unless accept_language.nil?
-            accept_language = Merb::Global::Locale.parse(accept_language)
-            accept_language.collect! do |lang|
-              if lang.any?
-                lang
-              elsif Merb::Global::MessageProviders.provider.support? lang
-                lang
-              else
-                lang = lang.base_locale
-                if not lang.nil? and Merb::Global::MessageProviders.provider.support? lang
-                  lang
-                else
-                  nil
-                end
-              end
-            end
-            accept_language.reject! {|lang| lang.nil?}
-            unless accept_language.empty?
-              unless accept_language.last.any?
-                accept_language.last
-              else
-                accept_language.pop
-                Merb::Global::MessageProviders.provider.choose accept_language
-              end
-            end
-          end
-        end || Merb::Global::Locale.new('en')
+         Merb::Global::Locale.from_accept_language(accept_language) || 
+         Merb::Global::Locale.new('en')
     end
 
     # Sets the language of block.
@@ -48,7 +22,7 @@ module Merb
     # The block should return language or nil if other method should be used
     # to determine the language
     #
-    # Please note that this method is deprecated and the prefereed method is
+    # Please note that this method is deprecated and the preferred method is
     # locale.
     def self.language(&block)
       self._mg_locale = block

data/lib/merb_global/date_providers.rb

@@ -32,7 +32,7 @@ module Merb
     # Perform the registration
     #
     # ==== Parameters
-    # name<~to_sym>:: Name under which it is registred
+    # name<~to_sym>:: Name under which it is registered
     def self.DateProvider(provider_name)
       Module.new do
         @@rb_date_provider_name = provider_name

data/lib/merb_global/locale.rb

@@ -10,14 +10,14 @@ module Merb
   module Global
     class Locale
       attr_reader :language, :country
-      
+
       def initialize(name)
-        # TODO: Understend RFC 1766 fully
+        # TODO: Understand RFC 1766 fully
         @language, @country = name.split('-')
       end
 
       def any?
-        language == '*' && country.nil?\
+        language == '*' && country.nil?
       end
 
       def base_locale
@@ -35,6 +35,22 @@ module Merb
           "#{@language.downcase}_#{@country.upcase}"
         end
       end
+
+      if defined? RUBY_ENGINE and RUBY_ENGINE == "jruby"
+        def java_locale
+          require 'java'
+          @java_locale ||=
+            if @country.nil?
+              java.util.Locale.new(@language.downcase)
+            else
+              java.util.Locale.new(@language.downcase, @country.upcase)
+            end
+        end
+      else
+        def java_locale
+          nil
+        end
+      end
       
       def self.parse(header)
         header = header.split(',')
@@ -48,11 +64,26 @@ module Merb
             [lang[0], lang[1].to_f]
           end
         end
-        header.sort! {|lang_a, lang_b| lang_a[1] <=> lang_b[1]}
-        header.collect! {|lang| lang[0]}
-        return header.collect! {|lang| Locale.new(lang)}
+        header.sort! {|lang_a, lang_b| lang_b[1] <=> lang_a[1]} # sorting by decreasing quality
+        header.collect! {|lang| Locale.new(lang[0])}
       end
-      
+
+      def self.from_accept_language(accept_language)
+        unless accept_language.nil?
+          accept_language = Merb::Global::Locale.parse(accept_language)
+          accept_language.each_with_index do |lang, i|
+            if lang.any?
+              # In this case we need to choose a locale that is not in accept_language[i+1..-1]
+              return Merb::Global::Locale.choose(accept_language[i+1..-1])
+            elsif Merb::Global::Locale.support? lang
+              return lang
+            end
+            lang = lang.base_locale
+            return lang if lang && Merb::Global::Locale.support?(lang)
+          end
+        end
+      end
+
       def self.current
         Thread.current.mg_locale
       end
@@ -91,6 +122,18 @@ module Merb
           end
         end
       end
+
+      def self.support?(locale)
+        supported_locales.include? locale.to_s
+      end
+      
+      def self.supported_locales
+        Merb::Global::config('locales', ['en'])
+      end
+      
+      def self.choose(except)
+        new((supported_locales - except.map{|e| e.to_s}).first)
+      end
     end
   end
 end

data/lib/merb_global/message_providers.rb

@@ -7,7 +7,7 @@ module Merb
       # call-seq:
       #     localedir => localdir
       #
-      # Returns the directory where locales are stored for file-backended
+      # Returns the directory where locales are stored for file-backed
       # providers (such as gettext or yaml)
       #
       # ==== Returns
@@ -32,7 +32,7 @@ module Merb
         @@provider ||= self[Merb::Global.config(:message_provider, 'gettext')]
       end
       # Merb-global is able to store the translations in different types of
-      # storage. An interface betwean merb-global and those storages are
+      # storage. An interface between merb_global and those storages are
       # providers.
       #
       # Please note that it is not required to include this module - despite it
@@ -43,7 +43,7 @@ module Merb
         #     localize(singular, plural, opts) => translated
         #
         # Translate string using specific provider.
-        # It should be overloaded by the implementator.
+        # It should be overloaded by the implementor.
         #
         # Do not use this method directly - use Merb::Global._ instead
         #
@@ -61,26 +61,6 @@ module Merb
         def localize(singular, plural, n, locale)
           raise NoMethodError.new 'method localize has not been implemented'
         end
-        # call-seq:
-        #     support?(lang) => supported
-        #
-        # Checks if the language is supported (i.e. if the translation exists).
-        #
-        # In normal merb app the language is checked automatically in controller
-        # so probably you don't have to use this method
-        #
-        # ==== Parameters
-        # lang<String>:: A code of language
-        #
-        # ==== Returns
-        # supported<Boolean>:: Is a program translated to this language
-        #
-        # ==== Raises
-        # NoMethodError:: Raised by default implementation.
-        #                 Should not be thrown.
-        def support?(lang)
-          raise NoMethodError.new('method support? has not been implemented')
-        end
         # This method creates basic files and/or directory structures
         # (for example it adds migration) needed for provider to work.
         #
@@ -88,12 +68,6 @@ module Merb
         def create!
           raise NoMethodError.new('method create! has not been implemented')
         end
-        # This method choos an supported language except those form the list
-        # given. It may fallback to english if none language can be found
-        # which agree with those criteria
-        def choose(except)
-          raise NoMethodError.new('method choose has not been implemented')
-        end
         ##
         # Transfer data from importer into exporter
         #

data/lib/merb_global/message_providers/active_record.rb

@@ -1,8 +1,8 @@
 require 'activerecord'
-# As far as I understend we need it to have compostie keys
+# As far as I understand, we need it to have composite keys.
 # However it may be better idea to drop them.
-# As far I implement it in this way - then we will see
-require 'composite_primary_keys' # As far as I understend we need
+# So far I implement it in this way - then we will see
+require 'composite_primary_keys' # As far as I understand we need
 require 'merb_global/plural'
 
 module Merb
@@ -34,10 +34,6 @@ module Merb
           return n > 1 ? plural : singular # Fallback if not in database
         end
 
-        def support?(lang)
-          Language.count(:conditions => {:name => lang.to_s}) != 0
-        end
-
         def create!
           migration_exists = Dir[File.join(Merb.root, 'schema',
                                            'migrations', '*.rb')].detect do |f|
@@ -50,20 +46,6 @@ module Merb
           end
         end
 
-        def choose(except)
-          if except.empty?
-            Language.find(:first).name
-          else
-            except = except.collect {|locale| locale.to_s}
-            condition = 'name NOT IN (' + '?, ' * (except.length - 1) + '?)'
-            Language.find(:first, :conditions => [condition, *except]).name
-          end
-          # On #rubyonrails the following method was given. However I do not
-          # trust it. Please change if the validity is confirmed
-          # Language.find(:first, :conditions => ['name NOT IN ?',
-          #                                       "(#{except.join(',')})"])
-        end
-
         def import
           data = {}
           Language.transaction do

data/lib/merb_global/message_providers/data_mapper.rb

@@ -30,20 +30,11 @@ module Merb
           return n != 1 ? plural : singular
         end
 
-        def support?(lang)
-          not Language.first(:name => lang.to_s).nil?
-        end
-
         def create!
           Language.auto_migrate!
           Translation.auto_migrate!
         end
 
-        def choose(except)
-          except = except.collect {|locale| except.to_s}
-          Language.first(:name.not => except).name
-        end
-
         def import
           data = {}
           ::DataMapper::Transaction.new(Language, Translation) do

data/lib/merb_global/message_providers/gettext.rb

@@ -26,25 +26,10 @@ module Merb
           end
         end
 
-        def support?(lang)
-          lang = lang.to_s
-          lang == 'en' ||
-            File.exist?(File.join(Merb::Global::MessageProviders.localedir, lang))
-        end
-
         def create!
           File.mkdirs Merb::Global::MessageProviders.localedir
         end
 
-        def choose(except)
-          except = except.collect {|locale| locale.to_s}
-          dir = Dir[Merb::Global::MessageProviders.localedir + '/*/']
-          dir.collect! {|p| File.basename p}
-          dir << 'en'
-          dir.reject! {|lang| except.include? lang}
-          dir.first
-        end
-
         def import
           Treetop.load(Pathname(__FILE__).dirname.expand_path.to_s +
                        '/gettext')

data/lib/merb_global/message_providers/mock.rb

@@ -8,17 +8,9 @@ module Merb
           n > 1 ? plural : singular
         end
 
-        def support?(lang)
-          true
-        end
-
         def create!
           nil # It's mock after all ;)
         end
-
-        def choose(except)
-          'en'
-        end
       end
     end
   end

data/lib/merb_global/message_providers/sequel.rb

@@ -24,10 +24,6 @@ module Merb
           return n > 1 ? plural : singular # Fallback if not in database
         end
 
-        def support?(lang)
-          Language.filter(:name => lang.to_s).count != 0
-        end
-
         def create!
           migration_exists = Dir[File.join(Merb.root, 'schema',
                                            'migrations', "*.rb")].detect do |f|
@@ -40,15 +36,6 @@ module Merb
           end
         end
 
-        def choose(except)
-          if except.empty?
-            Language.first[:name]
-          else
-            except = except.collect {|locale| locale.to_s}
-            Language.filter(~{:name => except}).first[:name]
-          end
-        end
-
         def import
           data = {}
           DB.transaction do

data/lib/merb_global/message_providers/yaml.rb

@@ -48,27 +48,10 @@ module Merb
           return n > 1 ? plural : singular
         end
 
-        def support?(lang)
-          unless @lang.include? lang
-            file = File.join Merb::Global::MessageProviders.localedir,
-                             lang.to_s + '.yaml'
-            @lang[lang] = YAML.load_file file if File.exist? file
-          end
-          not @lang[lang].nil?
-        end
-
         def create!
           FileUtils.mkdir_p Merb::Global::MessageProviders.localedir
         end
 
-        def choose(except)
-          except = except.collect {|locale| locale.to_s}
-          dir = Dir[Merb::Global::MessageProviders.localedir + '/*.yaml']
-          dir.collect! {|p| File.basename p, '.yaml'}
-          dir.reject! {|lang| except.include? lang}
-          dir.first
-        end
-
         def import
           data = {}
           Dir[Merb::Global::MessageProviders.localedir +

data/lib/merb_global/numeric_providers/java.rb

@@ -0,0 +1,15 @@
+require 'java'
+
+module Merb
+  module Global
+    module NumericProviders
+      class Java
+        include Merb::Global::DateProviders::Base
+
+        def localize(locale, number)
+          java.text.NumberFormat.instance(locale).format(number)
+        end
+      end
+    end
+  end
+end

data/lib/merb_global/providers.rb

@@ -20,7 +20,7 @@ module Merb
                   @@providers_classes[provider.to_sym].new
               else
                 require "merb_global/#{self.name.split("::").last.snake_case}/#{provider.to_s}"
-                @@providers[provider.to_sym] = eval "#{self.name}::#{provider.camel_case}.new"
+                @@providers[provider.to_sym] = self.const_get(provider.camel_case).new
               end
             end
             @@providers[provider.to_sym]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_global
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Alex Coles
@@ -10,7 +10,7 @@ autorequire: merb_global
 bindir: bin
 cert_chain: []
 
-date: 2008-11-06 00:00:00 +01:00
+date: 2009-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
         version: 1.2.3
     version: 
 description: Localization (L10n) and Internationalization (i18n) support for the Merb MVC Framework
-email: alex@alexcolesportfolio.com
+email: merb_global@googlegroups.com
 executables: []
 
 extensions: []
@@ -72,6 +72,7 @@ files:
 - lib/merb_global/base.rb
 - lib/merb_global/numeric_providers
 - lib/merb_global/numeric_providers/fork.rb
+- lib/merb_global/numeric_providers/java.rb
 - lib/merb_global/merbrake.rb
 - lib/merb_global/date_providers.rb
 - lib/merb_global.rb
@@ -85,6 +86,71 @@ files:
 - activerecord_generators/translations_migration/translations_migration_generator.rb
 - activerecord_generators/translations_migration/templates
 - activerecord_generators/translations_migration/templates/translations_migration.erb
+- examples/mock_example
+- examples/mock_example/config
+- examples/mock_example/config/plugins.yml
+- examples/mock_example/config/framework.rb
+- examples/mock_example/config/init.rb
+- examples/mock_example/README.txt
+- examples/mock_example/application.rb
+- examples/data_mapper_example
+- examples/data_mapper_example/log
+- examples/data_mapper_example/log/dm.log
+- examples/data_mapper_example/log/merb.4000.pid
+- examples/data_mapper_example/database.db
+- examples/data_mapper_example/config
+- examples/data_mapper_example/config/plugins.yml
+- examples/data_mapper_example/config/framework.rb
+- examples/data_mapper_example/config/database.yml
+- examples/data_mapper_example/config/init.rb
+- examples/data_mapper_example/README.txt
+- examples/data_mapper_example/application.rb
+- examples/database.db
+- examples/gettext_example
+- examples/gettext_example/config
+- examples/gettext_example/config/plugins.yml
+- examples/gettext_example/config/framework.rb
+- examples/gettext_example/config/init.rb
+- examples/gettext_example/locale
+- examples/gettext_example/locale/pl
+- examples/gettext_example/locale/pl/LC_MESSAGES
+- examples/gettext_example/locale/pl/LC_MESSAGES/merbapp.mo
+- examples/gettext_example/locale/pl.po
+- examples/gettext_example/locale/merbapp.pot
+- examples/gettext_example/README.txt
+- examples/gettext_example/application.rb
+- examples/active_record_example
+- examples/active_record_example/log
+- examples/active_record_example/log/merb.main.log
+- examples/active_record_example/log/merb.4000.pid
+- examples/active_record_example/database.db
+- examples/active_record_example/config
+- examples/active_record_example/config/plugins.yml
+- examples/active_record_example/config/framework.rb
+- examples/active_record_example/config/database.yml
+- examples/active_record_example/config/init.rb
+- examples/active_record_example/README.txt
+- examples/active_record_example/application.rb
+- examples/database.sql
+- examples/yaml_example
+- examples/yaml_example/config
+- examples/yaml_example/config/plugins.yml
+- examples/yaml_example/config/framework.rb
+- examples/yaml_example/config/init.rb
+- examples/yaml_example/locale
+- examples/yaml_example/locale/en.yaml
+- examples/yaml_example/locale/pl.yaml
+- examples/yaml_example/README.txt
+- examples/yaml_example/application.rb
+- examples/sequel_example
+- examples/sequel_example/database.db
+- examples/sequel_example/config
+- examples/sequel_example/config/plugins.yml
+- examples/sequel_example/config/framework.rb
+- examples/sequel_example/config/database.yml
+- examples/sequel_example/config/init.rb
+- examples/sequel_example/README.txt
+- examples/sequel_example/application.rb
 has_rdoc: true
 homepage: http://trac.ikonoklastik.com/merb_global/
 post_install_message: 
@@ -107,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb-global
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Localization (L10n) and Internationalization (i18n) support for the Merb MVC Framework