merb_global 0.0.4.2 → 0.0.5

data/lib/merb_global/providers.rb

@@ -1,51 +1,39 @@
 module Merb
   module Global
     module Providers
-      @@providers = {}
-      ##
-      # Creates a provider and/or returns already created one
-      #
-      # ==== Parames
-      # provider<~to_s,~to_sym>:: A name of provider
-      # 
-      # ==== Returns
-      # provider<Provider>:: A new provider
-      def self.[](provider)
-        unless @@providers.include? provider.to_sym
-          require 'merb_global/providers/' + provider
-          klass = "Merb::Global::Providers::#{provider.camel_case}"
-          @@providers[provider.to_sym] = eval "#{klass}.new"
-        end
-        @@providers[provider.to_sym]
-      end
-
-      # call-seq:
-      #     localedir => localdir
-      #
-      # Returns the directory where locales are stored for file-backended
-      # providers (such as gettext or yaml)
-      #
-      # ==== Returns
-      # localedir<String>>:: Directory where the locales are stored
-      def self.localedir
-        localedir =
-          if Merb::Global.config :flat
-            'locale'
-          else
-            Merb::Global.config :localedir, File.join('app', 'locale')
+      def self.included(mod) #:nodoc:
+        mod.module_eval do
+          @@providers = {}
+          @@providers_classes = {}
+          ##
+          # Creates a provider and/or returns already created one
+          #
+          # ==== Parames
+          # provider<~to_s,~to_sym>:: A name of provider
+          #
+          # ==== Returns
+          # provider<Provider>:: A new provider
+          def self.[](provider)
+            unless @@providers.include? provider.to_sym
+              if @@providers_classes[provider.to_sym]
+                @@providers[provider.to_sym] =
+                  @@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"
+              end
+            end
+            @@providers[provider.to_sym]
           end
-        File.join Merb.root, localedir
-      end
-
-      # call-seq:
-      #     provider => provider
-      #
-      # Returns the provider of required type
-      #
-      # ==== Returns
-      # provider<Provider>:: Returns provider
-      def self.provider
-        @@provider ||= self[Merb::Global.config(:provider, 'gettext')]
+          # Registers the class under the given name
+          # 
+          # ==== Parameters
+          # name<~to_sym>:: Name under which it is registered
+          # klass<Class>:: Class of the provider
+          def self.register(name, klass)
+            @@providers_classes[name.to_sym] = klass
+          end
+        end
       end
     end
   end

data/sequel_generators/translations_migration/templates/translations_migration.erb

@@ -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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_global
 version: !ruby/object:Gem::Version 
-  version: 0.0.4.2
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alex Coles
@@ -10,11 +10,12 @@ autorequire: merb_global
 bindir: bin
 cert_chain: []
 
-date: 2008-06-24 00:00:00 +02:00
+date: 2008-07-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -24,6 +25,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: treetop
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -49,23 +51,28 @@ files:
 - TODO
 - HISTORY
 - lib/merb_global
+- lib/merb_global/message_providers
+- lib/merb_global/message_providers/yaml.rb
+- lib/merb_global/message_providers/sequel.rb
+- lib/merb_global/message_providers/gettext.rb
+- lib/merb_global/message_providers/data_mapper.rb
+- lib/merb_global/message_providers/mock.rb
+- lib/merb_global/message_providers/active_record.rb
+- lib/merb_global/message_providers/gettext.treetop
+- lib/merb_global/message_providers.rb
 - lib/merb_global/plural.rb
 - lib/merb_global/providers.rb
-- lib/merb_global/provider.rb
 - lib/merb_global/plural.treetop
+- lib/merb_global/numeric_providers.rb
 - lib/merb_global/config.rb
+- lib/merb_global/date_providers
+- lib/merb_global/date_providers/fork.rb
 - lib/merb_global/controller.rb
-- lib/merb_global/transfer.rb
 - lib/merb_global/base.rb
+- lib/merb_global/numeric_providers
+- lib/merb_global/numeric_providers/fork.rb
 - lib/merb_global/merbrake.rb
-- lib/merb_global/providers
-- lib/merb_global/providers/yaml.rb
-- lib/merb_global/providers/sequel.rb
-- lib/merb_global/providers/gettext.rb
-- lib/merb_global/providers/data_mapper.rb
-- lib/merb_global/providers/mock.rb
-- lib/merb_global/providers/active_record.rb
-- lib/merb_global/providers/gettext.treetop
+- lib/merb_global/date_providers.rb
 - lib/merb_global.rb
 - sequel_generators/translations_migration
 - sequel_generators/translations_migration/USAGE
@@ -98,8 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.1.1
+rubyforge_project: merb-global
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Localization (L10n) and Internationalization (i18n) support for the Merb MVC Framework

data/lib/merb_global/provider.rb

@@ -1,73 +0,0 @@
-module Merb
-  module Global
-    # Merb-global is able to store the translations in different types of
-    # storage. An interface betwean merb-global and those storages are
-    # providers.
-    # 
-    # Please note that it is not required to include this module - despite it
-    # is recomended both as a documentation part and the more customized 
-    # error messages.
-    module Provider
-      # call-seq:
-      #     translate_to(singular, plural, opts) => translated
-      #
-      # Translate string using specific provider.
-      # It should be overloaded by the implementator.
-      #
-      # Do not use this method directly - use Merb::Global._ instead
-      #
-      # ==== Parameters
-      # singular<String>:: A string to translate
-      # plural<String>:: A plural form of string (nil if only singular)
-      # opts<Hash>:: An options hash (see below)
-      #
-      # ==== Options (opts)
-      # :lang<String>:: A language to translate on
-      # :n<Fixnum>:: A number of objects
-      #
-      # ==== Returns
-      # translated<String>:: A translated string
-      #
-      # ==== Raises
-      # NoMethodError:: Raised by default implementation. Should not be thrown.
-      def translate_to(singular, plural, opts)
-        raise NoMethodError.new('method translate_to 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.
-      #
-      # It is called from Rakefile.
-      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
-    end
-  end
-end

data/lib/merb_global/providers/gettext.rb

@@ -1,90 +0,0 @@
-require 'gettext'
-require 'treetop'
-require 'pathname'
-
-# I'm not sure if it is the correct way of doing it.
-# As far it seems to be simpler.
-class Thread #:nodoc:
-  def gettext_context
-    @gettext_context ||= Merb::Global::Providers::Gettext::GettextContext.new
-  end
-end
-
-module Merb
-  module Global
-    module Providers
-      class Gettext #:nodoc: all
-        include Merb::Global::Provider
-        include Merb::Global::Provider::Importer
-        
-        def translate_to(singular, plural, opts)
-          context = Thread.current.gettext_context
-          context.set_locale opts[:lang], true
-          unless plural.nil?
-            context.ngettext singular, plural, opts[:n]
-          else
-            context.gettext singular
-          end
-        end
-
-        def support?(lang)
-          lang == 'en' ||
-            File.exist?(File.join(Merb::Global::Providers.localedir, lang))
-        end
-
-        def create!
-          File.mkdirs Merb::Global::Providers.localedir
-        end
-
-        def choose(except)
-          dir = Dir[Merb::Global::Providers.localedir + '/*/']
-          dir.collect! {|p| File.basename p}
-          dir << 'en'
-          dir.reject! {|lang| except.include? lang}
-          dir.first
-        end
-
-        def import(exporter, export_data)
-          Treetop.load(Pathname(__FILE__).dirname.expand_path.to_s +
-                       '/gettext')
-          parser = Merb::Global::Providers::GetTextParser.new
-          Dir[Merb::Global::Providers.localedir + '/*.po'].each do |file|
-            lang_name = File.basename file, '.po'
-            lang_tree = nil
-            open file do |data|
-              lang_tree = parser.parse data.read
-            end
-            opts = (lang_tree.to_hash)[''].split("\n")
-            plural_line = nil
-            for l in opts
-              if l[0..."Plural-Forms:".length] == "Plural-Forms:"
-                plural_line = l
-                break
-              end
-            end
-            plural_line =
-              plural_line["Plural-Forms:".length...plural_line.length]
-            plural_line = plural_line[0...plural_line.length-1]
-            plural_line = plural_line.gsub(/[[:space:]]/, '').split(/[=;]/, 4)
-            plural_line = Hash[*plural_line]
-            exporter.export_language export_data, lang_name,
-                                     plural_line['nplurals'].to_i,
-                                     plural_line['plural'] do |lang_data|
-              lang_tree.visit do |msgid, msgid_plural, msgstr, index|
-                exporter.export_string lang_data, msgid, msgid_plural,
-                                                  index, msgstr
-              end
-            end
-          end
-        end
-
-        class GettextContext
-          include ::GetText
-          bindtextdomain Merb::Global.config([:gettext, :domain], 'merbapp'),
-                         Merb::Global::Providers.localedir
-          public :set_locale, :ngettext, :gettext
-        end
-      end
-    end
-  end
-end

data/lib/merb_global/providers/gettext.treetop

@@ -1,74 +0,0 @@
-module Merb
-  module Global
-    module Providers
-      grammar GetText
-        rule po_file
-	  entry* {
-	    def to_hash
-              hash = {}
-	      elements.each {|entry| hash.merge! entry.to_hash}
-	      hash
-	    end
-	    def visit &block
-	      elements.each {|elem| elem.visit &block}
-	    end
-	  }
-	end
-
-        rule entry
-	  whitespaces*
-          "msgid" whitespaces msgid:strings
-          "msgstr" whitespaces msgstr:strings {
-            def to_hash
-	      {msgid.to_string => msgstr.to_string}
-	    end
-	    def visit &block
-	      unless msgid.to_string.empty? or msgstr.to_string.empty?
-		yield msgid.to_string, nil, msgstr.to_string, nil
-	      end
-	    end
-	  }
-	  /
-	  whitespaces*
-	  "msgid" whitespaces msgid:strings
-	  "msgid_plural" whitespaces msgid_plural:strings
-	  msgstrs:("msgstr[" number:[0-9]+ "]" whitespaces strings)+ {
-	    def to_hash
-	      hash = {:plural => msgid_plural.to_string}
-	      msgstrs.elements.each do |msgstr|
-		hash[msgstr.number.text_value.to_i] = msgstr.strings.to_string
-	      end
-	      {msgid.to_string => hash}
-	    end
-	    def visit &block
-	      msgstrs.elements.each do |msgstr|
-		yield msgid.to_string, msgid_plural.to_string,
-                      msgstr.strings.to_string, msgstr.number.text_value.to_i
-              end
-	    end
-	  }
-	end
-
-	rule strings
-	  (string whitespaces?)+ {
-	    def to_string
-	      elements.collect {|element| element.string.to_string}.join
-	    end
-	  }
-	end
-
-	rule string
-	  '"' content:((!'"' ('\"' / .))*) '"' {
-	    def to_string
-	      content.text_value.gsub(/\\n/, "\n")
-	    end
-	  }
-	end
-
-        rule whitespaces
-          (" " / "\t" / "\n" / ('#' (!"\n" .)* "\n") )+
-        end
-      end
-    end
-  end
-end

data/lib/merb_global/providers/sequel.rb

@@ -1,100 +0,0 @@
-require 'sequel'
-require 'merb_global/plural'
-
-module Merb
-  module Global
-    module Providers
-      class Sequel #:nodoc: all
-        include Merb::Global::Provider
-        include Merb::Global::Provider::Importer
-        include Merb::Global::Provider::Exporter
-
-        def translate_to(singular, plural, opts)
-          language = Language[:name => opts[:lang]] # I hope it's from MemCache
-          unless language.nil?
-            unless plural.nil?
-              n = Plural.which_form opts[:n], language[:plural]
-              translation = Translation[language.pk, singular, n]
-            else
-              translation = Translation[language.pk, singular, nil]
-            end
-            return translation[:msgstr] unless translation.nil?
-          end
-          return opts[:n] > 1 ? plural : singular # Fallback if not in database
-        end
-
-        def support?(lang)
-          Language.filter(:name => lang).count != 0
-        end
-
-        def create!
-          migration_exists = Dir[File.join(Merb.root, 'schema',
-                                           'migrations', "*.rb")].detect do |f|
-            f =~ /translations\.rb/
-          end
-          if migration_exists
-            puts "\nThe Translation Migration File already exists\n\n"
-          else
-            sh %{merb-gen translations_migration}
-          end
-        end
-
-        def choose(except)
-          Language.filter(~{:name => except}).first[:name]
-        end
-
-        def import(exporter, export_data)
-          DB.transaction do
-            Language.each do |language|
-              exporter.export_language export_data, language[:name],
-                                                    language[:nplural],
-                                                    language[:plural] do |lang|
-                language.translations.each do |translation|
-                  exporter.export_string lang,
-                                         translation[:msgid],
-                                         translation[:msgid_plural],
-                                         translation[:msgstr_index],
-                                         translation[:msgstr]
-                end
-              end
-            end
-          end
-        end
-
-        def export
-          DB.transaction do
-            Language.delete_all
-            Translation.delete_all
-            yield nil
-          end
-        end
-
-        def export_language(export_data, language, nplural, plural)
-          lang = Language.create :name => language, :nplural => nplural,
-                                                     :plural => plural
-          raise unless lang
-          yield lang
-        end
-
-        def export_string(language_id, msgid, msgid_plural,
-                                       msgstr, msgstr_index)
-          Translation.create(:language_id => language_id,
-                             :msgid => msgid,
-                             :msgid_plural => msgid_plural,
-                             :msgstr => msgstr,
-                             :msgstr_index => msgstr_index) or raise
-        end
-
-        class Language < ::Sequel::Model(:merb_global_languages)
-          has_many :translations,
-                   :class => "Merb::Global::Providers::Sequel::Translation",
-                   :key => :language_id
-        end
-
-        class Translation < ::Sequel::Model(:merb_global_translations)
-          set_primary_key :language_id, :msgid, :msgstr_index
-        end
-      end
-    end
-  end
-end

data/lib/merb_global/providers/yaml.rb

@@ -1,114 +0,0 @@
-require 'yaml'
-require 'fileutils'
-
-module Merb
-  module Global
-    module Providers
-      class Yaml #:nodoc:
-        include Merb::Global::Provider
-        include Merb::Global::Provider::Importer
-        include Merb::Global::Provider::Exporter
-        
-        def initialize
-          # 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
-        end
-
-        def translate_to(singular, plural, opts)
-          unless @lang.include? opts[:lang]
-            file = File.join Merb::Global::Providers.localedir,
-                             opts[:lang] + '.yaml'
-            if File.exist? file
-              @lang[opts[:lang]] = YAML.load_file file
-            else
-              @lang[opts[:lang]] = nil
-            end
-          end
-
-          unless @lang[opts[:lang]].nil?
-            lang = @lang[opts[:lang]]
-            unless lang[singular].nil?
-              unless plural.nil?
-                n = Merb::Global::Plural.which_form opts[:n], lang[:plural]
-                return lang[singular][n] unless lang[singular][n].nil?
-              else
-                return lang[singular] unless lang[singular].nil?
-              end
-            end
-          end
-          return opts[:n] > 1 ? plural : singular
-        end
-
-        def support?(lang)
-          unless @lang.include? lang
-            file = File.join Merb::Global::Providers.localedir, lang + '.yaml'
-            @lang[lang] = YAML.load_file file if File.exist? file
-          end
-          not @lang[lang].nil?
-        end
-
-        def create!
-          FileUtils.mkdir_p Merb::Global::Providers.localedir
-        end
-
-        def choose(except)
-          dir = Dir[Merb::Global::Providers.localedir + '/*.yaml']
-          dir.collect! {|p| File.basename p, '.yaml'}
-          dir.reject! {|lang| except.include? lang}
-          dir.first
-        end
-
-        def import(exporter, export_data)
-          Dir[Merb::Global::Providers.localedir + '/*.yaml'].each do |file|
-            lang_name = File.basename file, '.yaml'
-            lang = YAML.load_file file
-            exporter.export_language export_data,
-                                     lang_name,
-                                     lang[:nplural],
-                                     lang[:plural] do |lang_data|
-              lang.each do |msgid, msgstr|
-                if msgid.is_a? String
-                  if msgstr.is_a? Hash
-                    msgid_plural = msgstr[:plural]
-                    msgstr.each do |msgstr_index, msgstr|
-                      if msgstr_index.is_a? Fixnum
-                        exporter.export_string lang_data, msgid, msgid_plural,
-                                                          msgstr_index, msgstr
-                      end
-                    end
-                  else
-                    exporter.export_string lang_data, msgid, nil, nil, msgstr
-                  end
-                end
-              end
-            end
-          end
-        end
-
-        def export
-          yield nil
-        end
-
-        def export_language(export_data, language, nplural, plural)
-          lang = {:nplural => nplural, :plural => plural}
-          yield lang
-          file = "#{Merb::Global::Providers.localedir}/#{language}.yaml"
-          open file, 'w+' do |out|
-            YAML.dump lang, out
-          end 
-        end
-
-        def export_string(language, msgid, msgstr, msgstr_index)
-          if no.nil?
-            language[msgid] = msgstr
-          else
-            language[msgid] ||= {}
-            language[msgid][no] = msgstr
-          end
-        end
-      end
-    end
-  end
-end