fix dirty on rails 4.2.1+ and fix translated attribute (with fallback) that should not be changed when accessors are assigned but not changed

Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://git.uneek.eu/geminabox"
 
 gemspec

lib/globalize-accessors.rb

@@ -22,6 +22,9 @@ def localized_attr_name_for(attr_name, locale)
   private
 
   def define_accessors(attr_name, locale)
+    if respond_to?(:attribute)
+      attribute localized_attr_name_for(attr_name, locale)
+    end
     define_getter(attr_name, locale)
     define_setter(attr_name, locale)
   end
@@ -34,11 +37,15 @@ def define_getter(attr_name, locale)
 
   def define_setter(attr_name, locale)
     localized_attr_name = localized_attr_name_for(attr_name, locale)
-
     define_method :"#{localized_attr_name}=" do |value|
-      attribute_will_change!(localized_attr_name) if value != send(localized_attr_name)
-      write_attribute(attr_name, value, :locale => locale)
-      translation_for(locale)[attr_name] = value
+      translation_for(locale)
+      if value != send(localized_attr_name)
+        super(value) # note: super is not defined if db/schema.rb is not loaded
+        attribute_will_change!(localized_attr_name)
+        write_attribute(attr_name, value, :locale => locale)
+        translation_for(locale)[attr_name] = value
+      end
+      value
     end
     if respond_to?(:accessible_attributes) && accessible_attributes.include?(attr_name)
       attr_accessible :"#{localized_attr_name}"

lib/globalize-accessors/version.rb

@@ -1,5 +1,5 @@
 module Globalize
   module Accessors
-    VERSION = '0.3.0'
+    VERSION = '0.3.0-fix-dirty2'
   end
 end

test/globalize_accessors_test.rb

@@ -32,6 +32,16 @@ class UnitWithoutAccessors < ActiveRecord::Base
     self.table_name = :units
   end
 
+  class UnitWithFallback < ActiveRecord::Base
+    self.table_name = :units
+    translates :name, :title, fallbacks_for_empty_translations: true
+    globalize_accessors
+
+    def globalize_fallbacks(locale)
+      locale == :pl ? [:pl, :en] : [:en, :pl]
+    end
+  end
+
   setup do
     assert_equal :en, I18n.locale
   end
@@ -196,4 +206,15 @@ def u.globalize_fallbacks(locale)
     u.save!
     assert ! u.changed.include?("name_en")
   end
+
+  test "translated attribute with fallbacks_for_empty_translations should not change when accessors are assigned but not changed" do
+    attrs = {:name_en => "", :name_pl => "Name pl"} # name_en is empty in order to trigger fallback
+    u = UnitWithFallback.create!(attrs)
+    assert u.name == 'Name pl'
+    u = UnitWithFallback.find(u.id)
+    assert ! u.changed.include?("name")
+    u.assign_attributes(attrs)
+    assert ! u.changed.include?("name")
+  end
+
 end