armot 0.3.0 → 0.3.1

data/lib/armot/active_record_extensions.rb

@@ -52,12 +52,15 @@ module Armot
                 res ? res : raise(ActiveRecord::RecordNotFound)
               end
             end
+
+            # To implement by armotized classes
+            define_method :"reload_armot!" do
+            end
           end
 
           instance_mixin.module_eval do
             define_method :"#{attribute}=" do |value|
               armot_attributes[I18n.locale]["#{attribute}"] = value
-              I18n.backend.reload!
             end
 
             define_method :"#{attribute}_changed?" do
@@ -66,17 +69,19 @@ module Armot
 
             define_method :"#{attribute}" do
               return armot_attributes[I18n.locale]["#{attribute}"] if armot_attributes[I18n.locale]["#{attribute}"]
-              return if new_record?
 
-              trans = I18n.t "#{attribute}_#{id}", :scope => "armot.#{self.class.to_s.underscore.pluralize}.#{attribute}", :default => Armot.token
-              return trans if trans != Armot.token
+              if armot_attributes.any?
+                I18n.fallbacks[I18n.locale].each do |fallback|
+                  return armot_attributes[fallback]["#{attribute}"] if armot_attributes[fallback]["#{attribute}"]
+                end
+              end
 
-              (I18n.available_locales - [I18n.locale]).each do |lang|
-                trans = I18n.t "#{attribute}_#{id}", :scope => "armot.#{self.class.to_s.underscore.pluralize}.#{attribute}", :default => Armot.token, :locale => lang
-                break if trans != Armot.token
+              if persisted?
+                trans = I18n.t "#{attribute}_#{id}", :scope => "armot.#{self.class.to_s.underscore.pluralize}.#{attribute}", :default => Armot.token
+                return trans if trans != Armot.token
               end
 
-              trans == Armot.token ? self[:"#{attribute}"] : trans
+              ( new_record? || trans == Armot.token) ? self[:"#{attribute}"] : trans
             end
           end
         end
@@ -105,9 +110,8 @@ module Armot
         @armot_attributes ||= Hash.new { |hash, key| hash[key] = {} }
       end
 
-      # called after save
       def update_translations!
-        return if armot_attributes.blank?
+        return if armot_attributes.empty?
 
         armot_attributes.each do |locale, attributes|
           attributes.each do |k, v|
@@ -116,6 +120,7 @@ module Armot
           end
         end
 
+        self.class.reload_armot!
         armot_attributes.clear
       end
 

data/lib/armot/version.rb

@@ -1,3 +1,3 @@
 module Armot
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/armot_test.rb

@@ -13,6 +13,7 @@ class ArmotTest < ActiveSupport::TestCase
   def setup
     setup_db
     I18n.locale = I18n.default_locale = :en
+    I18n.fallbacks.clear
     Post.create(:title => 'English title')
   end
 
@@ -109,16 +110,6 @@ class ArmotTest < ActiveSupport::TestCase
     assert_equal "original title", Post.first.title
   end
 
-  test "should look for translations in other languages before fail" do
-    post = Post.first
-    I18n::Backend::ActiveRecord::Translation.delete_all
-    I18n.locale = :ca
-    post.title = "Catalan title"
-    post.save!
-    I18n.locale = :it
-    assert_equal "Catalan title", post.title
-  end
-
   test "should find by translated title in database as a translation" do
     post = Post.first
     I18n.locale = :ca
@@ -306,4 +297,33 @@ class ArmotTest < ActiveSupport::TestCase
     res = Product.find_by_name("Catalan foo customized")
     assert_equal "Catalan foo customized_override", res
   end
+
+  test "should respect I18n standard fallback system" do
+    I18n.fallbacks.map :es => :ca
+    post = Post.first
+    I18n.locale = :ca
+    post.title = "Bola de drac"
+    I18n.locale = :en
+    post.title = "Dragon ball"
+    I18n.locale = :es
+    post.save!
+    assert_equal "Bola de drac", post.title
+  end
+
+  test "should return the fallback even if not saved" do
+    I18n.fallbacks.map :es => :ca
+    post = Post.first
+    I18n.locale = :ca
+    post.title = "Bola de drac"
+    I18n.locale = :en
+    post.title = "Dragon ball"
+    I18n.locale = :es
+    assert_equal "Bola de drac", post.title
+  end
+
+  test "should return db-column values even if not persisted" do
+    post = Post.new
+    post[:title] = "Hello world"
+    assert_equal "Hello world", post.title
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: armot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-active_record