grosser-fast_gettext 0.4.4 → 0.4.5

data/README.markdown

@@ -48,9 +48,9 @@ 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
+    include FastGettext::TranslationRepository::Db.require_models #load and include default 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::DBModel::TranslationKey
+    #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 default models in `lib/fast_gettext/translation_repository/db/translation_key`.
 
@@ -158,7 +158,7 @@ FAQ
 TODO
 ====
  - some cleanup required, repositories should not have locale
- - DB::TranslationKey responds_to? :available_locales should be false when it is not defined, maybe testing bug
+ - DbModel::TranslationKey responds_to? :available_locales should be false when it is not defined, maybe testing bug
  - use `default_locale=(x)` internally, atm the default is available_locales.first || 'en'
  - use `default_text_domain=(x)` internally, atm default is nil...
 

data/VERSION.yml

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

data/examples/db/migration.rb

@@ -2,17 +2,17 @@ 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
-    
+    add_index :translation_keys, :key #I am not sure if this helps....
+
     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
+    add_index :translation_texts, :translation_key_id
   end
 
   def self.down

data/lib/fast_gettext/translation_repository/db.rb

@@ -10,7 +10,7 @@ module FastGettext
     #   only constraints:
     #     key: find_by_key, translations
     #     translation: text, locale
-    class DB
+    class Db
       def initialize(name,options={})
         @model = options[:model]
       end
@@ -50,7 +50,7 @@ module FastGettext
       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
+        FastGettext::TranslationRepository::DbModels
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module FastGettext::TranslationRepository
-  module DBModels
+  module DbModels
     class TranslationKey < ActiveRecord::Base
       has_many :translations, :class_name=>'TranslationText'
       validates_uniqueness_of :key
@@ -10,6 +10,15 @@ module FastGettext::TranslationRepository
         return unless translation_text = translation_key.translations.find_by_locale(locale)
         translation_text.text
       end
+
+      def self.available_locales
+        @@available_locales ||= TranslationText.count(:group=>:locale).keys.sort
+      end
+
+      #this is only for ActiveSupport to get polymorphic_url FastGettext::... namespace free
+      def self.model_name
+        ActiveSupport::ModelName.new('TranslationKey')
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module FastGettext::TranslationRepository
-  module DBModels
+  module DbModels
     class TranslationText < ActiveRecord::Base
       belongs_to :key, :class_name=>'TranslationKey'
       validates_presence_of :locale, :text

data/spec/fast_gettext/translation_repository/db_spec.rb

@@ -3,9 +3,9 @@ require File.join(current_folder,'..','..','spec_helper')
 
 require 'activerecord'
 require 'fast_gettext/translation_repository/db'
-include FastGettext::TranslationRepository::DB.require_models
+include FastGettext::TranslationRepository::Db.require_models
 
-describe FastGettext::TranslationRepository::DB do
+describe FastGettext::TranslationRepository::Db do
   before :all do
     ActiveRecord::Base.establish_connection({
       :adapter => "sqlite3",
@@ -31,7 +31,7 @@ describe FastGettext::TranslationRepository::DB do
     TranslationKey.delete_all
     TranslationText.delete_all
     FastGettext.locale = 'de'
-    @rep = FastGettext::TranslationRepository::DB.new('x', :model=>TranslationKey)
+    @rep = FastGettext::TranslationRepository::Db.new('x', :model=>TranslationKey)
   end
 
   def create_translation(key, text)
@@ -39,9 +39,12 @@ describe FastGettext::TranslationRepository::DB do
     TranslationText.create!(:translation_key_id=>translation_key.id, :text=>text, :locale=>'de')
   end
   
-  it "can be built" do
-#    pending #this is weird, it responds to :available_locales, but it is not defined...
-    @rep.available_locales.should == []
+  it "reads locales from the db" do
+    locales = ['de','en','es']
+    locales.reverse.each do |locale|
+      TranslationText.create!(:translation_key_id=>1, :text=>'asdasd', :locale=>locale)
+    end
+    @rep.available_locales.should == locales
   end
 
   it "has no pluralisation_rule by default" do

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # ---- requirements
+require 'rubygems'
 $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 require 'fast_gettext'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -07:00
+date: 2009-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: []