grosser-fast_gettext 0.4.3 → 0.4.4

data/README.markdown

@@ -44,15 +44,15 @@ I already started work on a po/mo parser & reader that is easier to use, contrib
 
 ###Database
 !!!This is very new/alpha-ish atm and surely will change!!!  
-Eesy to maintain especially with many translations and multiple locales.  
-ATM the default implementation is a bit clumsy, it is build so that the model can be substituted by your own. 
+Easy to maintain especially with many translations and multiple locales.
+An example migration for ActiveRecord can be found in `exaples/db/migration`.
+This is usable with any model DataMapper/Sequel or any other(non-database) backend, the only thing you need to do is respond to the self.translation(key, locale) call.
+The default plural seperator is `||||` but you may overwrite it (or suggest a better one..).
+    include FastGettext::TranslationRepository::DB.require_models
     FastGettext.add_text_domain('my_app', :type=>:db, :model=>TranslationKey)
-    #the model should be the model that represents the keys, you can use FastGettext::TranslationRepository::DB::TranslationKey
-    #the model must have string:key and translations
-    #a Translation must have string:text and string:locale
+    #the model should be the model that represents the keys, you can use FastGettext::TranslationRepository::DBModel::TranslationKey
 
-To get started have a look at the tests in `spec/fast_gettext/translation_repository/db_spec.rb`(includes migrations) or the models
-in `lib/fast_gettext/translation_repository/db/translation_key`.
+To get started have a look at the default models in `lib/fast_gettext/translation_repository/db/translation_key`.
 
 Performance
 ===========

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 4
-:patch: 3
+:patch: 4

data/examples/db/migration.rb

@@ -0,0 +1,22 @@
+class CreateTranslationTables < ActiveRecord::Migration
+  def self.up
+    create_table :translation_keys do |t|
+      t.string :key, :unique=>true, :null=>false
+      t.add_index :key
+      t.timestamps
+    end
+    
+    create_table :translation_texts do |t|
+      t.text :text
+      t.string :locale
+      t.integer :translation_key_id, :null=>false
+      t.add_index :translation_key_id
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :translation_keys
+    drop_table :translation_texts
+  end
+end

data/lib/fast_gettext/translation_repository/db.rb

@@ -21,7 +21,7 @@ module FastGettext
 
       def available_locales
         if @model.respond_to? :available_locales
-          @model.available_locales
+          @model.available_locales || []
         else
           []
         end
@@ -36,23 +36,21 @@ module FastGettext
       end
 
       def [](key)
-        translation = translation(key) and translation.text
+        @model.translation(key, FastGettext.locale)
       end
 
       def plural(*args)
-        translation = translation(args*self.class.seperator)
-        if translation
-          translation.text.to_s.split(self.class.seperator)
+        if translation = @model.translation(args*self.class.seperator, FastGettext.locale)
+          translation.to_s.split(self.class.seperator)
         else
           []
         end
       end
 
-      protected
-
-      def translation(key)
-        return unless key = @model.find_by_key(key)
-        key.translations.find_by_locale(FastGettext.locale)
+      def self.require_models
+        require 'fast_gettext/translation_repository/db_models/translation_key'
+        require 'fast_gettext/translation_repository/db_models/translation_text'
+        FastGettext::TranslationRepository::DBModels
       end
     end
   end

data/lib/fast_gettext/translation_repository/db_models/translation_key.rb

@@ -0,0 +1,15 @@
+module FastGettext::TranslationRepository
+  module DBModels
+    class TranslationKey < ActiveRecord::Base
+      has_many :translations, :class_name=>'TranslationText'
+      validates_uniqueness_of :key
+      validates_presence_of :key
+
+      def self.translation(key, locale)
+        return unless translation_key = find_by_key(key)
+        return unless translation_text = translation_key.translations.find_by_locale(locale)
+        translation_text.text
+      end
+    end
+  end
+end

data/lib/fast_gettext/translation_repository/db_models/translation_text.rb

@@ -0,0 +1,9 @@
+module FastGettext::TranslationRepository
+  module DBModels
+    class TranslationText < ActiveRecord::Base
+      belongs_to :key, :class_name=>'TranslationKey'
+      validates_presence_of :locale, :text
+      validates_uniqueness_of :locale, :scope=>:translation_key_id
+    end
+  end
+end

data/spec/fast_gettext/translation_repository/db_spec.rb

@@ -3,10 +3,7 @@ require File.join(current_folder,'..','..','spec_helper')
 
 require 'activerecord'
 require 'fast_gettext/translation_repository/db'
-require 'fast_gettext/translation_repository/db/translation_key'
-require 'fast_gettext/translation_repository/db/translation_text'
-
-include FastGettext::TranslationRepository
+include FastGettext::TranslationRepository::DB.require_models
 
 describe FastGettext::TranslationRepository::DB do
   before :all do
@@ -31,15 +28,15 @@ describe FastGettext::TranslationRepository::DB do
   end
 
   before do
-    DB::TranslationKey.delete_all
-    DB::TranslationText.delete_all
+    TranslationKey.delete_all
+    TranslationText.delete_all
     FastGettext.locale = 'de'
-    @rep = FastGettext::TranslationRepository::DB.new('x', :model=>DB::TranslationKey)
+    @rep = FastGettext::TranslationRepository::DB.new('x', :model=>TranslationKey)
   end
 
   def create_translation(key, text)
-    translation_key = DB::TranslationKey.create!(:key=>key)
-    DB::TranslationText.create!(:translation_key_id=>translation_key.id, :text=>text, :locale=>'de')
+    translation_key = TranslationKey.create!(:key=>key)
+    TranslationText.create!(:translation_key_id=>translation_key.id, :text=>text, :locale=>'de')
   end
   
   it "can be built" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 -07:00
+date: 2009-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ files:
 - README.markdown
 - Rakefile
 - VERSION.yml
+- examples/db/migration.rb
 - examples/missing_translation_logger.rb
 - lib/fast_gettext.rb
 - lib/fast_gettext/mo_file.rb
@@ -35,8 +36,8 @@ files:
 - lib/fast_gettext/translation_repository/base.rb
 - lib/fast_gettext/translation_repository/chain.rb
 - lib/fast_gettext/translation_repository/db.rb
-- lib/fast_gettext/translation_repository/db/translation_key.rb
-- lib/fast_gettext/translation_repository/db/translation_text.rb
+- lib/fast_gettext/translation_repository/db_models/translation_key.rb
+- lib/fast_gettext/translation_repository/db_models/translation_text.rb
 - lib/fast_gettext/translation_repository/logger.rb
 - lib/fast_gettext/translation_repository/mo.rb
 - lib/fast_gettext/translation_repository/po.rb
@@ -109,4 +110,5 @@ test_files:
 - spec/vendor/iconv_spec.rb
 - spec/vendor/fake_load_path/iconv.rb
 - spec/vendor/string_spec.rb
+- examples/db/migration.rb
 - examples/missing_translation_logger.rb

data/lib/fast_gettext/translation_repository/db/translation_key.rb

@@ -1,12 +0,0 @@
-class FastGettext::TranslationRepository::DB::TranslationKey < ActiveRecord::Base
-  has_many :translations, :class_name=>'TranslationText'
-  validates_uniqueness_of :key
-  validates_presence_of :key
-
-  # TODO this should not be necessary, but
-  # TranslationKey.respond_to? :available_locales
-  # returns true even if this is not defined...
-  def self.available_locales
-    []
-  end
-end

data/lib/fast_gettext/translation_repository/db/translation_text.rb

@@ -1,5 +0,0 @@
-class FastGettext::TranslationRepository::DB::TranslationText < ActiveRecord::Base
-  belongs_to :key, :class_name=>'TranslationKey'
-  validates_presence_of :locale, :text
-  validates_uniqueness_of :locale, :scope=>:translation_key_id
-end