trendi18n 0.9.2 → 0.9.3

data/README.rdoc

@@ -46,6 +46,12 @@ If you want to use trendi18n in your app you should do three steps:
 
 = Changelog
 
+=== 0.9.3
+
+* Return all translations form scope, when scope given as a key
+* Trendi18n::Backend::Trendi18n.available_locales use data both from localization files and from database
+* Translation.get_locales return an array of symbols in place of an array of strings
+
 === 0.9.2
 
 * Backend reloading system (multi-threading supported)

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/app/models/translation.rb

@@ -12,6 +12,11 @@ class Translation < ActiveRecord::Base
 
   @@locales = []
 
+  # return true if there is no translation with key == name, and there is some translations with scope == name
+  def self.scope?(name, locale = I18n.locale.to_s)
+    !self.exists?(:key => name, :locale => locale, :scope => nil) && self.exists?(:scope => name, :locale => locale)
+  end
+
    # return locales which translations are stored in db
   def self.get_locales
     @@locales
@@ -19,7 +24,7 @@ class Translation < ActiveRecord::Base
 
   # read locales which translation are stored in db
   def self.set_locales
-    @@locales = self.all(:select => "DISTINCT(locale)", :order => "locale ASC").map { |obj| obj.locale  }
+    @@locales = self.all(:select => "DISTINCT(locale)", :order => "locale ASC").map { |obj| obj.locale.to_sym  }
   end
 
   # Set @read_time, date and time of first database read on current update.
@@ -126,9 +131,21 @@ class Translation < ActiveRecord::Base
   end
 
   # return hash ready to by stored as translation
-  def to_translation_hash
-   path = self.scope.nil? ? [self.key] : self.scope.split(".") << self.key
+  def to_translation_hash()
+   path = []
+   path += self.scope.split(".") unless self.scope.nil?
+   path << self.key
    return path.reverse.inject(self) {|before, step| { step => before}}
   end
 
+  # return ready to by stored as translations hash of translations in scope
+  def self.scope_to_translation_hash(scope, locale = I18n.locale.to_s)
+    children = self.find_by_sql ["SELECT * FROM translations WHERE scope LIKE ? and locale=? ORDER BY id", scope + "%", locale]
+    hash = {}
+    for child in children
+      hash.deep_merge!  child.to_translation_hash()
+    end
+    Trendi18n::ScopeTranslations.new(locale, hash)
+  end
+
 end

data/lib/trendi18n/backend/trendi18n.rb

@@ -10,7 +10,7 @@ module Trendi18n
       # return available locales, based on informaton form Translation model
       def available_locales
         Translation.set_read_time
-        Translation.get_locales
+        Translation.get_locales | nested.available_locales
       end
 
       # translate key in locale using options
@@ -27,6 +27,13 @@ module Trendi18n
         # read values of scope and default options and delete them form options
         values = options.reject {|name, value| [:scope, :default].include?(name)}
 
+
+        # cache and return all translation from scope if it's used as key
+        if Translation.scope?(key_with_scope = [scope, key].delete_if{|x| x.blank?}.join("."), loc = locale.to_s)
+          cache_translation(result = Translation.scope_to_translation_hash(key_with_scope, loc))
+          return result.to_translation_hash[key.to_s]
+        end
+
         if key.is_a?(Symbol) # if key is a Symbol
           begin
             return nested.translate(locale, key, options) # use nested translete
@@ -79,6 +86,13 @@ module Trendi18n
         store_translations(translation.locale, translation.to_translation_hash)
       end
 
+      # cache all translations in scope
+      def cache_translations_from_scope(scope_translation)
+        for hash in scope_translation.to_translation_hash
+          cache_translation(ScopeTranslations.new(scope_translation.locale, hash))
+        end
+      end
+
     end
   end
 end

data/lib/trendi18n/scope_translations.rb

@@ -0,0 +1,13 @@
+module Trendi18n
+
+    # Simple class use to caching hash of translations in scope
+    class ScopeTranslations
+
+      attr_accessor :locale, :to_translation_hash
+
+      def initialize(locale, to_translation_hash)
+        @locale, @to_translation_hash = locale, to_translation_hash
+      end
+    end
+  
+end

data/rails/init.rb

@@ -1,6 +1,7 @@
 require 'trendi18n/backend/trendi18n'
 require 'trendi18n/generator/commands'
 require 'trendi18n/handler'
+require 'trendi18n/scope_translations'
 require 'file'
 
 I18n.backend = Trendi18n::Backend::Trendi18n.new

data/spec/test_application/config/environment.rb

@@ -39,6 +39,6 @@ Rails::Initializer.run do |config|
 
 
   # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de
+   config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '*.{rb,yml}')]
+   config.i18n.default_locale = :en
 end

data/spec/test_application/config/locales/fr.yml

@@ -0,0 +1,2 @@
+fr:
+  hello: "Bonjour univers!"

data/spec/test_application/features/step_definitions/translations_steps.rb

@@ -10,9 +10,6 @@ Given /^I have relocalized "([^\"]*)" from "([^\"]*)" to "([^\"]*)"$/ do |key, o
   Translation.first(:conditions => {:key => key, :locale => old_locale}).update_attribute('locale', new_locale)
 end
 
-When /^I reloading locales$/ do
-  Translation.set_locales
-end
 
 
 

data/spec/test_application/spec/backend_spec.rb

@@ -39,6 +39,23 @@ describe Trendi18n::Backend::Trendi18n do
       I18n.reload!
       I18n.t("test_key")
     end
+
+    it "should cache all translations from scope, when scope is used as key" do
+      Translation.create!(:key => "key_down", :scope => "testscope", :locale => "en")
+      Translation.create!(:key => "key_up", :scope => "testscope", :locale => "en")
+      I18n.t(:testscope, :locale => "en")
+      Translation.should_not_receive(:lookup)
+      I18n.t(:key_down, :scope => "testscope", :locale => "en")
+    end
+
+    it "should cache all translations from scope and subscopes, when scope is used as key" do
+      Translation.create!(:key => "key_down", :scope => "testscope.subtest", :locale => "en")
+      Translation.create!(:key => "key_up", :scope => "testscope", :locale => "en")
+      I18n.t(:testscope, :locale => "en")
+      Translation.should_not_receive(:lookup)
+      I18n.t(:key_down, :scope => "testscope.subtest", :locale => "en")
+    end
+
     describe "up-to-date status" do
 
       it "should be up-to-date when there is no translations" do
@@ -142,10 +159,15 @@ describe Trendi18n::Backend::Trendi18n do
 
     end
 
-    describe "while scope given as a key" do
 
-      it "should translate to hash of translations"
+  end
 
-    end
+  it "should return availables_locales merged form db and files" do
+    Translation.create!(:locale => "pl", :key => "al_test", :translation => "al_test_in_polish")
+    Translation.set_locales
+    I18n.backend.available_locales.include?(:pl).should == true
+    I18n.backend.available_locales.include?(:en).should == true # created by before(each)
+    I18n.backend.available_locales.include?(:fr).should == true # in localization file
   end
+
 end

data/spec/test_application/spec/models/translation_spec.rb

@@ -99,7 +99,9 @@ describe Translation do
        Translation.create!(:key => "key", :locale => "en")
        Translation.create!(:key => "key", :locale => "nl")
        Translation.set_locales
-       Translation.get_locales.should == ["en", "nl", "pl"]
+       Translation.get_locales.include?(:en).should == true
+       Translation.get_locales.include?(:nl).should == true
+       Translation.get_locales.include?(:pl).should == true
     end
 
   end
@@ -111,4 +113,31 @@ describe Translation do
     I18n.t("with_count", :count => 2).should == "many (2)"
   end
 
+  describe "scope recognizing" do
+
+    it "should recognize something is scope, not key" do
+      Translation.create!(:key => "key", :locale => "en", :scope => "scope")
+      Translation.scope?("scope", "en").should == true
+    end
+
+    it "should recognize something is key, when scope with the same name exists and key has no scope" do
+      Translation.create!(:key => "scope", :locale => "en")
+      Translation.create!(:key => "key", :scope => "scope", :locale => "en")
+      Translation.scope?("scope", "en").should == false
+    end
+
+    it "should recognize something is scope, when key with the same name exists and has some scope" do
+      Translation.create!(:key => "scope", :locale => "en", :scope => "real.scope")
+      Translation.create!(:key => "key", :locale => "en", :scope => "scope")
+      Translation.scope?("scope", "en").should == true
+    end
+
+    it "should recognize something is scope, when key with the same name exists, but has different locale" do
+      Translation.create!(:key => "scope", :locale => "pl")
+      Translation.create!(:key => "key", :scope => "scope", :locale => "en")
+      Translation.scope?("scope", "pl").should == false
+      Translation.scope?("scope", "en").should == true
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trendi18n
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Piotr Misiurek
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 +01:00
+date: 2010-01-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ files:
 - lib/trendi18n/backend/trendi18n.rb
 - lib/trendi18n/generator/commands.rb
 - lib/trendi18n/handler.rb
+- lib/trendi18n/scope_translations.rb
 - rails/init.rb
 - spec/test_application/README
 - spec/test_application/Rakefile
@@ -68,6 +69,7 @@ files:
 - spec/test_application/config/initializers/new_rails_defaults.rb
 - spec/test_application/config/initializers/session_store.rb
 - spec/test_application/config/locales/en.yml
+- spec/test_application/config/locales/fr.yml
 - spec/test_application/config/routes.rb
 - spec/test_application/db/migrate/20091208195455_create_translations.rb
 - spec/test_application/db/schema.rb