puret 1.0.1 → 1.0.2

data/lib/puret/active_record_extensions.rb

@@ -21,14 +21,21 @@ module Puret
         make_it_puret! unless included_modules.include?(InstanceMethods)
 
         attributes.each do |attribute|
+          # attribute setter
           define_method "#{attribute}=" do |value|
-            puret_attributes[attribute] = value
+            puret_attributes[I18n.locale][attribute] = value
           end
 
+          # attribute getter
           define_method attribute do
-            return puret_attributes[attribute] if puret_attributes[attribute]
+            # return previously setted attributes if present
+            return puret_attributes[I18n.locale][attribute] if puret_attributes[I18n.locale][attribute]
             return if new_record?
 
+            # Lookup chain:
+            # if translation not present in current locale,
+            # use default locale, if present.
+            # Otherwise use first translation
             translation = translations.detect { |t| t.locale.to_sym == I18n.locale } ||
               translations.detect { |t| t.locale.to_sym == I18n.default_locale } ||
               translations.first
@@ -40,6 +47,7 @@ module Puret
 
       private
 
+      # configure model
       def make_it_puret!
         include InstanceMethods
 
@@ -49,15 +57,19 @@ module Puret
     end
 
     module InstanceMethods
+      # attributes are stored in @puret_attributes instance variable via setter
       def puret_attributes
-        @puret_attributes ||= {}
+        @puret_attributes ||= Hash.new { |hash, key| hash[key] = {} }
       end
 
+      # called after save
       def update_translations!
         return if puret_attributes.blank?
-        translation = translations.find_or_initialize_by_locale(I18n.locale.to_s)
-        translation.attributes = translation.attributes.merge(puret_attributes)
-        translation.save!
+        puret_attributes.each do |locale, attributes|
+          translation = translations.find_or_initialize_by_locale(locale.to_s)
+          translation.attributes = translation.attributes.merge(attributes)
+          translation.save!
+        end
       end
     end
   end

data/lib/puret/version.rb

@@ -1,3 +1,3 @@
 module Puret
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

data/test/puret_test.rb

@@ -54,10 +54,21 @@ class PuretTest < ActiveSupport::TestCase
     I18n.locale = :de
     post = Post.first
     post.text = 'Deutscher Text'
-    post.title.blank?
+    assert !post.title.blank?
     assert_equal 'Deutscher Text', post.text
   end
 
+  test 'temporary locale switch should work like expected' do
+    post = Post.new
+    post.title = 'English title'
+    I18n.locale = :de
+    post.title = 'Deutscher Titel'
+    post.save
+    assert_equal 'Deutscher Titel', post.title
+    I18n.locale = :en
+    assert_equal 'English title', post.title
+  end
+
   test 'translation model should validate presence of model' do
     t = PostTranslation.new
     t.valid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: puret
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - "Johannes J\xC3\xB6rg Schmidt"