globalize 6.0.0.alpha.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb12d7f3b6c17018cefe1614dfba6b585ba169ef2ca412b58d230ccabf778033
-  data.tar.gz: ac44f2e8a75b53ad116b8674d1f5c3d47a122c9782133e3853359217fb944375
+  metadata.gz: 7501e626a9b5bfd187c9db3d0b5a809351308d7783c606a486cb9dab2a7d1649
+  data.tar.gz: f3661b320279e118f396356680dceaa12d322495d823978a1b89d9628ec712de
 SHA512:
-  metadata.gz: 2f358f026bc47645ae8751cb3b2a3a7660cfbbb64c6c37e2ab2b46a9b548de357ba0e8a8880eb82326ce78c6e7605c31fbf27726d645b33baa62c594bace13b5
-  data.tar.gz: 185fbeea91d8fda53c23232897deba40ad149fbea99c329a32aa8d9bbd7c296c4b9a5a814ced76d39785969d8503011f9316bc600a07de7e82b1a03fe0c3a76a
+  metadata.gz: 525c265c86c7ed85a78dea1c721c20f98db1b74cf23bb49453e5677c3ee4605e18fe708d1e1f77723b784f5d98f717181f154c7cd664fe54236756711149881a
+  data.tar.gz: 25e5300ccf2279af73d7e8df8c2ffd5f23a616a3d1fbb3c6289dff82182277b4e045a7ca1443643b44f78f9d0ac2cb5a188ebe9a7e455dd2cbb700d0dc857939

data.tar.gz.sig

@@ -0,0 +1 @@
+?$��ʀ�th1�7J����a/[��4a��jZ�X==�k����At��P�luU@'�~�=����+����ef>m�O�~)�����-)�z�,��q�nM��6iŨ��7_�G�5"2ɳx�A��

data/Appraisals

@@ -1,15 +1,35 @@
 # frozen_string_literal: true
 
 RAILS_VERSIONS = %w[
-  4.2.10
-  5.1.6
-  5.2.1
+  4.2.11.3
+  5.1.7
+  5.2.4.4
+  6.0.3.4
+  6.1.0
 ]
 
 RAILS_VERSIONS.each do |version|
   appraise "rails_#{version}" do
     gem 'activemodel', version
     gem 'activerecord', version
+    
+    if version =~ /^6/
+      gem 'sqlite3', '~> 1.4', platforms: [:ruby, :rbx]
+    elsif version =~ /^5/
+      gem 'sqlite3', '~> 1.3', '>= 1.3.6', platforms: [:ruby, :rbx]
+    else version =~ /^4/
+      gem 'sqlite3', '~> 1.3.6', platforms: [:ruby, :rbx]
+    end
+
+    if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])
+      group :postgres, :postgresql do
+        if version =~ /^4/
+          gem 'pg', '< 1.0', platforms: [:ruby, :rbx]
+        else
+          gem 'pg', '~> 1.1', platforms: [:ruby, :rbx]
+        end
+      end
+    end
 
     platforms :rbx do
       gem "rubysl", "~> 2.0"

data/CHANGELOG.md

@@ -3,7 +3,8 @@
 ## Unreleased
 
 * Add `create_source_columns` option for migrations. [#715](https://github.com/globalize/globalize/pull/715) by [IlyasValiullov](https://github.com/IlyasValiullov)
-* Autosave is now configurable, but defaults to false. [#736](https://github.com/globalize/globalize/pull/736) by [James Hart](https://github.com/hjhart) 
+* Autosave is now configurable, but defaults to false. [#736](https://github.com/globalize/globalize/pull/736) by [James Hart](https://github.com/hjhart)
+* Fix foreign keys translation. [#769](https://github.com/globalize/globalize/pull/769) by [Sergey Tokarenko](https://github.com/stokarenko)
 
 ## 5.3.0 (2019-05-14)
 

data/README.md

@@ -12,6 +12,11 @@ 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.
 
+## Current state of the gem
+
+Globalize is not very actively maintained. Pull Requests are welcome, especially for compatibility with new versions of Rails, but none of the maintainers actively use Globalize anymore. If you need a more actively maintained model translation gem, we recommend checking out [Mobility](https://github.com/shioyama/mobility), a natural successor of Globalize created by Chris Salzberg (one of Globalize maintainers) and inspired by the ideas discussed around Globalize. For a more up-to-date discussion of the current situation, see [issue #753](https://github.com/globalize/globalize/issues/753).
+
+
 ## Requirements
 
 * ActiveRecord >= 4.2.0 (see below for installation with ActiveRecord 3.x)

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,37 @@
+# frozen_string_literal: true
+
+require_relative 'lib/globalize/version'
+
+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.required_ruby_version = '>= 2.4.6'
+
+  s.add_dependency 'activerecord', '>= 4.2', '< 7.0'
+  s.add_dependency 'activemodel', '>= 4.2', '< 7.0'
+  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.cert_chain = [File.expand_path('certs/parndt.pem', __dir__)]
+  if $PROGRAM_NAME =~ /gem\z/ && ARGV.include?('build') && ARGV.include?(__FILE__)
+    s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
+  end
+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

@@ -66,6 +66,14 @@ module Globalize
       ::ActiveRecord.version >= Gem::Version.new('5.2.0')
     end
 
+    def rails_6?
+      ::ActiveRecord.version >= Gem::Version.new('6.0.0')
+    end
+
+    def rails_61?
+      ::ActiveRecord.version >= Gem::Version.new('6.1.0')
+    end
+
   protected
 
     def read_locale

data/lib/globalize/active_record/adapter_dirty.rb

@@ -41,11 +41,17 @@ module Globalize
         self.dirty = {}
       end
 
-      def _reset_attribute name
-        original_value = record.changed_attributes[name]
-        record.send(:clear_attribute_changes, [name])
-        record.send("#{name}=", original_value)
-        record.send(:clear_attribute_changes, [name])
+      if Globalize.rails_6?
+        def _reset_attribute name
+          record.send(:clear_attribute_changes, [name])
+        end
+      else
+        def _reset_attribute 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
       end
 
       def reset
@@ -53,6 +59,30 @@ module Globalize
         super
       end
 
+      def changed_attributes(locale)
+        Hash[changes(locale).map { |name, change| [name, change.first] }]
+      end
+
+      def changed
+        stash.keys.flat_map { |locale| changes(locale).keys }.uniq
+      end
+
+      def changes(locale)
+        stash[locale].keys.inject({}) do |hash, name|
+          next hash unless dirty[name].is_a?(Hash)
+          next hash unless dirty[name].key?(locale)
+
+          new_value = stash[locale][name]
+          old_value = dirty[name][locale]
+
+          unless new_value == old_value
+            hash[name] = [old_value, new_value]
+          end
+
+          hash
+        end
+      end
+
     end
   end
 end

data/lib/globalize/active_record/instance_methods.rb

@@ -66,7 +66,7 @@ module Globalize
       end
 
       def _read_attribute(attr_name, options = {}, &block)
-        translated_value = read_translated_attribute(attr_name, options, &block)
+        translated_value = read_translated_attribute(attr_name, options)
         translated_value.nil? ? super(attr_name, &block) : translated_value
       end
 
@@ -185,6 +185,20 @@ module Globalize
         changed_attributes.present? || translations.any?(&:changed?)
       end
 
+      if Globalize.rails_6?
+        def changed_attributes
+          super.merge(globalize.changed_attributes(::Globalize.locale))
+        end
+
+        def changes
+          super.merge(globalize.changes(::Globalize.locale))
+        end
+
+        def changed
+          super.concat(globalize.changed).uniq
+        end
+      end
+
       # need to access instance variable directly since changed_attributes
       # is frozen as of Rails 4.2
       def original_changed_attributes
@@ -236,10 +250,7 @@ module Globalize
         return nil unless options[:translated]
         return nil unless translated?(name)
 
-        value = globalize.fetch(options[:locale] || Globalize.locale, name)
-        return nil if value.nil?
-
-        block_given? ? yield(value) : value
+        globalize.fetch(options[:locale] || Globalize.locale, name)
       end
     end
   end

data/lib/globalize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Globalize
-  Version = '6.0.0.alpha.1'
+  Version = '6.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Sven Fuchs
@@ -11,10 +11,36 @@ authors:
 - Tomasz Stachewicz
 - Philip Arndt
 - Chris Salzberg
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEMjCCApqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhnZW1z
+  L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMjAwNTEwMjIxOTQ2WhcNMjEwNTEwMjIx
+  OTQ2WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G
+  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDT+JzHYPGMYJt9ct2DCsbIymn1uJJp
+  HnDkQESfsGe40jTC90oF2iVbVOkaacNc1N3CSWUZvZjuygUuS86P6/kpBILGdO2+
+  bkXXKtfGC2YGGx9TdNLpCb4925vQHvdFeKXGpQDZdDw1SNC6zraZou47CvOE1cl2
+  Bp+1QMZuGRZ4+5CzOEWDWurjqce3O1jUEbyBB7z5H0h/YEaxfXipxhL1Dhi0sgkH
+  qP/e6SxzifdifdZCksJFQ06a1ji9hJY6eM23qbv/aaluVHAZSVBAQBS7rYniLo+N
+  G4vpFhoubQO5u8UluUtCaPUpI/qOvVcSaZn3ZkzlMwC8b1RwAeXBQmtFE2wnrv2i
+  ovTwoN7rHchwhgaHbkuFh4Wr92wGbrWL7J+X8rWKk1f8RF4kvtNE/NA6YrkxTpVh
+  QMyDmekt7rTxvcq2NneLGroWIUVCx/JID+Jw492LKQ6Sl1/P2TRzdEDtqZAZL0gt
+  xlWeMUfGG2D/gLnhs5qnaFaWQwGTmBnTgHcCAwEAAaNxMG8wCQYDVR0TBAIwADAL
+  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEqtAyQVxPgKsrgoTQ1YmaIu/fmvMBoGA1Ud
+  EQQTMBGBD2dlbXNAcC5hcm5kdC5pbzAaBgNVHRIEEzARgQ9nZW1zQHAuYXJuZHQu
+  aW8wDQYJKoZIhvcNAQELBQADggGBALu2HM50B8xqlAXkCwavJDvWWtV9pG1igFUg
+  friZRWprUQ5nTaNmAd8p8qbJQwaIK2gt+DfYWfB9LtKnQTfbhLRBbmJ7zYw8LjKY
+  PwCs4RWjDAiuyCO3ppfsz+1bsMUXPLgWlaUkXsUy3nr2NruEFTO9zu3wGYQQ93Tt
+  vYSHOnP35UB4QjsjNrOO7FBaQfy6O909PP+GnVcJ62s9c26voJz63RSolwY7Jydw
+  XUlG68jjJKSoDHRzVTmNB7sX8rs8P2kvYkpIUXPHyls3mWBWjBWbdEYWESZrxI2x
+  dS7jY3AnfqhvsWra2pSREb2IDqPnJrHVOejnEI/zuuufUxLwDx3AC6SMdsyWkZ7V
+  9OmLt2rg75Sct6h2220lO5ySqYtqAXuOMBDGv5L0zLalx1g8LACA7uILTKVWh8B8
+  Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX
+  /HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
+  -----END CERTIFICATE-----
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -192,10 +218,12 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- docker-compose.yml
+- globalize.gemspec
+- issue_template.rb
 - lib/globalize.rb
 - lib/globalize/active_record.rb
 - lib/globalize/active_record/act_macro.rb
@@ -228,7 +256,7 @@ homepage: http://github.com/globalize/globalize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -239,12 +267,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation
 test_files: []

data/Gemfile.lock

@@ -1,80 +0,0 @@
-PATH
-  remote: .
-  specs:
-    globalize (5.3.0)
-      activemodel (>= 4.2, < 6.1)
-      activerecord (>= 4.2, < 6.1)
-      request_store (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activesupport (6.0.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    ansi (1.5.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    builder (3.2.4)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    database_cleaner (1.8.2)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    m (1.5.1)
-      method_source (>= 0.6.7)
-      rake (>= 0.9.2.2)
-    method_source (0.9.2)
-    minitest (5.14.0)
-    minitest-reporters (1.4.2)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    mysql2 (0.5.3)
-    pg (0.21.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.2.2)
-    rake (13.0.1)
-    rdoc (6.2.1)
-    request_store (1.5.0)
-      rack (>= 1.4)
-    ruby-progressbar (1.10.1)
-    sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  database_cleaner
-  globalize!
-  m
-  minitest
-  minitest-reporters
-  mysql2
-  pg (< 1.0)
-  pry
-  rake
-  rdoc
-  sqlite3
-
-BUNDLED WITH
-   2.1.4