merb_global 0.0.3.1 → 0.0.4

data/HISTORY

@@ -1,3 +1,7 @@
+=== 0.0.4
+ * Changed database format (to allow importing/exporting)
+ * Added importing/exporting (EXPERIMENTAL)
+
 === 0.0.3
  * New Plural engine
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'spec/rake/spectask'
 
 PLUGIN = "merb_global"
 NAME = "merb_global"
-GEM_VERSION = "0.0.3.1"
+GEM_VERSION = "0.0.4"
 AUTHORS = ["Alex Coles", "Maciej Piechotka"]
 EMAIL = "alex@alexcolesportfolio.com"
 HOMEPAGE = "http://trac.ikonoklastik.com/merb_global/"
@@ -42,7 +42,7 @@ end
 
 desc "Install merb_global"
 task :install => [:package] do
-  sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION}}
+  sh %{#{SUDO} gem install pkg/#{NAME}-#{GEM_VERSION}}
 end
 
 Rake::RDocTask.new do |rd|

data/activerecord_generators/translations_migration/templates/translations_migration.erb

@@ -5,6 +5,7 @@ class AddTranslationsMigration < ActiveRecord::Migration
   def self.up
     create_table :merb_global_languages do |t|
       t.string	  :name,         :limit => 16
+      t.integer	  :nplural
       t.string    :plural,       :size => 128
     end
     add_index :merb_global_languages, :name, :unique => true
@@ -13,9 +14,10 @@ class AddTranslationsMigration < ActiveRecord::Migration
                                                 :msgid_hash,
                                                 :msgstr_index] do |t|
       t.integer   :language_id,  :null => false
-      t.integer   :msgid_hash,   :null => false
+      t.text      :msgid,        :null => false
+      t.text      :msgid_plural
       t.text	  :msgstr,	 :null => false
-      t.integer   :msgstr_index, :null => false
+      t.integer   :msgstr_index, :null => true
     end
   end
   def self.down

data/lib/merb_global.rb

@@ -4,5 +4,5 @@ if defined? Merb::Plugins
   require Pathname(__FILE__).dirname.expand_path + 'merb_global/base'
   require Pathname(__FILE__).dirname.expand_path + 'merb_global/controller'
 
-  Merb::Plugins.add_rakefiles 'merb_global/rake'
+  Merb::Plugins.add_rakefiles(Pathname(__FILE__).dirname.expand_path + 'merb_global/merbrake')
 end

data/lib/merb_global/base.rb

@@ -2,6 +2,7 @@ require 'merb_global/config'
 require 'merb_global/plural'
 require 'merb_global/provider'
 require 'merb_global/providers'
+require 'merb_global/transfer'
 
 module Merb
   module Global

data/lib/merb_global/merbrake.rb

@@ -7,4 +7,18 @@ namespace :merb_global do
   task :migration => :merb_start do
     Merb::Global::Providers.provider.create!
   end
+  desc 'Transfer the translations from one provider to another'
+  task :transfer => :merb_start do
+    from = Merb::Global.config 'source', 'gettext'
+    into = Merb::Global.config 'provider', 'gettext'
+    if from == 'gettext' and into == 'gettext'
+      # Change po into mo files
+    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]
+      Merb::Global::Provider.transfer from, into
+    end
+  end
 end

data/lib/merb_global/provider.rb

@@ -3,7 +3,11 @@ module Merb
     # Merb-global is able to store the translations in different types of
     # storage. An interface betwean merb-global and those storages are
     # providers.
-    class Provider
+    # 
+    # 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
       #

data/lib/merb_global/providers.rb

@@ -1,12 +1,22 @@
 module Merb
   module Global
     module Providers
-      @@provider_name = lambda do
-          Merb::Global.config :provider, 'gettext'
+      @@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
-      @@provider_loading = lambda do |provider|
-        require 'merb_global/providers/' + provider
-        @@provider = eval "Merb::Global::Providers::#{provider.camel_case}.new"
+        @@providers[provider.to_sym]
       end
 
       # call-seq:
@@ -35,7 +45,7 @@ module Merb
       # ==== Returns
       # provider<Provider>:: Returns provider
       def self.provider
-        @@provider ||= @@provider_loading.call @@provider_name.call
+        @@provider ||= self[Merb::Global.config(:provider, 'gettext')]
       end
     end
   end

data/lib/merb_global/providers/active_record.rb

@@ -8,13 +8,21 @@ require 'merb_global/plural'
 module Merb
   module Global
     module Providers
-      class ActiveRecord < Merb::Global::Provider #:nodoc: all
+      class ActiveRecord #:nodoc: all
+        include Merb::Global::Provider
+        include Merb::Global::Provider::Importer
+        include Merb::Global::Provider::Exporter
+        
         def translate_to(singular, plural, opts)
           language = Language.find :first,
                                    :conditions => {:name => opts[:lang]}
           unless language.nil?
-            n = Plural.which_form opts[:n], language.plural
-            translation = Translation.find [language.id, singular.hash, n]
+            unless plural.nil?
+              n = Plural.which_form opts[:n], language.plural
+              translation = Translation.find [language.id, singular, n]
+            else
+              translation = Translation.find [language.id, singular, nil]
+            end  
             return translation.msgstr
           end rescue nil
           return opts[:n] > 1 ? plural : singular # Fallback if not in database
@@ -49,13 +57,59 @@ module Merb
           #                                       "(#{except.join(',')})"])
         end
 
+        def import(exporter, export_data)
+          Language.transaction do
+            Translation.transaction do
+              Language.find(:all).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
+        end
+
+        def export
+          Language.transaction do
+            Translation.transaction do
+              Language.delete_all
+              Translation.delete_all
+              yield nil
+            end
+          end
+        end
+
+        def export_language(export_data, language, nplural, plural)
+          yield Language.create!(:language => language, :nplural => nplural,
+                                 :plural => plural).id
+        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
+        end
+
         class Language < ::ActiveRecord::Base
           set_table_name :merb_global_languages
+          has_many :translations,
+            :class_name =>
+              "::Merb::Global::Providers::ActiveRecord::Translation"
         end
 
         class Translation < ::ActiveRecord::Base
           set_table_name :merb_global_translations
-          set_primary_keys :language_id, :msgid_hash, :msgstr_index
+          set_primary_keys :language_id, :msgid, :msgstr_index
         end
       end
     end

data/lib/merb_global/providers/data_mapper.rb

@@ -6,14 +6,24 @@ module Merb
   module Global
     module Providers
       class DataMapper #:nodoc: all
+        include Merb::Global::Provider
+        include Merb::Global::Provider::Importer
+        include Merb::Global::Provider::Exporter
+        
         def translate_to(singular, plural, opts)
           # I hope it's from MemCache
           language = Language.first :name => opts[:lang]
           unless language.nil?
-            n = Plural.which_form opts[:n], language.plural
-            translation = Translation.first :language_id => language.id,
-                                            :msgid_hash => singular.hash,
-                                            :msgstr_index => n
+            unless plural.nil?
+              n = Plural.which_form opts[:n], language.plural
+              translation = Translation.first :language_id => language.id,
+                                              :msgid => singular,
+                                              :msgstr_index => n
+            else
+              translation = Translation.first :language_id => language.id,
+                                              :msgid => singular,
+                                              :msgstr_index => nil
+            end
             return translation.msgstr unless translation.nil?
           end
           # Fallback if not in database
@@ -33,14 +43,62 @@ module Merb
           Language.first(:name.not => except).name
         end
 
+        def import(exporter, export_data)
+          ::DataMapper::Transaction.new(Language, Translation) do
+            Language.all.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
+          ::DataMapper::Transaction.new(Language, Translation) do
+            Language.all.each {|language| language.destroy}
+            Translation.all.each {|translation| translation.destroy}
+            yield nil
+          end
+        end
+
+        def export_language(export_data, language, nplural, plural)
+          lang = Language.new :language => language, :nplural => nplural,
+                              :plural => plural
+          lang.save
+          raise if lang.new_record?
+          yield lang.id
+        end
+
+        def export_string(language_id, msgid, msgid_plural,
+                                       msgstr, msgstr_index)
+          trans = Translation.new :language_id => language_id,
+                                  :msgid => msgid,
+                                  :msgid_plural => msgid_plural,
+                                  :msgstr => msgstr,
+                                  :msgstr_index => msgstr_index
+          trans.save
+          raise if lang.new_record?
+        end
+
         # When table structure becomes stable it *should* be documented
         class Language
           include ::DataMapper::Resource
           storage_names[:default] = 'merb_global_languages'
           property :id, Integer, :serial => true
           property :name, String, :unique_index => true
+          property :nplural, Integer
           property :plural, Text, :lazy => false
           # validates_is_unique :name
+          has n, :translations,
+            :class_name => "Merb::Global::Providers::DataMapper::Translation",
+            :child_key => [:language_id]
         end
 
         class Translation
@@ -53,10 +111,11 @@ module Merb
           # - it may be wrong optimalisation
           # As far I'll leave it in this form. If anybody could measure the
           # speed of both methods it will be appreciate.
-          property :msgid_hash, Integer, :nullable => false, :key => true
+          property :msgid, Text, :nullable => false, :key => true
+          property :msgid_plural, Text, :lazy => true
           property :msgstr, Text, :nullable => false, :lazy => false
-          property :msgstr_index, Integer, :nullable => false, :key => true
-          #belongs_to :language
+          property :msgstr_index, Integer, :nullable => true, :key => true
+          belongs_to :language, :class_name =>  Language.name
         end
       end
     end

data/lib/merb_global/providers/gettext.rb

@@ -1,4 +1,6 @@
 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.
@@ -11,7 +13,10 @@ end
 module Merb
   module Global
     module Providers
-      class Gettext < Merb::Global::Provider #:nodoc: all
+      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
@@ -39,6 +44,40 @@ module Merb
           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'),

data/lib/merb_global/providers/gettext.treetop

@@ -0,0 +1,74 @@
+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/mock.rb

@@ -1,7 +1,9 @@
 module Merb
   module Global
     module Providers
-      class Mock < Merb::Global::Provider #:nodoc:
+      class Mock #:nodoc:
+        include Merb::Global::Provider
+        
         def translate_to(singular, plural, opts)
           opts[:n] > 1 ? plural : singular
         end

data/lib/merb_global/providers/sequel.rb

@@ -4,12 +4,20 @@ require 'merb_global/plural'
 module Merb
   module Global
     module Providers
-      class Sequel < Merb::Global::Provider #:nodoc: all
+      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?
-            n = Plural.which_form opts[:n], language[:plural]
-            translation = Translation[language.pk, singular.hash, n]
+            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
@@ -32,14 +40,59 @@ module Merb
         end
 
         def choose(except)
-          Language.filter {:name != except}.first[:name]
+          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_hash, :msgstr_index
+          set_primary_key :language_id, :msgid, :msgstr_index
         end
       end
     end

data/lib/merb_global/providers/yaml.rb

@@ -1,9 +1,14 @@
 require 'yaml'
+require 'fileutils'
 
 module Merb
   module Global
     module Providers
-      class Yaml < Merb::Global::Provider #:nodoc:
+      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).
@@ -45,8 +50,7 @@ module Merb
         end
 
         def create!
-          require 'ftools'
-          File.mkdirs Merb::Global::Providers.localedir
+          FileUtils.mkdir_p Merb::Global::Providers.localedir
         end
 
         def choose(except)
@@ -55,6 +59,55 @@ module Merb
           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

data/lib/merb_global/transfer.rb

@@ -0,0 +1,79 @@
+module Merb
+  module Global
+    module Provider
+      ##
+      # Transfer data from importer into exporter
+      #
+      # ==== Parameters
+      # importer<Importer>:: The provider providing the information
+      # exporter<Exporter>:: The provider receiving the information
+      def self.transfer(importer, exporter)
+        exporter.export do |export_data|
+          importer.import(exporter, export_data)
+        end
+      end
+      ##
+      # Importer is a provider through which one can iterate.
+      # Therefore it is possible to import data from this source
+      module Importer
+        ##
+        # This method iterates through the data and calles the export method
+        # of exporter
+        #
+        # ==== Parameters
+        # exporter<Exporter>:: Exporter to which it should be exported
+        # export_data:: Data to pass in calles
+        # 
+        # ==== Raises
+        # NoMethodError:: Raised by default implementation.
+        #                 Should not be thrown.
+        def import(exporter, export_data)
+          raise NoMethodError.new('method import has not been implemented')
+        end
+      end
+
+      ##
+      # Some sources are not only read-only but one can write to them.
+      # The provider is exporter if it handles this sort of source.
+      module Exporter
+        ##
+        # This method handles all transaction stuff that is needed.
+        # It also should do a initialization and/or cleanup of all resources
+        # needed specificly to the transfer as well as the final
+        # flush of changes.
+        # ==== Yields
+        # exported:: A data needed for transfer
+        def export # Better name needed
+          Merb.logger.error('No transaction has been set by exporter')
+          yield nil
+        end
+        ##
+        # This method exports a single message. Please note that the calles
+        # may be not in any particular order.
+        # ==== Parameters
+        # language:: Language data (yielded by Language call)
+        # msgid<String>:: Orginal string
+        # msgid_plural<String>:: Orginal plural string
+        # msgstr<String>:: The translation
+        # msgstr_index<Integer>:: The number of form (nil if only singular)
+        def export_string(language, msgid, msgid_plural, msgstr, msgstr_index)
+          raise NoMethodError.new('method export has not been implemented')
+        end
+        ##
+        # This method export an language. It is guaranteed to be called
+        # before any of the messages will be exported.
+        #
+        # ==== Parameters
+        # export_data:: Data given from transfer
+        # language<String>:: Language call
+        # nplural<Integer>:: Number of forms
+        # plural<String>:: Format of plural
+        # ==== Yields
+        # language:: The data about language
+        def export_language(export_data, language, nplural, plural)
+          raise NoMethodError.new('method export has not been implemented')
+        end
+      end
+    end
+  end
+end

data/sequel_generators/translations_migration/templates/translations_migration.erb

@@ -7,13 +7,16 @@ class AddTranslationsMigration < Sequel::Migration
     create_table :merb_global_languages do
       primary_key :id
       varchar	  :name,         :size => 16,           :unique => true
+      integer	  :nplural
       varchar	  :plural,       :size => 128
     end
     create_table :merb_global_translations do
-      foreign_key :language_id,  :null => false,	:key => true
-      integer	  :msgid_hash,   :null => false,	:key =>	true
+      primary_key [:language_id, :msgid_hash, :msgstr_index]
+      foreign_key :language_id,  :null => false
+      text   	  :msgid,        :null => false
+      text        :msgid_plural
       text	  :msgstr,       :null => false
-      integer	  :msgstr_index, :null => false,	:key =>	true
+      integer	  :msgstr_index, :null => true
     end
   end
   def down

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_global
 version: !ruby/object:Gem::Version 
-  version: 0.0.3.1
+  version: 0.0.4
 platform: ruby
 authors: 
 - Alex Coles
@@ -10,7 +10,7 @@ autorequire: merb_global
 bindir: bin
 cert_chain: []
 
-date: 2008-06-14 00:00:00 +02:00
+date: 2008-06-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/merb_global/plural.treetop
 - lib/merb_global/config.rb
 - lib/merb_global/controller.rb
+- lib/merb_global/transfer.rb
 - lib/merb_global/base.rb
 - lib/merb_global/merbrake.rb
 - lib/merb_global/providers
@@ -64,6 +65,7 @@ files:
 - 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.rb
 - sequel_generators/translations_migration
 - sequel_generators/translations_migration/USAGE