efficient_translations 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    efficient_translations (0.0.5)
+    efficient_translations (0.0.6)
       activerecord (~> 2.3)
       activesupport (~> 2.3)
 

data/README.md

@@ -82,6 +82,9 @@ Done! You have the EfficientTranslations power in your hands :-)
     I18n.locale = :it
     # when the current locale is not found, the default locale will be used
     product.name # => 'Efficient Translations'
+    # if you don't want the default locale fallback
+    product.name! # => nil
+    product.name_translation! :it # => nil
 
     # .name= is a wrapper to #set_name_translation I18n.locale
     product.name = 'Traduzioni Efficienti'

data/lib/efficient_translations/translates_method.rb

@@ -47,7 +47,7 @@ module EfficientTranslations
       def define_translation_accessors field
         field = field.to_sym
         class_eval do
-          define_method "#{field}_translation" do |locale|
+          define_method "#{field}_translation!" do |locale|
             locale = locale.to_sym
             # search in cache
             if efficient_translations_attributes[locale][field]
@@ -55,12 +55,16 @@ module EfficientTranslations
             else
               # search in relationship
               translation = translations.detect { |t| t.locale.to_sym == locale }
-              if translation
-                translation[field]
-              elsif locale != I18n.default_locale
-                # try to fetch default locale
-                self.send "#{field}_translation", I18n.default_locale
-              end
+              translation && translation[field] || nil
+            end
+          end
+
+          define_method "#{field}_translation" do |locale|
+            translation_field = self.send "#{field}_translation!", locale
+            if translation_field
+              translation_field
+            elsif locale.to_sym != I18n.default_locale
+              self.send "#{field}_translation!", I18n.default_locale
             end
           end
 
@@ -73,6 +77,10 @@ module EfficientTranslations
             self.send "#{field}_translation", I18n.locale
           end
 
+          define_method "#{field}!" do
+            self.send "#{field}_translation!", I18n.locale
+          end
+
           define_method "#{field}=" do |value|
             self.send "set_#{field}_translation", I18n.locale, value
           end

data/lib/efficient_translations/version.rb

@@ -1,3 +1,3 @@
 module EfficientTranslations
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/efficient_translations/translates_method_spec.rb

@@ -75,20 +75,14 @@ describe EfficientTranslations do
       WorkingModel.first.name.should == 'pippo'
     end
 
-    describe 'field_translation' do
-      before do
-        @model = WorkingModel.new
-        @model.set_name_translation :en, 'pippo'
-        @model.save!
-      end
-
+    shared_examples 'translation finder' do
       context 'when cache contains the translated value' do
         before do
           @model.set_name_translation :en, 'foo'
         end
 
         it 'should fetch the value from cache' do
-          @model.name_translation(:en).should == 'foo'
+          invoke(:en).should == 'foo'
         end
       end
 
@@ -96,19 +90,53 @@ describe EfficientTranslations do
         it 'should search in the relationship' do
           @model = WorkingModel.find @model.id
           @model.translation_model.create! :working_model_id => @model.id, :locale => 'fr', :name => 'frfr'
-          @model.name_translation(:fr).should == 'frfr'
+          invoke(:fr).should == 'frfr'
+        end
+      end
+    end
+
+    describe 'field_translation!' do
+      before do
+        @model = WorkingModel.new
+        @model.set_name_translation :en, 'pippo'
+        @model.save!
+      end
+
+      def invoke *args
+        @model.name_translation! *args
+      end
+
+      it_should_behave_like 'translation finder'
+
+      context 'when cache is empty and no value is found' do
+        it 'should return nil' do
+          invoke(:de).should be_nil
         end
       end
+    end
+
+    describe 'field_translation' do
+      before do
+        @model = WorkingModel.new
+        @model.set_name_translation :en, 'pippo'
+        @model.save!
+      end
+
+      def invoke *args
+        @model.name_translation *args
+      end
+
+      it_should_behave_like 'translation finder'
 
       context 'when cache is empty and no value is found' do
         it 'should search for I18n.default_locale if locale != I18n.default_locale' do
           I18n.default_locale = :en
-          @model.name_translation(:de).should == @model.name_translation(:en)
+          invoke(:de).should == @model.name_translation(:en)
         end
 
         it 'should return nil if locale == I18n.default_locale' do
           I18n.default_locale = :de
-          @model.name_translation(:de).should be_nil
+          invoke(:de).should be_nil
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: efficient_translations
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Nicola Racco