translatable_ar 1.0.5 → 1.1.0

data/lib/active_record_base.rb

@@ -3,7 +3,7 @@ class TranslatableAR
     extend ActiveSupport::Concern
 
     module ClassMethods
-    
+
       attr_accessor :translatable_ar_attributes
 
       def translates(*attributes)
@@ -12,23 +12,22 @@ class TranslatableAR
           remember_translatable_ar_attribute(attribute)
           define_translatable_ar_methods(attribute)
         end
-      end      
-    
+      end
+
     private
 
       def remember_translatable_ar_model
         TranslatableAR.models << self
         TranslatableAR.models.uniq!
       end
-  
+
       def remember_translatable_ar_attribute(attribute)
-        @translatable_ar_attributes ||= [] 
+        @translatable_ar_attributes ||= []
         @translatable_ar_attributes << attribute
         @translatable_ar_attributes.uniq!
       end
-    
-      def define_translatable_ar_methods(attribute)        
-        serialize "#{attribute}_i18n", TranslatableAR.coder_or_default_object
+
+      def define_translatable_ar_methods(attribute)
         class_eval do
           define_translatable_ar_writer(attribute)
           define_translatable_ar_reader(attribute)
@@ -36,55 +35,59 @@ class TranslatableAR
           define_translatable_ar_before_type_cast(attribute)
         end
       end
-  
+
       def define_translatable_ar_reader(attribute)
         define_method("#{attribute}") do
           if respond_to?("#{attribute}_i18n")
-            if send("#{attribute}_i18n").has_key?(I18n.locale.to_s)
-              send("#{attribute}_i18n")[I18n.locale.to_s]
+            i18n = send("#{attribute}_i18n") || {}
+            if i18n.has_key?(I18n.locale.to_s)
+              i18n[I18n.locale.to_s]
             else
-              send("#{attribute}_i18n")[TranslatableAR.fallback_locale.to_s]
+              i18n[TranslatableAR.fallback_locale.to_s]
             end
           else
             super()
           end
         end
       end
-      
+
       def define_translatable_ar_writer(attribute)
         define_method("#{attribute}=") do |value|
           if respond_to?("#{attribute}_i18n")
             if value.is_a?(Hash)
               send("#{attribute}_i18n=", value)
             else
-              send("#{attribute}_i18n")[I18n.locale.to_s] = value
+              i18n = send("#{attribute}_i18n") || {}
+              i18n[I18n.locale.to_s] = value
+              send("#{attribute}_i18n=", i18n)
             end
+            send("#{attribute}_i18n_will_change!")
           else
             super(value)
           end
         end
       end
-      
+
       def define_translatable_ar_changed?(attribute)
-        define_method("#{attribute}_changed?") do |value|
+        define_method("#{attribute}_changed?") do
           if respond_to?("#{attribute}_i18n")
             send("#{attribute}_i18n_changed?")
           else
-            super(value)
+            super()
           end
         end
       end
-      
+
       def define_translatable_ar_before_type_cast(attribute)
         define_method("#{attribute}_before_type_cast") do
           if respond_to?("#{attribute}_i18n")
-            send("#{attribute}_i18n_before_type_cast")[I18n.locale.to_s]
+            send("#{attribute}_i18n")[I18n.locale.to_s]
           else
             super()
           end
         end
       end
-      
+
     end
   end
 end

data/lib/railtie.rb

@@ -31,7 +31,7 @@ class TranslatableAr < Rails::Railtie
 
       migration_template 'setup.rb', "db/migrate/setup_translatable_ar_#{time}.rb"
     end
-    
+
     def models
       TranslatableAR.models.select do |model|
         model.translatable_ar_attributes.any? do |attribute|
@@ -39,7 +39,7 @@ class TranslatableAr < Rails::Railtie
         end
       end
     end
-    
+
     def attributes
       attributes = []
       attribute_struct = Struct.new(:name, :model)
@@ -52,14 +52,6 @@ class TranslatableAr < Rails::Railtie
       end
       attributes
     end
-    
-    def column_type
-      uses_hstore? ? :hstore : :text
-    end
-    
-    def uses_hstore?
-      TranslatableAR.uses_hstore?
-    end
 
   end
 end

data/lib/templates/setup.rb

@@ -1,20 +1,16 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
 
   def up
-    
-<% if uses_hstore? -%>
+
     execute "CREATE EXTENSION IF NOT EXISTS hstore"
-<% end -%>
-    
+
 <% attributes.each do |attribute| -%>
-    add_column :<%= attribute.model.table_name %>, :<%= attribute.name %>_i18n, :<%= column_type %>
+    add_column :<%= attribute.model.table_name %>, :<%= attribute.name %>_i18n, :hstore
 <% end -%>
 
-<% if uses_hstore?
 attributes.each do |attribute| -%>
     add_hstore_index :<%= attribute.model.table_name %>, :<%= attribute.name %>_i18n
-<% end 
-end-%>
+<% end -%>
 
 <% models.each do |model| -%>
     puts "Preparing existing <%= model.to_s %> objects ..."
@@ -27,17 +23,15 @@ end-%>
     end
 <% end -%>
   end
-  
+
   def down
 <% attributes.each do |attribute| -%>
     remove_column :<%= attribute.model.table_name %>, :<%= attribute.name %>_i18n
 <% end -%>
 
-<% if uses_hstore?
-attributes.each do |attribute| -%>
+<% attributes.each do |attribute| -%>
     remove_hstore_index :<%= attribute.model.table_name %>, :<%= attribute.name %>_i18n
-<% end 
-end-%>
+<% end -%>
   end
 
 end

data/lib/translatable_ar_class.rb

@@ -1,18 +1,9 @@
 class TranslatableAR
 
   class << self
-    attr_accessor :models, :coder_or_default_object, :fallback_locale
-    def coder_or_default_object
-      @coder_or_default_object ||= Hash
-    end
+    attr_accessor :models, :fallback_locale
     def models
       @models ||= []
-    end    
-    def uses_hstore?
-      @coder_or_default_object == ActiveRecord::Coders::Hstore rescue false
-    end
-    def use_hstore!
-      @coder_or_default_object = ActiveRecord::Coders::Hstore
     end
     def fallback_locale=(locale)
       @fallback_locale = locale

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translatable_ar
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -62,5 +62,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: i18n for your active record models with HStore / serialized attribute
+summary: i18n for your active record models with HStore attribute
 test_files: []