lib/merb_global/message_providers.rb lib/merb_global/message_providers/active_record.rb lib/merb_global/message_providers/data_mapper.rb lib/merb_global/message_providers/gettext.rb lib/merb_global/message_providers/gettext.treetop lib/merb_global/message_providers/mock.rb lib/merb_global/message_providers/sequel.rb lib/merb_global/message_providers/yaml.rb spec/message_providers/active_record_spec.rb spec/message_providers/data_mapper_spec.rb spec/message_providers/gettext_spec.rb spec/message_providers/mock_spec.rb spec/message_providers/sequel_spec.rb spec/message_providers/yaml_spec.rb spec/message_providers_spec.rb @@ -1,5 +1,5 @@ #<% if false %> -class Merb::Global::Providers::ActiveRecord +class Merb::Global::MessageProviders::ActiveRecord #<% end %> class AddTranslationsMigration < ActiveRecord::Migration def self.up activerecord_generators/translations_migration/templates/translations_migration.erb @@ -1,6 +1,6 @@ require 'merb_global/config' require 'merb_global/plural' -require 'merb_global/providers' +require 'merb_global/message_providers' module Merb module Global @@ -10,8 +10,8 @@ module Merb @lang ||= 'en' end - def provider #:nodoc: - @provider ||= Merb::Global::Providers.provider + def message_provider #:nodoc: + @provider ||= Merb::Global::MessageProviders.provider end # call-seq: lib/merb_global/base.rb @@ -9,7 +9,7 @@ namespace :merb_global do desc 'Create migration' task :migration => :merb_start do - Merb::Global::Providers.provider.create! + Merb::Global::MessageProviders.provider.create! end desc 'Transfer the translations from one provider to another' @@ -17,9 +17,9 @@ namespace :merb_global do from = Merb::Global.config 'source', 'gettext' into = Merb::Global.config 'provider', 'gettext' if from == 'gettext' and into == 'gettext' - Dir[Merb::Global::Providers.localedir + '/*.po'].each do |file| + Dir[Merb::Global::MessageProviders.localedir + '/*.po'].each do |file| lang = File.basename file, '.po' - lang_dir = File.join(Merb::Global::Providers.localedir, + lang_dir = File.join(Merb::Global::MessageProviders.localedir, lang, 'LC_MESSAGES') FileUtils.mkdir_p lang_dir domain = Merb::Global.config([:gettext, :domain], 'merbapp') @@ -28,8 +28,8 @@ namespace :merb_global do elsif from == into Merb.logger.error 'Tried transfer from and into the same provider' else - from = Merb::Global::Providers[from] - into = Merb::Global::Providers[into] + from = Merb::Global::MessageProviders[from] + into = Merb::Global::MessageProviders[into] Merb::Global::Provider.transfer from, into end end lib/merb_global/merbrake.rb @@ -1,6 +1,6 @@ #<% if false %> # This is quick hack to avoid naming confict in specs -class Merb::Global::Providers::Sequel +class Merb::Global::MessageProviders::Sequel #<% end %> class AddTranslationsMigration < Sequel::Migration def up sequel_generators/translations_migration/templates/translations_migration.erb @@ -20,7 +20,7 @@ describe Merb::Global do describe '.provider' do it 'should return the default provider' do provider = mock 'provider' - Merb::Global::Providers.expects(:provider).returns(provider) + Merb::Global::MessageProviders.expects(:provider).returns(provider) TestBase.new.provider.should == provider end end spec/base_spec.rb lib/merb_global/providers.rb lib/merb_global/providers/active_record.rb lib/merb_global/providers/data_mapper.rb lib/merb_global/providers/gettext.rb lib/merb_global/providers/gettext.treetop lib/merb_global/providers/mock.rb lib/merb_global/providers/sequel.rb lib/merb_global/providers/yaml.rb spec/providers/active_record_spec.rb spec/providers/data_mapper_spec.rb spec/providers/gettext_spec.rb spec/providers/mock_spec.rb spec/providers/sequel_spec.rb spec/providers/yaml_spec.rb spec/providers_spec.rb b29c9eac5bb6f0abf20c0b02ebcaecf06852a50c Maciej Piechotka uzytkownik2@gmail.com http://github.com/myabc/merb_global/commit/650e34abcdb6ffc441084ee7a77b7d119998cbf5 650e34abcdb6ffc441084ee7a77b7d119998cbf5 2008-07-04T16:55:11-07:00 2008-07-04T13:00:41-07:00 Renamed MessageProviders and fix of comas 703c29cdb117f55fa80255881b9c9cf33898f502 Maciej Piechotka uzytkownik2@gmail.com