globalize 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f79ee6b19f357cae4c848d662d6f081a6375b8c
-  data.tar.gz: 1f4fe986e59139c19acd2c2eac58b7598213ed85
+  metadata.gz: 57f25eaab88304fdb368cbbf71aba41413e20a49
+  data.tar.gz: 074e1bb69520bbf7b7dd658beaede38b8f58fcbc
 SHA512:
-  metadata.gz: 5f9894c0da31c4734117700845576c612e24a9c4575fc19370c87f788837ea6bf0968fe46c51d094c9a75d0fc39d1c7204b2b581716a5663a5a82ef901ae12de
-  data.tar.gz: c6ee550b86c3cec2e43443d11791b88a03c0d541cb1791a1b3aed249f664297ca96b0721823322c78ba8a869e4b82508727b70889d8c47b4a83f86caa6505a64
+  metadata.gz: 6793d5894ce36c34d65b8c59b0c26d12f268cfe27a0fdcba0bde632df9c0418af1c975c71ef14f56bcbcc0749b726f8d751c2e02b64e173b457e3a240527dfa7
+  data.tar.gz: b718eed39f3683df1faa47828c5535b8c50466b6fed9c15f17cd670e6597c7cbc749db725cdbeb7c711044b1a25b92d1c9042d90cfa6d71b424adbef7ffe9eec

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Globalize Changelog
 
+## 5.1.0 (unreleased)
+
+* Replaced `after_` callbacks with `before_` callbacks and set `autosave: true` by default. [#341](https://github.com/globalize/globalize/pull/341) by [Andrew Volozhanin](https://github.com/scarfacedeb)
+* Add [RequestStore](https://github.com/steveklabnik/request_store) to make Globalize thread-safe again [#420](https://github.com/globalize/globalize/pull/420)
+* Join the translations table when ordering by translated attributes (https://github.com/globalize/globalize/pull/447). (thanks [Thomas Maas](https://github.com/thomasmaas) & [Michal Cichra](https://github.com/mikz)).
+* Add `unique` to `with_translation` to prevent duplicates if fallbacks are defined and the queried locale is not the fallback language. [#489](https://github.com/globalize/globalize/pull/489) by [krisdigital](https://github.com/krisdigital)
+
 ## 5.0.1 (2015-02-15)
 
 * Don't touch table when model is loaded. [#412](https://github.com/globalize/globalize/pull/412)
@@ -74,7 +81,12 @@
 
 * Backport scope support on uniqueness validation from 4.0, drop support for ActiveRecord < 3.1, fixes [#324](https://github.com/globalize/globalize/issues/324).
 
+## 3.0.5 (2015-04-24)
+
+* Now working properly with the squeel library. (thanks [Toru Mori](https://github.com/torumori)). See [#437](https://github.com/globalize/globalize/pull/437)
+
 ## 3.0.4 (2014-01-08)
+
 * Extract all versioning-related code to separate [globalize-versioning](https://github.com/globalize/globalize-versioning) gem.
 
 ## 3.0.3 (2013-12-26)

data/Gemfile

@@ -1,12 +1,26 @@
-source 'https://rubygems.org'
+  source "https://rubygems.org"
 
 gemspec
 
+gem "pry"
+
+eval File.read(File.expand_path("../gemfiles/.gemfile.database-config.rb", __FILE__))
+
 platforms :rbx do
-  gem 'rubysl', '~> 2.0'
+  gem "rubysl", "~> 2.0"
+  gem "rubinius-developer_tools"
 end
 
-group :test do
-  gem 'pry'
-  gem 'pry-nav'
+platforms :jruby do
+  if !ENV['TRAVIS'] || ENV['DB'] == 'sqlite3'
+    gem 'activerecord-jdbcsqlite3-adapter', git: "https://github.com/jruby/activerecord-jdbc-adapter"
+  end
+
+  if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+    gem 'activerecord-jdbcmysql-adapter', git: "https://github.com/jruby/activerecord-jdbc-adapter"
+  end
+
+  if !ENV['TRAVIS'] || %w(postgres postgresql).include?(ENV['DB'])
+    gem 'activerecord-jdbcpostgresql-adapter', git: "https://github.com/jruby/activerecord-jdbc-adapter"
+  end
 end

data/Gemfile.lock

@@ -1,52 +1,85 @@
+GIT
+  remote: https://github.com/jruby/activerecord-jdbc-adapter
+  revision: 4ae8a3c4d4b00d1c33ef6b9099f63a3f78da21ad
+  specs:
+    activerecord-jdbc-adapter (51.0)
+      activerecord (~> 5.1.0)
+    activerecord-jdbcmysql-adapter (51.0)
+      activerecord-jdbc-adapter (~> 51.0)
+      jdbc-mysql (~> 5.1.36)
+    activerecord-jdbcpostgresql-adapter (51.0)
+      activerecord-jdbc-adapter (~> 51.0)
+      jdbc-postgres (>= 9.4, < 43)
+    activerecord-jdbcsqlite3-adapter (51.0)
+      activerecord-jdbc-adapter (~> 51.0)
+      jdbc-sqlite3 (~> 3.8, < 3.30)
+    jdbc-mysql (5.1.44)
+    jdbc-postgres (42.1.4)
+    jdbc-sqlite3 (3.20.1)
+
 PATH
   remote: .
   specs:
-    globalize (5.0.1)
-      activemodel (>= 4.2.0, < 4.3)
-      activerecord (>= 4.2.0, < 4.3)
+    globalize (5.1.0)
+      activemodel (>= 4.2, < 5.2)
+      activerecord (>= 4.2, < 5.2)
+      request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
-      builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
-      arel (~> 6.0)
-    activesupport (4.2.0)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ansi (1.4.3)
-    arel (6.0.0)
-    builder (3.2.2)
-    coderay (1.1.0)
-    database_cleaner (1.4.0)
+    ansi (1.5.0)
+    arel (8.0.0)
+    builder (3.2.3)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.5-java)
+    database_cleaner (1.6.2)
+    ffi (1.9.18-java)
     ffi2-generators (0.1.1)
-    i18n (0.7.0)
-    json (1.8.2)
-    method_source (0.8.2)
-    minitest (5.5.1)
-    minitest-reporters (1.0.8)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    method_source (0.9.0)
+    minitest (5.11.1)
+    minitest-reporters (1.1.19)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    pry (0.10.1)
+    mysql2 (0.4.10)
+    pg (1.0.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry (0.11.3-java)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    rake (10.4.2)
-    rb-readline (0.5.2)
-    rdoc (4.2.0)
-    ruby-progressbar (1.7.1)
-    rubysl (2.1.0)
+      method_source (~> 0.9.0)
+      spoon (~> 0.0)
+    rack (2.0.3)
+    rake (12.3.0)
+    rdoc (6.0.1)
+    request_store (1.4.0)
+      rack (>= 1.4)
+    rubinius-coverage (2.1)
+    rubinius-debugger (2.6)
+    rubinius-developer_tools (2.0.0)
+      rubinius-coverage (~> 2.0)
+      rubinius-debugger (~> 2.0)
+      rubinius-profiler (~> 2.0)
+    rubinius-profiler (2.1)
+    ruby-progressbar (1.9.0)
+    rubysl (2.2.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -131,6 +164,7 @@ GEM
       rubysl-tmpdir (~> 2.0)
       rubysl-tsort (~> 2.0)
       rubysl-un (~> 2.0)
+      rubysl-unicode_normalize (~> 2.0)
       rubysl-uri (~> 2.0)
       rubysl-weakref (~> 2.0)
       rubysl-webrick (~> 2.0)
@@ -142,17 +176,17 @@ GEM
     rubysl-benchmark (2.0.1)
     rubysl-bigdecimal (2.0.2)
     rubysl-cgi (2.0.1)
-    rubysl-cgi-session (2.0.1)
+    rubysl-cgi-session (2.1.0)
     rubysl-cmath (2.0.0)
     rubysl-complex (2.0.0)
     rubysl-continuation (2.0.0)
-    rubysl-coverage (2.0.3)
+    rubysl-coverage (2.1)
     rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
     rubysl-curses (2.0.1)
-    rubysl-date (2.0.8)
+    rubysl-date (2.0.9)
     rubysl-delegate (2.0.1)
-    rubysl-digest (2.0.3)
+    rubysl-digest (2.0.8)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
@@ -175,8 +209,7 @@ GEM
     rubysl-io-nonblock (2.0.0)
     rubysl-io-wait (2.0.0)
     rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.1.0)
-      rb-readline (~> 0.5)
+    rubysl-irb (2.1.1)
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-thread (~> 2.0)
@@ -184,10 +217,10 @@ GEM
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
       rubysl-e2mmap (~> 2.0)
-    rubysl-mkmf (2.0.1)
+    rubysl-mkmf (2.1)
       rubysl-fileutils (~> 2.0)
       rubysl-shellwords (~> 2.0)
-    rubysl-monitor (2.0.0)
+    rubysl-monitor (2.1)
     rubysl-mutex_m (2.0.0)
     rubysl-net-ftp (2.0.1)
     rubysl-net-http (2.0.4)
@@ -203,19 +236,19 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.2.1)
+    rubysl-openssl (2.9)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
-    rubysl-ostruct (2.0.4)
-    rubysl-pathname (2.1.0)
+    rubysl-ostruct (2.1.0)
+    rubysl-pathname (2.3)
     rubysl-prettyprint (2.0.3)
     rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
-    rubysl-profiler (2.0.1)
+    rubysl-profiler (2.1)
     rubysl-pstore (2.0.0)
     rubysl-pty (2.0.3)
     rubysl-rational (2.0.1)
-    rubysl-resolv (2.1.0)
+    rubysl-resolv (2.1.2)
     rubysl-rexml (2.0.4)
     rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
@@ -224,14 +257,15 @@ GEM
     rubysl-set (2.0.1)
     rubysl-shellwords (2.0.0)
     rubysl-singleton (2.0.0)
-    rubysl-socket (2.0.1)
-    rubysl-stringio (2.0.0)
+    rubysl-socket (2.2.1)
+      rubysl-fcntl (~> 2.0)
+    rubysl-stringio (2.2)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
     rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-thread (2.0.2)
+    rubysl-thread (2.1)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
@@ -240,29 +274,41 @@ GEM
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
       rubysl-optparse (~> 2.0)
+    rubysl-unicode_normalize (2.0)
     rubysl-uri (2.0.0)
     rubysl-weakref (2.0.0)
     rubysl-webrick (2.0.0)
     rubysl-xmlrpc (2.0.0)
     rubysl-yaml (2.1.0)
     rubysl-zlib (2.0.1)
-    slop (3.6.0)
-    sqlite3 (1.3.10)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
+    spoon (0.0.6)
+      ffi
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  database_cleaner (~> 1.4.0)
+  activerecord-jdbcmysql-adapter!
+  activerecord-jdbcpostgresql-adapter!
+  activerecord-jdbcsqlite3-adapter!
+  database_cleaner
   globalize!
   minitest
   minitest-reporters
+  mysql2
+  pg
   pry
-  pry-nav
   rake
   rdoc
+  rubinius-developer_tools
   rubysl (~> 2.0)
   sqlite3
+
+BUNDLED WITH
+   1.16.1

data/{readme.md → README.md}

@@ -9,6 +9,8 @@ You can chat with us using Gitter:
 Globalize builds on the [I18n API in Ruby on Rails](http://guides.rubyonrails.org/i18n.html)
 to add model translations to ActiveRecord models.
 
+In other words, a way to translate actual user-generated content, for example; a single blog post with multiple translations.
+
 ## Requirements
 
 * ActiveRecord >= 4.2.0 (see below for installation with ActiveRecord 3.x)
@@ -28,6 +30,21 @@ When using bundler put this in your Gemfile:
 gem 'globalize', '~> 5.0.0'
 ```
 
+You have to use the **master** branch to work with Rails 5, or you can use a pre-release gem:
+
+```ruby
+gem 'globalize', '~> 5.1.0.beta2'
+```
+
+Please help us by letting us know what works, and what doesn't, when using pre-release code.
+
+Put in your Gemfile
+
+```ruby
+gem 'globalize', git: 'https://github.com/globalize/globalize'
+gem 'activemodel-serializers-xml'
+```
+
 To use the version of globalize for ActiveRecord 4.0 or 4.1, specify:
 
 ```ruby
@@ -80,19 +97,24 @@ and `drop_translation_table!` inside the `change` instance method.
 
 ### Creating translation tables
 
-***Do not use the `change` method, use `up` and `down`!***
+Also note that before you can create a translation table, you have to define the translated attributes via `translates` in your model as shown above.
 
 ```ruby
 class CreatePosts < ActiveRecord::Migration
-  def up
+  def change
     create_table :posts do |t|
       t.timestamps
     end
-    Post.create_translation_table! :title => :string, :text => :text
-  end
-  def down
-    drop_table :posts
-    Post.drop_translation_table!
+
+    reversible do |dir|
+      dir.up do
+        Post.create_translation_table! :title => :string, :text => :text
+      end
+
+      dir.down do
+        Post.drop_translation_table!
+      end
+    end
   end
 end
 ```
@@ -101,16 +123,21 @@ Also, you can pass options for specific columns. Here’s an example:
 
 ```ruby
 class CreatePosts < ActiveRecord::Migration
-  def up
+  def change
     create_table :posts do |t|
       t.timestamps
     end
-    Post.create_translation_table! :title => :string,
-      :text => {:type => :text, :null => false, :default => 'abc'}
-  end
-  def down
-    drop_table :posts
-    Post.drop_translation_table!
+
+    reversible do |dir|
+      dir.up do
+        Post.create_translation_table! :title => :string,
+          :text => {:type => :text, :null => false, :default => 'abc'}
+      end
+
+      dir.down do
+        Post.drop_translation_table!
+      end
+    end
   end
 end
 ```
@@ -130,6 +157,31 @@ model's attributes as they were before the translation was applied. Here's an
 example (which assumes you already have a model called `Post` and its table
 exists):
 
+```ruby
+class TranslatePosts < ActiveRecord::Migration
+  def change
+    reversible do |dir|
+      dir.up do
+        Post.create_translation_table!({
+          :title => :string,
+          :text => :text
+        }, {
+          :migrate_data => true
+        })
+      end
+
+      dir.down do
+        Post.drop_translation_table! :migrate_data => true
+      end
+    end
+  end
+end
+```
+
+NOTE: Make sure you drop the translated columns from the parent table after all your data is safely migrated.
+
+To automatically remove the translated columns from the parent table after the data migration, please use option `remove_source_columns`.
+
 ```ruby
 class TranslatePosts < ActiveRecord::Migration
   def self.up
@@ -137,7 +189,8 @@ class TranslatePosts < ActiveRecord::Migration
       :title => :string,
       :text => :text
     }, {
-      :migrate_data => true
+      :migrate_data => true,
+      :remove_source_columns => true
     })
   end
 
@@ -147,7 +200,19 @@ class TranslatePosts < ActiveRecord::Migration
 end
 ```
 
-NOTE: Make sure you drop the translated columns from the parent table after all your data is safely migrated.
+
+In order to use a specific locale for migrated data, you can use `I18n.with_locale`:
+
+```ruby
+    I18n.with_locale(:bo) do
+      Post.create_translation_table!({
+        :title => :string,
+        :text => :text
+      }, {
+        :migrate_data => true
+      })
+    end
+```
 
 ## Adding additional fields to the translation table
 
@@ -155,12 +220,16 @@ In order to add a new field to an existing translation table, you can use `add_t
 
 ```ruby
 class AddAuthorToPost < ActiveRecord::Migration
-  def up
-    Post.add_translation_fields! author: :text
-  end
-
-  def down
-    remove_column :post_translations, :author
+  def change
+    reversible do |dir|
+      dir.up do
+        Post.add_translation_fields! author: :text
+      end
+
+      dir.down do
+        remove_column :post_translations, :author
+      end
+    end
   end
 end
 ```
@@ -176,6 +245,24 @@ Because globalize uses the `:locale` key to specify the locale during
 mass-assignment, you should avoid having a `locale` attribute on the parent
 model.
 
+If you like your translated model to update if a translation changes, use the `touch: true` option together with `translates`:
+
+```ruby
+  translates :name, touch: true
+```
+
+## Known Issues
+
+If you're getting the `ActiveRecord::StatementInvalid: PG::NotNullViolation: ERROR: null value in column "column_name" violates not-null constraint` error, the only known way to deal with it as of now is to remove not-null constraint for the globalized columns:
+
+```ruby
+class RemoveNullConstraintsFromResourceTranslations < ActiveRecord::Migration
+  def change
+    change_column_null :resource_translations, :column_name, true
+  end
+end
+```
+
 ## Versioning with Globalize
 
 See the [globalize-versioning](https://github.com/globalize/globalize-versioning) gem.
@@ -327,23 +414,29 @@ def cache_key
 end
 ```
 
+## Thread-safety
+
+Globalize uses [request_store](https://github.com/steveklabnik/request_store) gem to clean up thread-global variable after every request.
+RequestStore includes a Railtie that will configure everything properly for Rails 3+ apps.
+
+If you're not using Rails, you may need to consult a RequestStore's [README](https://github.com/steveklabnik/request_store#no-rails-no-problem) to configure it.
+
+## Tutorials and articles
+* [Go Global with Rails and I18n](http://www.sitepoint.com/go-global-rails-i18n/) - introductory article about i18n in Rails (Ilya Bodrov)
+
 ## Official Globalize extensions
 
-* [globalize-accessors](https://github.com/globalize/globalize-accessors) - Replacement for [easy_globalize_3_accessors](https://github.com/paneq/easy_globalize3_accessors) compatible with Globalize 3.x and 4.x.
-* [globalize-versioning](https://github.com/globalize/globalize-versioning) - Versioning support for using Globalize with [`paper_trail`](https://github.com/airblade/paper_trail).
+* [globalize-accessors](https://github.com/globalize/globalize-accessors) - generator of accessor methods for models. *(e.g. title_en, title_cz)*
+* [globalize-versioning](https://github.com/globalize/globalize-versioning) - versioning support for using Globalize with [`paper_trail`](https://github.com/airblade/paper_trail). (compatible with Globalize 3.x and 4.x)
 
-## Alternative Solutions
+## Alternative solutions
 
-* [Veger's fork](http://github.com/veger/globalize2) - uses default AR schema for the default locale, delegates to the translations table for other locales only
-* [TranslatableColumns](http://github.com/iain/translatable_columns) - have multiple languages of the same attribute in a model (Iain Hecker)
-* [Traco](https://github.com/barsoom/traco) - A newer take on using multiple columns in the same model (Barsoom)
-* [localized_record](http://github.com/glennpow/localized_record) - allows records to have localized attributes without any modifications to the database (Glenn Powell)
-* [model_translations](http://github.com/janne/model_translations) - Minimal implementation of Globalize2 style model translations (Jan Andersson)
-* [hstore_translate](http://github.com/robworley/hstore_translate) - Rails I18n library for ActiveRecord model/data translation using PostgreSQL's hstore datatype (Rob Worley)
+* [Traco](https://github.com/barsoom/traco) - use multiple columns in the same model (Barsoom)
+* [Mobility](https://github.com/shioyama/mobility) - pluggable translation framework supporting many strategies, including translatable columns, translation tables and hstore/jsonb (Chris Salzberg)
+* [hstore_translate](https://github.com/cfabianski/hstore_translate) - use PostgreSQL's hstore datatype to store translations, instead of separate translation tables (Cédric Fabianski)
+* [json_translate](https://github.com/cfabianski/json_translate) - use PostgreSQL's json/jsonb datatype to store translations, instead of separate translation tables (Cédric Fabianski)
+* [Trasto](https://github.com/yabawock/trasto) - store translations directly in the model in a Postgres Hstore column
 
 ## Related solutions
 
-* [globalize2_versioning](http://github.com/joshmh/globalize2_versioning) - acts_as_versioned style versioning for globalize2 (Joshua Harvey)
-* [i18n_multi_locales_validations](http://github.com/ZenCocoon/i18n_multi_locales_validations) - multi-locales attributes validations to validates attributes from globalize2 translations models (Sébastien Grosjean)
-* [migrate_from_globalize1](http://gist.github.com/120867) - migrate model translations from Globalize1 to globalize2 (Tomasz Stachewicz)
-* [batch_translations](http://github.com/rilla/batch_translations) - allow saving multiple globalize2 translations in the same request (Jose Alvarez Rilla)
+* [friendly_id-globalize](https://github.com/norman/friendly_id-globalize) - lets you use Globalize to translate slugs (Norman Clarke)

data/Rakefile

@@ -20,3 +20,36 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :load_path do
+  %w(lib test).each do |path|
+    $LOAD_PATH.unshift(File.expand_path("../#{path}", __FILE__))
+  end
+end
+
+namespace :db do
+  desc 'Create the database'
+  task :create => :load_path do
+    require 'support/database'
+
+    Globalize::Test::Database.create!
+  end
+
+  desc "Drop the database"
+  task :drop => :load_path do
+    require 'support/database'
+
+    Globalize::Test::Database.drop!
+  end
+
+  desc "Set up the database schema"
+  task :migrate => :load_path do
+    require 'support/database'
+
+    Globalize::Test::Database.migrate!
+    # ActiveRecord::Schema.migrate :up
+  end
+
+  desc "Drop and recreate the database schema"
+  task :reset => [:drop, :create]
+end

data/lib/globalize/active_record/act_macro.rb

@@ -5,6 +5,7 @@ module Globalize
         options = attr_names.extract_options!
         # Bypass setup_translates! if the initial bootstrapping is done already.
         setup_translates!(options) unless translates?
+        check_columns!(attr_names)
 
         # Add any extra translatable attributes.
         attr_names = attr_names.map(&:to_sym)
@@ -38,6 +39,30 @@ module Globalize
           # Add attribute to the list.
           self.translated_attribute_names << attr_name
         end
+
+        begin
+          if ::ActiveRecord::VERSION::STRING > "5.0" && table_exists? &&translation_class.table_exists?
+            self.ignored_columns += translated_attribute_names.map(&:to_s)
+            reset_column_information
+          end
+        rescue ::ActiveRecord::NoDatabaseError
+          warn 'Unable to connect to a database. Globalize skipped ignoring columns of translated attributes.'
+        end
+      end
+
+      def check_columns!(attr_names)
+        # If tables do not exist or Rails version is greater than 5, do not warn about conflicting columns
+        return unless ::ActiveRecord::VERSION::STRING < "5.0" && table_exists? && translation_class.table_exists?
+        if (overlap = attr_names.map(&:to_s) & column_names).present?
+          ActiveSupport::Deprecation.warn(
+            ["You have defined one or more translated attributes with names that conflict with column(s) on the model table. ",
+             "Globalize does not support this configuration anymore, remove or rename column(s) on the model table.\n",
+             "Model name (table name): #{model_name} (#{table_name})\n",
+             "Attribute name(s): #{overlap.join(', ')}\n"].join
+          )
+        end
+      rescue ::ActiveRecord::NoDatabaseError
+        warn 'Unable to connect to a database. Globalize skipped checking attributes with conflicting column names.'
       end
 
       def apply_globalize_options(options)
@@ -74,10 +99,11 @@ module Globalize
                                 :foreign_key => options[:foreign_key],
                                 :dependent   => :destroy,
                                 :extend      => HasManyExtensions,
-                                :autosave    => false
+                                :autosave    => true,
+                                :inverse_of  => :globalized_model
 
-        after_create :save_translations!
-        after_update :save_translations!
+        before_create :save_translations!
+        before_update :save_translations!
       end
     end