translatable_ar 1.0.2 → 1.0.3

data/lib/active_record_methods.rb

@@ -26,40 +26,50 @@ class TranslatableAR
         @translatable_ar_attributes << attribute
         @translatable_ar_attributes.uniq!
       end
-  
-      def define_translatable_ar_methods(attribute)
-        serialize attribute, TranslatableAR.coder
+    
+      def define_translatable_ar_methods(attribute)        
+        serialize "#{attribute}_i18n", TranslatableAR.coder_or_default_object
         class_eval do
-          define_translatable_ar_collection(attribute)
           define_translatable_ar_writer(attribute)
           define_translatable_ar_reader(attribute)
+          define_translatable_ar_changed?(attribute)
         end
       end
   
-      def define_translatable_ar_collection(attribute)
-        define_method("#{attribute}_translations") do
-          self["#{attribute}"] ||= {}
-        end
-      end
-
       def define_translatable_ar_reader(attribute)
         define_method("#{attribute}") do
-          send("#{attribute}_translations")[I18n.locale.to_s]
+          if respond_to?("#{attribute}_i18n")
+            send("#{attribute}_i18n")[I18n.locale.to_s]
+          else
+            super()
+          end
         end
       end
       
       def define_translatable_ar_writer(attribute)
         define_method("#{attribute}=") do |value|
-          if value.is_a?(Hash)
-            translations = value
+          if respond_to?("#{attribute}_i18n")
+            if value.is_a?(Hash)
+              send("#{attribute}_i18n=", value)
+            else
+              send("#{attribute}_i18n")[I18n.locale.to_s] = value
+            end
           else
-            translations = send("#{attribute}_translations")
-            translations[I18n.locale.to_s] = value
+            super(value)
           end
-          super(translations)
         end
       end
-    
+      
+      def define_translatable_ar_changed?(attribute)
+        define_method("#{attribute}_changed?") do |value|
+          if respond_to?("#{attribute}_i18n")
+            send("#{attribute}_i18n_changed?")
+          else
+            super(value)
+          end
+        end
+      end
+      
     end
   end
 end

data/lib/railtie.rb

@@ -26,12 +26,43 @@ class TranslatableAr < Rails::Railtie
     end
 
     def create_migration_file
-      Rails.application.eager_load! # load models
-      migration_template template_path, 'db/migrate/setup_translatable_ar.rb'
+      Rails.application.eager_load! # trigger translates method call in models
+      time = Time.now.utc.strftime("%Y%m%d%H%M%S")
+
+      migration_template 'setup.rb', "db/migrate/setup_translatable_ar_#{time}.rb"
+    end
+    
+    def models
+      models = []
+      TranslatableAR.models.each do |model|
+        model.translatable_ar_attributes.each do |attribute|
+          if model.columns_hash["#{attribute}_i18n"].nil?
+            models << model
+          end
+        end
+      end
+      models.uniq!      
+    end
+    
+    def attributes
+      attributes = []
+      attribute_struct = Struct.new(:name, :model)
+      TranslatableAR.models.each do |model|
+        model.translatable_ar_attributes.each do |attribute|
+          if model.columns_hash["#{attribute}_i18n"].nil?
+            attributes << attribute_struct.new(attribute, model)
+          end
+        end
+      end
+      attributes
+    end
+    
+    def column_type
+      uses_hstore? ? :hstore : :text
     end
     
-    def template_path
-      TranslatableAR.uses_hstore? ? 'hstore.rb' : 'text.rb'
+    def uses_hstore?
+      TranslatableAR.uses_hstore?
     end
 
   end

data/lib/templates/setup.rb

@@ -0,0 +1,43 @@
+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 %>
+<% end -%>
+
+<% if uses_hstore?
+attributes.each do |attribute| -%>
+    add_hstore_index :<%= attribute.model.table_name %>, :<%= attribute.name %>_i18n
+<% end 
+end-%>
+
+<% models.each do |model| -%>
+    puts "Preparing existing <%= model.to_s %> objects ..."
+    <%= model.to_s %>.reset_column_information
+    <%= model.to_s %>.all.each do |object|
+<% attributes.select{|a| a.model == model}.each do |attribute| -%>
+      object.<%=attribute.name%> = object[:<%=attribute.name%>]
+<% end -%>
+      object.save
+    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| -%>
+    remove_hstore_index :<%= attribute.model.table_name %>, :<%= attribute.name %>_i18n
+<% end 
+end-%>
+  end
+
+end

data/lib/translatable_ar_class.rb

@@ -1,15 +1,18 @@
 class TranslatableAR
 
   class << self
-    attr_accessor :models, :coder
-    def coder
-      @coder ||= Object # Use ActiveRecord's default serializer class
+    attr_accessor :models, :coder_or_default_object
+    def coder_or_default_object
+      @coder_or_default_object ||= Hash
     end
     def models
       @models ||= []
     end    
     def uses_hstore?
-      @coder == ActiveRecord::Coders::Hstore rescue false
+      @coder_or_default_object == ActiveRecord::Coders::Hstore rescue false
+    end
+    def use_hstore!
+      @coder_or_default_object = ActiveRecord::Coders::Hstore
     end
   end
 

data/test/rails_3.2.11/test/unit/product_test.rb

@@ -6,37 +6,38 @@ class ProductTest < ActiveSupport::TestCase
 
   test "build with nested locale values" do
     p = Product.new(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png')
-    assert_equal 'Chair', p.name_translations['en']
-    assert_equal 'Stol', p.name_translations['da']
+    assert_equal 'Chair', p.name_i18n['en']
+    assert_equal 'Stol', p.name_i18n['da']
     assert_equal '/image1.png', p.image_url
   end
 
   test "build with default locale" do
     p = Product.new(name: 'Table', image_url: '/image1.png')
     assert_equal('Table', p.name)
-    assert_equal({'en' => 'Table'}, p.name_translations)
+    assert_equal({'en' => 'Table'}, p.name_i18n)
     assert_equal '/image1.png', p.image_url
   end
 
   test "create with nested locale values" do
-    p = Product.create(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png')
-    assert_equal 'Chair', p.name_translations['en']
-    assert_equal 'Stol', p.name_translations['da']
+    p = Product.create(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png', permalink: 'asd')
+    assert_equal 'Chair', p.name_i18n['en']
+    assert_equal 'Stol', p.name_i18n['da']
     assert_equal '/image1.png', p.image_url
+    assert_equal 1, Product.count
   end
 
   test "create with default locale" do
     p = Product.create(name: 'Table', image_url: '/image1.png')
     assert_equal 'Table', p.name
-    assert_equal({'en' => 'Table'}, p.name_translations)
+    assert_equal({'en' => 'Table'}, p.name_i18n)
     assert_equal '/image1.png', p.image_url
   end
 
   test "update with nested locale values" do
     p = Product.new
     p.update_attributes(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png')
-    assert_equal 'Chair', p.name_translations['en']
-    assert_equal 'Stol', p.name_translations['da']
+    assert_equal 'Chair', p.name_i18n['en']
+    assert_equal 'Stol', p.name_i18n['da']
     assert_equal '/image1.png', p.image_url
   end
 
@@ -44,7 +45,7 @@ class ProductTest < ActiveSupport::TestCase
     p = Product.new
     p.update_attributes(name: 'Table', image_url: '/image1.png')
     assert_equal 'Table', p.name
-    assert_equal({'en' => 'Table'}, p.name_translations)
+    assert_equal({'en' => 'Table'}, p.name_i18n)
     assert_equal '/image1.png', p.image_url
   end
 
@@ -62,14 +63,14 @@ class ProductTest < ActiveSupport::TestCase
     p.name = 'Bord'
     
     assert_equal 'Bord', p.name
-    assert_equal({'en' => 'Table', 'da' => 'Bord'}, p.name_translations)
+    assert_equal({'en' => 'Table', 'da' => 'Bord'}, p.name_i18n)
     
     p.save
 
     I18n.locale = :en
     
     assert_equal 'Table', p.name
-    assert_equal({'en' => 'Table', 'da' => 'Bord'}, p.name_translations)
+    assert_equal({'en' => 'Table', 'da' => 'Bord'}, p.name_i18n)
     
   end
 
@@ -78,8 +79,8 @@ class ProductTest < ActiveSupport::TestCase
   test "build from collection with nested locale values" do
     c = Category.create(name: 'Furniture')
     p = c.products.build(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png')
-    assert_equal 'Chair', p.name_translations['en']
-    assert_equal 'Stol', p.name_translations['da']
+    assert_equal 'Chair', p.name_i18n['en']
+    assert_equal 'Stol', p.name_i18n['da']
     assert_equal '/image1.png', p.image_url
   end  
   
@@ -87,15 +88,15 @@ class ProductTest < ActiveSupport::TestCase
     c = Category.create(name: 'Furniture')
     p = c.products.build(name: 'Table', image_url: '/image1.png')
     assert_equal('Table', p.name)
-    assert_equal({'en' => 'Table'}, p.name_translations)
+    assert_equal({'en' => 'Table'}, p.name_i18n)
     assert_equal '/image1.png', p.image_url
   end
 
   test "create from collection with nested locale values" do
     c = Category.create(name: 'Furniture')
     p = c.products.create(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png')
-    assert_equal 'Chair', p.name_translations['en']
-    assert_equal 'Stol', p.name_translations['da']
+    assert_equal 'Chair', p.name_i18n['en']
+    assert_equal 'Stol', p.name_i18n['da']
     assert_equal '/image1.png', p.image_url
   end
 
@@ -103,7 +104,7 @@ class ProductTest < ActiveSupport::TestCase
     c = Category.create(name: 'Furniture')
     p = c.products.create(name: 'Table', image_url: '/image1.png')
     assert_equal 'Table', p.name
-    assert_equal({'en' => 'Table'}, p.name_translations)
+    assert_equal({'en' => 'Table'}, p.name_i18n)
     assert_equal '/image1.png', p.image_url
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translatable_ar
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -27,8 +27,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: No joins. No locale columns. Attribute translations are saved in-column
-  as a serialized hash.
+description: Translations are saved in-column as a serialized hash or using HStore.
 email: kasperbn@gmail.com
 executables: []
 extensions: []
@@ -36,8 +35,7 @@ extra_rdoc_files: []
 files:
 - lib/active_record_methods.rb
 - lib/railtie.rb
-- lib/templates/hstore.rb
-- lib/templates/text.rb
+- lib/templates/setup.rb
 - lib/translatable_ar.rb
 - lib/translatable_ar_class.rb
 - test/rails_3.2.11/test/unit/product_test.rb
@@ -62,9 +60,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Less painful i18n for your active record models
+summary: i18n for your active record models with HStore / serialized attribute
 test_files:
 - test/rails_3.2.11/test/unit/product_test.rb

data/lib/templates/hstore.rb

@@ -1,72 +0,0 @@
-class SetupTranslatableAr < ActiveRecord::Migration
-
-  def up
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-    add_column :<%= model.table_name %>, :<%= attribute %>_i18n_temp, :hstore
-<% end -%>
-<% end -%>
-<% TranslatableAR.models.each do |model| -%>
-
-    <%= model.to_s %>.translates <%= model.translatable_ar_attributes.map {|a| ":#{a}_i18n_temp" }.join(', ') %>
-    <%= model.to_s %>.all.each do |object|
-<% model.translatable_ar_attributes.each do |attribute| -%>
-      if object[:<%=attribute%>].is_a? Hash
-        object.<%=attribute%>_i18n_temp = object[:<%=attribute%>]
-      else
-        object.<%=attribute%>_i18n_temp = {'<%= I18n.locale%>' => object[:<%=attribute%>]}
-      end
-<% end -%>
-      object.save if object.changed?
-    end
-<% end -%>
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-    remove_column :<%= model.table_name %>, :<%= attribute %>
-    rename_column :<%= model.table_name %>, :<%= attribute%>_i18n_temp, :<%= attribute %>
-<% end -%>
-<% end -%>
-
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-#    execute "CREATE INDEX <%= model.table_name%>_gin_<%= attribute %> ON <%= model.table_name %> USING GIN(<%= attribute %>);"
-<% end -%>
-<% end -%>
-  end
-  
-  def down
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-    add_column :<%= model.table_name %>, :<%= attribute %>_i18n_temp, :<%= model.columns_hash[attribute.to_s].type %>
-<% end -%>
-<% end -%>
-<% TranslatableAR.models.each do |model| -%>
-
-    <%= model.to_s %>.translates <%= model.translatable_ar_attributes.map {|a| ":#{a}_i18n_temp" }.join(', ') %>
-    <%= model.to_s %>.all.each do |object|
-<% model.translatable_ar_attributes.each do |attribute| -%>
-      if object[:<%=attribute%>].is_a? Hash
-        object.<%=attribute%>_i18n_temp = object[:<%=attribute%>]['<%= I18n.locale%>']
-      else
-        object.<%=attribute%>_i18n_temp = object[:<%=attribute%>]
-      end
-<% end -%>
-      object.save if object.changed?
-    end
-<% end -%>
-
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-    execute "DROP INDEX <%= model.table_name%>_gin_<%= attribute %>;"
-<% end -%>
-<% end -%>
-    
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-    remove_column :<%= model.table_name %>, :<%= attribute %>
-    rename_column :<%= model.table_name %>, :<%= attribute%>_i18n_temp, :<%= attribute %>
-<% end -%>
-<% end -%>
-  end
-
-end

data/lib/templates/text.rb

@@ -1,53 +0,0 @@
-class SetupTranslatableAr < ActiveRecord::Migration
-
-  def up
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-    add_column :<%= model.table_name %>, :<%= attribute %>_i18n_temp, :text
-<% end -%>
-<% end -%>
-<% TranslatableAR.models.each do |model| -%>
-
-    <%= model.to_s %>.translates <%= model.translatable_ar_attributes.map {|a| ":#{a}_i18n_temp" }.join(', ') %>
-    <%= model.to_s %>.all.each do |object|
-<% model.translatable_ar_attributes.each do |attribute| -%>
-      if object[:<%=attribute%>].is_a? Hash
-        object.<%=attribute%>_i18n_temp = object[:<%=attribute%>]
-      else
-        object.<%=attribute%>_i18n_temp = {'<%= I18n.default_locale%>' => object[:<%=attribute%>]}
-      end
-<% end -%>
-      object.save if object.changed?
-    end
-<% end -%>
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-    remove_column :<%= model.table_name %>, :<%= attribute %>
-    rename_column :<%= model.table_name %>, :<%= attribute%>_i18n_temp, :<%= attribute %>
-<% end -%>
-<% end -%>
-  end
-  
-  def down
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-    add_column :<%= model.table_name %>, :<%= attribute %>_i18n_temp, :<%= model.columns_hash[attribute.to_s].type %>
-<% end -%>
-<% end -%>
-<% TranslatableAR.models.each do |model| -%>
-
-    <%= model.to_s %>.all.each do |object|
-<% model.translatable_ar_attributes.each do |attribute| -%>
-      object.<%=attribute%>_i18n_temp = object[:<%=attribute%>]['<%= I18n.default_locale%>']
-<% end -%>
-      object.save if object.changed?
-<% end -%>
-<% TranslatableAR.models.each do |model| -%>
-<% model.translatable_ar_attributes.each do |attribute| -%>
-    remove_column :<%= model.table_name %>, :<%= attribute %>
-    rename_column :<%= model.table_name %>, :<%= attribute%>_i18n_temp, :<%= attribute %>
-<% end -%>
-<% end -%>    
-  end
-
-end