simple_model_translations 0.2.1 → 0.2.2

data/Rakefile

@@ -16,12 +16,14 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+desc 'Build gem' 
 task :build do
   system 'gem build simple_model_translations.gemspec'
   system 'mkdir pkg' unless File.exists?('pkg')
   system "mv simple_model_translations-#{SimpleModelTranslations::VERSION}.gem pkg"
 end
- 
+
+desc 'Build and push gem to rubygems.org' 
 task :release => :build do
   system "gem push pkg/simple_model_translations-#{SimpleModelTranslations::VERSION}.gem"
 end

data/lib/simple_model_translations/base.rb

@@ -30,10 +30,7 @@ module SimpleModelTranslations
 
         # attribute getter
         define_method attribute do
-          translation = find_translation_by_locale(current_locale_for_translation) || 
-                        find_translation_by_locale(default_locale_for_translation)
-
-          translation ? translation.send(attribute) : nil
+          current_translation ? current_translation.send(attribute) : nil
         end
       end
     end

data/lib/simple_model_translations/instance_methods.rb

@@ -20,6 +20,10 @@ module SimpleModelTranslations
       I18n.default_locale
     end
     
+    def current_translation
+      find_translation_by_locale(current_locale_for_translation) || find_translation_by_locale(default_locale_for_translation)
+    end
+    
     private
       def foreign_object_key
         self.class.name.underscore.to_sym

data/lib/simple_model_translations/version.rb

@@ -1,3 +1,3 @@
 module SimpleModelTranslations
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/simple_model_translations_spec.rb

@@ -1,6 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Article do
+  after { I18n.locale = I18n.default_locale }
+  
   it { should have_many :translations }
 
   it "should have empty translations for a new record" do
@@ -9,9 +11,7 @@ describe Article do
   
   it 'should destroy dependent locales' do
     article = Article.create!(:slug => '__hello__', :name => 'Hello', :content => 'World')
-    expect do
-      article.destroy
-    end.to change(ArticleTranslation, :count).by(-1)
+    expect { article.destroy }.to change(ArticleTranslation, :count).by(-1)
   end
   
   it 'should use I18n fallbacks' do
@@ -24,6 +24,24 @@ describe Article do
     I18n.locale = :de
     article.name.should == 'Hello'
   end
+  
+  describe '#current_translation' do
+    it 'should return translation for current locale if it exists' do
+      article = Article.create!(:slug => '__hello__', :name => 'Hello', :content => 'World')
+      article.current_translation.should == article.translations.find_by_locale(I18n.locale)
+    end
+    
+    it 'should return translation for default locale if translation for current locale does not exist' do
+      article = Article.create!(:slug => '__hello__', :name => 'Hello', :content => 'World')
+      I18n.locale = :de
+      article.current_translation.should == article.translations.find_by_locale(I18n.default_locale)
+    end
+    
+    it 'should return nil if translations for current and default locales do not exist' do
+      article = Article.create!(:slug => '__hello__')
+      article.current_translation.should be_nil
+    end
+  end
 end
 
 describe ArticleTranslation do

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ RSpec.configure do |config|
   config.before do
     I18n.locale = :ru
     I18n.default_locale = :ru
+    
     DatabaseCleaner.start
   end
   config.after do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_model_translations
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Pavel Forkert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +02:00
+date: 2011-01-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Simple ActiveRecord translations for Rails 3