@@ -1,4 +1,4 @@ = merb_global == Localization (L10n) and Internationalization (i18n) support for the Merb MVC Framework -Please see README.markdown. \ No newline at end of file +Please see README.markdown. README @@ -27,7 +27,7 @@ spec = Gem::Specification.new do |s| s.autorequire = PLUGIN s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,*_generators}/**/*") - + # rdoc s.has_rdoc = true s.extra_rdoc_files = %w( README LICENSE TODO ) Rakefile @@ -1,3 +1,3 @@ = TODO -This list will be added shortly. The list of things to do is long. \ No newline at end of file +This list will be added shortly. The list of things to do is long. TODO @@ -18,4 +18,4 @@ class AddTranslationsMigration < Sequel::Migration def down drop_table :merb_global_languages, :merb_global_translations end -end \ No newline at end of file +end activerecord_generators/translations_migration/templates/translations_migration.erb @@ -24,7 +24,7 @@ module Merb # ==== Options (opts) # :lang<String>:: A language to translate on # :n<Fixnum>:: A number of objects - # + # # ==== Returns # translated<String>:: A translated string # lib/merb_global/base.rb @@ -29,27 +29,27 @@ module Merb def translate_to(singular, plural, opts) raise NoMethodError.new('method translate_to has not been implemented') end - - # call-seq: + + # 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 + # 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. # lib/merb_global/provider.rb @@ -5,7 +5,7 @@ module Merb module Providers class Yaml < Merb::Global::Provider #:nodoc: def initialize - # Not synchronized - make GC do it's work (may be not optimal + # Not synchronized - make GC do it's work (may be not optimal # but I don't think that some problem will occure). # Shouldn't it be sort of cache with some expiration limit? @lang = Hash.new lib/merb_global/providers/yaml.rb @@ -15,4 +15,4 @@ class AddTranslationsMigration < Sequel::Migration def down drop_table :merb_global_languages, :merb_global_translations end -end \ No newline at end of file +end sequel_generators/translations_migration/templates/translations_migration.erb @@ -40,4 +40,3 @@ describe Merb::Controller do controller.lang.should == 'it' end end - spec/controller_spec.rb @@ -30,7 +30,7 @@ describe Merb::Global::Providers::Yaml do YAML.expects(:load_file).with(yaml_file).returns(nil) @provider.translate_to "test", "tests", :lang => 'en', :n => 1 end - it 'should mark nil if file do not exists' do + it 'should mark nil if file do not exists' do yaml_file = File.join Merb.root, 'app', 'locale', 'en.yaml' File.expects(:exist?).with(yaml_file).returns(false) @provider.translate_to "test", "tests", :lang => 'en', :n => 1 spec/providers/yaml_spec.rb @@ -3,8 +3,9 @@ require 'merb-core' Merb::Plugins.config[:merb_global] = {:provider=> 'mock'} -require 'merb_global' +require 'pathname' require 'spec' +require Pathname(__FILE__).dirname.parent.expand_path + 'lib/merb_global' Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test') spec/spec_helper.rb 4fe17556e9bb1d2bc16ad2f67c5d2a7c4570ca4e Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_global/commit/6b8b420365a465097c68586cb7af056ff9661c8a 6b8b420365a465097c68586cb7af056ff9661c8a 2008-05-12T16:50:54-07:00 2008-05-12T16:50:54-07:00 Updated spec_helper.rb so that merb_global is local version. * Whitespace cleanup. 53f0b04b81f88e3791c7c9499bfe85a9d54bab4a Alex Coles alexbcoles@mac.com