globalize 5.1.0.beta1 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a08ebfb553ad5faf8e55d1b120bbafd8571327e2
-  data.tar.gz: b30cca9abefcb65933dcbff2ace3040f40cbfea7
+SHA256:
+  metadata.gz: 93f476f456eba6a50a3bda3d639ae4e4cc7d190d4b846a6534b26b1571dff968
+  data.tar.gz: 10d20462ade18061edc4facf99f4e23c58b7855e4121e5f0f2d29ab5eb36eb24
 SHA512:
-  metadata.gz: ead976f8983d5477cce5d9e518f48997c7fdedb3abd057a79946fda0828943672069e286c3c9deff5d5ef53f8faebf24a3081f4e4bb323f9e9e5375fe95af5a8
-  data.tar.gz: 7dd8d873d8492109cffa6561d6a57829f8b7d737f8125dd200a853ac11bcb6f8774c615b5cdd3c024223d81a6841c1c0d9d79481f6a77c11328d4ad363e9c4de
+  metadata.gz: 40ca71b7fefb3b4de28f8b6ae08c10fa6c8172cf69e86e18d3ab9166625f41a1ed15c4e4dd53977ff90a7dab4297577ab26a80de130fe58628fb67b0003be54b
+  data.tar.gz: 7e5c4637c7f29d92d69ff704fec7d3c71d409c9f27c321df3807055471135877470b37dce6b0daceb68fad96c160e3dd031bf75e1df743acc76156d35f46ccfb

data/Appraisals

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+RAILS_VERSIONS = %w[
+  4.2.10
+  5.1.6
+  5.2.1
+]
+
+RAILS_VERSIONS.each do |version|
+  appraise "rails_#{version}" do
+    gem 'activemodel', version
+    gem 'activerecord', version
+
+    platforms :rbx do
+      gem "rubysl", "~> 2.0"
+      gem "rubinius-developer_tools"
+    end
+
+    platforms :jruby do
+      if !ENV['TRAVIS'] || ENV['DB'] == 'sqlite3'
+        gem 'activerecord-jdbcsqlite3-adapter', '~> 1'
+      end
+
+      if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+        gem 'activerecord-jdbcmysql-adapter', '~> 1'
+      end
+
+      if !ENV['TRAVIS'] || %w(postgres postgresql).include?(ENV['DB'])
+        gem 'activerecord-jdbcpostgresql-adapter', '~> 1'
+      end
+    end
+  end
+end

data/CHANGELOG.md

@@ -1,6 +1,27 @@
 # Globalize Changelog
 
-## 5.1.0 (unreleased)
+## 5.3.1 (2021-01-11)
+
+* Fix foreign keys translation. [#773](https://github.com/globalize/globalize/pull/773) by [Sergey Tokarenko](https://github.com/stokarenko)
+
+## 5.3.0 (2019-05-14)
+
+* Prevent 'SystemStackError: stack level too deep' error on attribute reset. [#722](https://github.com/globalize/globalize/pull/722) by [Reinier de Lange](https://github.com/moiristo)
+* Pass the `:limit` option for the FK column. [#721](https://github.com/globalize/globalize/pull/721) by [Denis Demchenko](https://github.com/lancedikson)
+* Add support for Rails 6.0. [#718](https://github.com/globalize/globalize/pull/718) by [Chrıs Seelus](https://github.com/cseelus)
+* FIX: stop registering the attr for Rails 4.2. [#711](https://github.com/globalize/globalize/pull/711) by [Adam Fernung](https://github.com/akfernun)
+
+## 5.2.0 (2018-11-02)
+
+* Add support for translated attributes to other QueryMethods and Calculations [#707](https://github.com/globalize/globalize/pull/707) by [kreintjes](https://github.com/kreintjes)
+* Fix `read_attribute` for Rails changes. [#709](https://github.com/globalize/globalize/pull/709) by [ota42y](https://github.com/ota42y) and [nabuchi](https://github.com/nabuchi)
+* Support array as an argument of order. [#675](https://github.com/globalize/globalize/pull/675) by [Maicol Bentancor](https://github.com/MaicolBen)
+* `_reset_attribute` bugfix. [#674](https://github.com/globalize/globalize/pull/674) by [ota42y](https://github.com/ota42y)
+* Add support for Rails 5.2 [#678](https://github.com/globalize/globalize/pull/678) by [kevin-jj](https://github.com/kevin-jj)
+* Fix: wrong number of arguments for ActiveRecord 'attribute' method [#671](https://github.com/globalize/globalize/pull/671) by [Evgeny Danilov](https://github.com/jmelkor)
+* Resolve deprecation warning: attribute is not an attribute known to Active Record. [#629](https://github.com/globalize/globalize/pull/629) by [Michael Rüffer](https://github.com/itschn)
+
+## 5.1.0 (2018-01-15)
 
 * 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)

data/CONTRIBUTING.md

@@ -35,3 +35,18 @@ Have a bug fix, code improvement or proposed feature? Do the following:
 For pull requests to Rails/ActiveRecord 4 version of Globalize (v3.x), post to the `master` branch. For pull requests to the Rails/ActiveRecord 3.x version of Globalize (3.x), post to the `3-0-stable` branch.
 
 When you submit the pull request, Travis CI will run the [test suite](https://travis-ci.org/globalize/globalize) against your branch and will highlight any failures. Unless there is a good reason for it, we do not generally accept pull requests that take Globalize from green to red.
+
+## Testing
+
+### Requirements
+
+- Ruby
+- Bundler
+- SQLite
+    - You can switch the database by adding an environment variable. See `test/support/database.rb`.
+    - You can also configure your database configurations. See `test/support/database.yml`.
+
+### Run tests on your local machine
+
+- `bundle install`
+- `bundle exec rake`

data/Gemfile

@@ -1,26 +1,3 @@
-  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 "rubinius-developer_tools"
-end
-
-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/README.md

@@ -1,6 +1,7 @@
 ![Globalize](http://globalize.github.io/globalize/images/globalize.png)
 
 [![Build Status](https://travis-ci.org/globalize/globalize.svg?branch=master)](https://travis-ci.org/globalize/globalize) [![Code Climate](https://codeclimate.com/github/globalize/globalize.svg)](https://codeclimate.com/github/globalize/globalize)
+[![Open Source Helpers](https://www.codetriage.com/globalize/globalize/badges/users.svg)](https://www.codetriage.com/globalize/globalize)
 
 You can chat with us using Gitter:
 
@@ -27,10 +28,10 @@ gem install globalize
 When using bundler put this in your Gemfile:
 
 ```ruby
-gem 'globalize', '~> 5.0.0'
+gem 'globalize', '~> 5.1.0'
 ```
 
-You have to use branch **master** to work with Rails 5.
+Please help us by letting us know what works, and what doesn't, when using pre-release code.
 
 Put in your Gemfile
 
@@ -239,14 +240,20 @@ 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 RemoveNullConstraintsFromResources < ActiveRecord::Migration
+class RemoveNullConstraintsFromResourceTranslations < ActiveRecord::Migration
   def change
-    change_column_null :resources, :column_name, true
+    change_column_null :resource_translations, :column_name, true
   end
 end
 ```
@@ -264,6 +271,9 @@ You can enable them by adding the next line to `config/application.rb` (or only
 `config/environments/production.rb` if you only want them in production)
 
 ```ruby
+# For version 1.1.0 and above of the `i18n` gem:
+config.i18n.fallbacks = [I18n.default_locale]
+# Below version 1.1.0 of the `i18n` gem:
 config.i18n.fallbacks = true
 ```
 

data/docker-compose.yml

@@ -0,0 +1,22 @@
+version: '3.7'
+services:
+  postgres:
+    image: postgres:11
+    volumes:
+      - ./tmp/postgres:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: ""
+  mysql:
+    image: mysql:8.0
+    volumes:
+      - ./tmp/mysql:/var/lib/mysql
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_USER: "root"
+      MYSQL_PASSWORD: ""
+      MYSQL_ROOT_PASSWORD: ""
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"

data/globalize.gemspec

@@ -0,0 +1,32 @@
+require File.expand_path('../lib/globalize/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name         = 'globalize'
+  s.version      = Globalize::Version
+  s.authors      = ['Sven Fuchs', 'Joshua Harvey', 'Clemens Kofler', 'John-Paul Bader', 'Tomasz Stachewicz', 'Philip Arndt', 'Chris Salzberg']
+  s.email        = 'nobody@globalize-rails.org'
+  s.homepage     = 'http://github.com/globalize/globalize'
+  s.summary      = 'Rails I18n de-facto standard library for ActiveRecord model/data translation'
+  s.description  = "#{s.summary}."
+  s.license      = "MIT"
+
+  s.files        = Dir['{lib/**/*,[A-Z]*}']
+  s.platform     = Gem::Platform::RUBY
+  s.require_path = 'lib'
+  s.rubyforge_project = '[none]'
+  s.required_ruby_version = '>= 2.4.6'
+
+  s.add_dependency 'activerecord', '>= 4.2', '< 6.1'
+  s.add_dependency 'activemodel', '>= 4.2', '< 6.1'
+  s.add_dependency 'request_store', '~> 1.0'
+
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'm'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest-reporters'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'sqlite3'
+end

data/issue_template.rb

@@ -0,0 +1,38 @@
+# Activate the gem you are reporting the issue against.
+gem 'activerecord', '4.2.0'
+gem 'globalize', '5.0.1'
+require 'active_record'
+require 'globalize'
+require 'minitest/autorun'
+require 'logger'
+
+# Ensure backward compatibility with Minitest 4
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
+
+# This connection will do for database-independent bug reports.
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+ActiveRecord::Schema.define do
+  create_table :posts, force: true do |t|
+  end
+
+  create_table :post_translations, force: true do |t|
+    t.references :post
+    t.string     :title
+    t.text       :content
+    t.string     :locale
+  end
+end
+
+class Post < ActiveRecord::Base
+  translates :content, :title
+end
+
+class BugTest < Minitest::Test
+  def test_association_stuff
+    post = Post.create!(title: 'HI')
+
+    assert_equal 'HI', post.title
+  end
+end

data/lib/globalize.rb

@@ -58,6 +58,14 @@ module Globalize
       RequestStore.store
     end
 
+    def rails_5?
+      ::ActiveRecord.version >= Gem::Version.new('5.1.0')
+    end
+
+    def rails_52?
+      ::ActiveRecord.version >= Gem::Version.new('5.2.0')
+    end
+
   protected
 
     def read_locale
@@ -84,7 +92,7 @@ module Globalize
   end
 end
 
-ActiveRecord::Base.mattr_accessor :globalize_serialized_attributes, instance_writer: false
+ActiveRecord::Base.class_attribute :globalize_serialized_attributes, instance_writer: false
 ActiveRecord::Base.globalize_serialized_attributes = {}
 
 ActiveRecord::Base.extend(Globalize::ActiveRecord::ActMacro)

data/lib/globalize/active_record.rb

@@ -1,14 +1,14 @@
 module Globalize
   module ActiveRecord
-    autoload :ActMacro,        'globalize/active_record/act_macro'
-    autoload :Adapter,         'globalize/active_record/adapter'
-    autoload :AdapterDirty,    'globalize/active_record/adapter_dirty'
-    autoload :Attributes,      'globalize/active_record/attributes'
-    autoload :ClassMethods,    'globalize/active_record/class_methods'
-    autoload :Exceptions,      'globalize/active_record/exceptions'
-    autoload :InstanceMethods, 'globalize/active_record/instance_methods'
-    autoload :Migration,       'globalize/active_record/migration'
-    autoload :Translation,     'globalize/active_record/translation'
-    autoload :QueryMethods,    'globalize/active_record/query_methods'
+    autoload :ActMacro,                     'globalize/active_record/act_macro'
+    autoload :Adapter,                      'globalize/active_record/adapter'
+    autoload :AdapterDirty,                 'globalize/active_record/adapter_dirty'
+    autoload :Attributes,                   'globalize/active_record/attributes'
+    autoload :ClassMethods,                 'globalize/active_record/class_methods'
+    autoload :Exceptions,                   'globalize/active_record/exceptions'
+    autoload :InstanceMethods,              'globalize/active_record/instance_methods'
+    autoload :Migration,                    'globalize/active_record/migration'
+    autoload :Translation,                  'globalize/active_record/translation'
+    autoload :TranslatedAttributesQuery,    'globalize/active_record/translated_attributes_query'
   end
 end

data/lib/globalize/active_record/act_macro.rb

@@ -40,16 +40,19 @@ module Globalize
           self.translated_attribute_names << attr_name
         end
 
-        if ::ActiveRecord::VERSION::STRING > "5.0" && table_exists? && translation_class.table_exists?
-          self.ignored_columns += translated_attribute_names.map(&:to_s)
-          reset_column_information
+        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, do not warn about conflicting columns
-        return unless table_exists? && translation_class.table_exists?
-
+        # 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. ",
@@ -58,6 +61,8 @@ module Globalize
              "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)
@@ -94,11 +99,11 @@ module Globalize
                                 :foreign_key => options[:foreign_key],
                                 :dependent   => :destroy,
                                 :extend      => HasManyExtensions,
-                                :autosave    => true,
+                                :autosave    => false,
                                 :inverse_of  => :globalized_model
 
-        before_create :save_translations!
-        before_update :save_translations!
+        after_create :save_translations!
+        after_update :save_translations!
       end
     end
 

data/lib/globalize/active_record/adapter.rb

@@ -43,6 +43,9 @@ module Globalize
             value = value.val if value.is_a?(Arel::Nodes::Casted)
             translation[name] = value
           end
+
+          ensure_foreign_key_for(translation)
+          translation.save!
         end
 
         reset
@@ -54,6 +57,12 @@ module Globalize
 
       protected
 
+      # Sometimes the translation is initialised before a foreign key can be set.
+      def ensure_foreign_key_for(translation)
+        # AR >= 4.1 reflections renamed to _reflections
+        translation[translation.class.reflections.stringify_keys["globalized_model"].foreign_key] = record.id
+      end
+
       def type_cast(name, value)
         return value.presence unless column = column_for_attribute(name)
 

data/lib/globalize/active_record/adapter_dirty.rb

@@ -36,19 +36,23 @@ module Globalize
           dirty[name][locale] = old
         end
       end
+
       def clear_dirty
         self.dirty = {}
       end
 
       def _reset_attribute name
-        record.send("#{name}=", record.changed_attributes[name])
-        record.original_changed_attributes.except!(name)
+        original_value = record.changed_attributes[name]
+        record.send(:clear_attribute_changes, [name])
+        record.send("#{name}=", original_value)
+        record.send(:clear_attribute_changes, [name])
       end
 
       def reset
         clear_dirty
         super
       end
+
     end
   end
 end

data/lib/globalize/active_record/class_methods.rb

@@ -56,7 +56,11 @@ module Globalize
             klass = self.const_set(:Translation, Class.new(Globalize::ActiveRecord::Translation))
           end
 
-          klass.belongs_to :globalized_model, :class_name => self.name, :foreign_key => translation_options[:foreign_key], inverse_of: :translations
+          klass.belongs_to :globalized_model,
+            class_name: self.name,
+            foreign_key: translation_options[:foreign_key],
+            inverse_of: :translations,
+            touch: translation_options.fetch(:touch, false)
           klass
         end
       end
@@ -72,10 +76,10 @@ module Globalize
       private
 
       # Override the default relation method in order to return a subclass
-      # of ActiveRecord::Relation with custom finder methods for translated
-      # attributes.
+      # of ActiveRecord::Relation with custom finder and calculation methods
+      # for translated attributes.
       def relation
-        super.extending!(QueryMethods)
+        super.extending!(TranslatedAttributesQuery)
       end
 
       protected
@@ -116,6 +120,7 @@ module Globalize
       end
 
       def define_translations_accessor(name)
+        attribute(name, ::ActiveRecord::Type::Value.new) if ::ActiveRecord::VERSION::STRING >= "5.0"
         define_translations_reader(name)
         define_translations_writer(name)
       end