simple_model_translations 0.2.5 → 0.2.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_model_translations (0.2.4)
+    simple_model_translations (0.2.5)
       activerecord (~> 3.0.0)
 
 GEM

data/lib/simple_model_translations/translation_helper.rb

@@ -6,11 +6,7 @@ module SimpleModelTranslations
     end
 
     def find_translation_by_locale(locale)
-      if translations.loaded? || @record.new_record?
-        translations.detect { |t| t.locale.to_sym == locale }
-      else
-        translations.find_by_locale(locale)
-      end
+      translations.detect { |t| t.locale.to_sym == locale }
     end
 
     def find_or_build_translation_by_locale(locale)
@@ -30,13 +26,28 @@ module SimpleModelTranslations
     end
 
     def current_translation
-      cached_translations[current_locale_for_translation] ||= find_translation_by_locale(current_locale_for_translation) || find_translation_by_locale(default_locale_for_translation)
+      @current_translation || find_translation_by_locale(current_locale_for_translation) || find_translation_by_locale(default_locale_for_translation)
     end
 
     def find_or_build_current_translation
       find_or_build_translation_by_locale(current_locale_for_translation)
     end
     
+    def force_translation_with_locale(locale)
+      translation = 
+        if translations.loaded?
+          find_translation_by_locale(locale)
+        else
+          translations.find_by_locale(locale)
+        end
+      if translation
+        @record.readonly!
+        @current_translation = translation
+      else
+        raise "Cannot use translation with locale '#{locale}' for object '#{@record}'"
+      end
+    end
+    
     private
       def foreign_object_key
         @record.class.name.underscore.to_sym

data/lib/simple_model_translations/version.rb

@@ -1,3 +1,3 @@
 module SimpleModelTranslations
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/attributes_spec.rb

@@ -61,6 +61,13 @@ describe Article do
       @article.should have_translated_attribute(:ru, :name, 'Hello')
       @article.should have_translated_attribute(:en, :name, 'Hello in English')
     end
+    
+    it 'should not create additional translations when updating record, loaded from database' do
+      article = Article.create!(:slug => '__hello__', :name => 'Hello', :content => 'World', :locale => :ru)
+      article.reload
+      article.update_attributes!(:name => 'Hello', :content => 'World', :locale => :en)
+      article.translations.length.should == 2
+    end
   end
   
   describe '#attributes=' do

data/spec/simple_model_translations_spec.rb

@@ -42,6 +42,29 @@ describe Article do
       article.translation_helper.current_translation.should be_nil
     end
   end
+  
+  describe '#force_translation_with_locale(locale)' do
+    it 'should use data from selected translation' do
+      article = Article.create!(:slug => '__hello__', :name => 'Hello', :content => 'World', :locale => :en)
+      article.update_attributes!(:name => 'Привет', :locale => :ru)
+      article.translation_helper.force_translation_with_locale(:en)
+      article.content.should == 'World'
+      article.name.should == 'Hello'
+    end
+    
+    it 'should raise exception when there is no translation' do
+      article = Article.create!(:slug => '__hello__', :name => 'Hello', :content => 'World')
+      expect { article.translation_helper.force_translation_with_locale(:en) }.to raise_error
+    end
+    
+    it 'should make record read-only' do
+      article = Article.create!(:slug => '__hello__', :name => 'Hello', :content => 'World', :locale => :en)
+      article.update_attributes!(:name => 'Привет', :locale => :ru)
+      article.translation_helper.force_translation_with_locale(:en)
+      article.should be_readonly
+    end
+    
+  end
 end
 
 describe ArticleTranslation do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_model_translations
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Pavel Forkert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +02:00
+date: 2011-03-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency