globalize 5.3.1 → 6.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f476f456eba6a50a3bda3d639ae4e4cc7d190d4b846a6534b26b1571dff968
-  data.tar.gz: 10d20462ade18061edc4facf99f4e23c58b7855e4121e5f0f2d29ab5eb36eb24
+  metadata.gz: bb12d7f3b6c17018cefe1614dfba6b585ba169ef2ca412b58d230ccabf778033
+  data.tar.gz: ac44f2e8a75b53ad116b8674d1f5c3d47a122c9782133e3853359217fb944375
 SHA512:
-  metadata.gz: 40ca71b7fefb3b4de28f8b6ae08c10fa6c8172cf69e86e18d3ab9166625f41a1ed15c4e4dd53977ff90a7dab4297577ab26a80de130fe58628fb67b0003be54b
-  data.tar.gz: 7e5c4637c7f29d92d69ff704fec7d3c71d409c9f27c321df3807055471135877470b37dce6b0daceb68fad96c160e3dd031bf75e1df743acc76156d35f46ccfb
+  metadata.gz: 2f358f026bc47645ae8751cb3b2a3a7660cfbbb64c6c37e2ab2b46a9b548de357ba0e8a8880eb82326ce78c6e7605c31fbf27726d645b33baa62c594bace13b5
+  data.tar.gz: 185fbeea91d8fda53c23232897deba40ad149fbea99c329a32aa8d9bbd7c296c4b9a5a814ced76d39785969d8503011f9316bc600a07de7e82b1a03fe0c3a76a

data/Appraisals

@@ -17,15 +17,15 @@ RAILS_VERSIONS.each do |version|
     end
 
     platforms :jruby do
-      if !ENV['TRAVIS'] || ENV['DB'] == 'sqlite3'
+      if !ENV['CI'] || ENV['DB'] == 'sqlite3'
         gem 'activerecord-jdbcsqlite3-adapter', '~> 1'
       end
 
-      if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+      if !ENV['CI'] || ENV['DB'] == 'mysql'
         gem 'activerecord-jdbcmysql-adapter', '~> 1'
       end
 
-      if !ENV['TRAVIS'] || %w(postgres postgresql).include?(ENV['DB'])
+      if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])
         gem 'activerecord-jdbcpostgresql-adapter', '~> 1'
       end
     end

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Globalize Changelog
 
-## 5.3.1 (2021-01-11)
+## Unreleased
 
-* Fix foreign keys translation. [#773](https://github.com/globalize/globalize/pull/773) by [Sergey Tokarenko](https://github.com/stokarenko)
+* 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) 
 
 ## 5.3.0 (2019-05-14)
 

data/CONTRIBUTING.md

@@ -34,7 +34,7 @@ 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.
+When you submit the pull request, GitHub Actions will run the [test suite](https://github.com/globalize/globalize/actions) 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
 

data/Gemfile

@@ -1,3 +1,20 @@
 source 'https://rubygems.org'
 
 gemspec
+
+# Database Configuration
+if !ENV['CI'] || ENV['DB'] == 'sqlite3'
+  gem 'sqlite3', platforms: [:ruby, :rbx]
+end
+
+if !ENV['CI'] || ENV['DB'] == 'mysql'
+  group :mysql do
+    gem 'mysql2', platforms: [:ruby, :rbx]
+  end
+end
+
+if !ENV['CI'] || %w(postgres postgresql).include?(ENV['DB'])
+  group :postgres, :postgresql do
+    gem 'pg', '< 1.0', platforms: [:ruby, :rbx]
+  end
+end

data/Gemfile.lock

@@ -0,0 +1,80 @@
+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

data/README.md

@@ -1,6 +1,6 @@
 ![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)
+[![Build Status](https://github.com/globalize/globalize/workflows/CI/badge.svg)](https://github.com/globalize/globalize/actions) [![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:
@@ -28,7 +28,7 @@ gem install globalize
 When using bundler put this in your Gemfile:
 
 ```ruby
-gem 'globalize', '~> 5.1.0'
+gem 'globalize', '~> 5.3.0'
 ```
 
 Please help us by letting us know what works, and what doesn't, when using pre-release code.

data/lib/globalize/active_record/act_macro.rb

@@ -68,6 +68,7 @@ module Globalize
       def apply_globalize_options(options)
         options[:table_name] ||= "#{table_name.singularize}_translations"
         options[:foreign_key] ||= class_name.foreign_key
+        options[:autosave] ||= false
 
         class_attribute :translated_attribute_names, :translation_options, :fallbacks_for_empty_translations
         self.translated_attribute_names = []
@@ -99,7 +100,7 @@ module Globalize
                                 :foreign_key => options[:foreign_key],
                                 :dependent   => :destroy,
                                 :extend      => HasManyExtensions,
-                                :autosave    => false,
+                                :autosave    => options[:autosave],
                                 :inverse_of  => :globalized_model
 
         after_create :save_translations!

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)
+        translated_value = read_translated_attribute(attr_name, options, &block)
         translated_value.nil? ? super(attr_name, &block) : translated_value
       end
 
@@ -236,7 +236,10 @@ module Globalize
         return nil unless options[:translated]
         return nil unless translated?(name)
 
-        globalize.fetch(options[:locale] || Globalize.locale, name)
+        value = globalize.fetch(options[:locale] || Globalize.locale, name)
+        return nil if value.nil?
+
+        block_given? ? yield(value) : value
       end
     end
   end

data/lib/globalize/active_record/migration.rb

@@ -62,6 +62,7 @@ module Globalize
         end
 
         def drop_translation_table!(options = {})
+          add_missing_columns if options[:create_source_columns]
           move_data_to_model_table if options[:migrate_data]
           drop_translations_index
           drop_translation_table
@@ -148,8 +149,6 @@ module Globalize
         end
 
         def move_data_to_model_table
-          add_missing_columns
-
           # Find all of the translated attributes for all records in the model.
           all_translated_attributes = model.all.collect{|m| m.attributes}
           all_translated_attributes.each do |translated_record|

data/lib/globalize/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 6.0.0.alpha.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -11,10 +11,10 @@ authors:
 - Tomasz Stachewicz
 - Philip Arndt
 - Chris Salzberg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +25,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,7 +55,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -182,20 +182,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Rails I18n de-facto standard library for ActiveRecord model/data translation.
 email: nobody@globalize-rails.org
 executables: []
@@ -206,12 +192,10 @@ 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
@@ -244,7 +228,7 @@ homepage: http://github.com/globalize/globalize
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -255,12 +239,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: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation
 test_files: []

data/docker-compose.yml

@@ -1,22 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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

@@ -1,38 +0,0 @@
-# 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