traco 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 995b6c0b60252d02350da1d58e7ea0268a80a80b
-  data.tar.gz: 65c1db0ac8b1036daf10595d5c8745ccf2412aac
+SHA256:
+  metadata.gz: '0558c0d88be16881d21c8d132f91237f872f8d6ed718ac9c5f96542fa2a2da29'
+  data.tar.gz: ef022bdbd5381ed2a5df36e125fd1dbc98423bdb0788a682105b997d9ecca720
 SHA512:
-  metadata.gz: 7f8fe7b9b21d2ea1ac651bf85d0eaa642e276533973347e8feb7248616632c764a1368a5670f8ee64d2afb519160cdbdec68a53ccb2c730e23c81330db3f657f
-  data.tar.gz: 448dff9dd08c1e8fb9c3d4dcfa57bf3fd4e66311ec84c66410fbaea44fac667fe7c8c1add591bb11b6a665648582dd6de59ce35aef604fe14d2a7e3d0444690b
+  metadata.gz: 7eb1119b6ed4de3f33df0c85b6c82faaedcc48f5982066e037bd2bd0ecd9c666eb4ce52f19845f01ca522b4e5f5ff5bad60ad93f09ac536de56976d67a70e300
+  data.tar.gz: 64e59646deb593318e26e0363c5b90f76e0f62a85c7702d987a0f8e599abd095ea4cb0fe966b7c2b67ce3102d40390c76c76bf71fc88060a3f4585ecc505fc13

data/.gitignore

@@ -3,3 +3,5 @@ Gemfile.lock
 pkg/
 tmp
 *.gem
+# Appraisal generated lockfiles
+*.gemfile.lock

data/.rspec

@@ -0,0 +1 @@
+-r spec_helper

data/.travis.yml

@@ -1,10 +1,24 @@
 language: ruby
-rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.0
 
-# Avoid some errors, and speed things up:
-# https://github.com/bundler/bundler/issues/3558#issuecomment-171347979
-# https://docs.travis-ci.com/user/workers/container-based-infrastructure/
-sudo: false
+rvm:
+  - 2.6.3
+  - 2.5.5
+  - 2.4.6
+  - 2.3.8
+gemfile:
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
+  - gemfiles/rails_6.1.gemfile
+matrix:
+  exclude:
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_6.1.gemfile
+    - rvm: 2.4.6
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.4.6
+      gemfile: gemfiles/rails_6.1.gemfile

data/Appraisals

@@ -0,0 +1,26 @@
+appraise "rails-4.2" do
+  gem "activerecord", "~> 4.2.0"
+  gem "sqlite3", "~> 1.3.13"
+end
+
+appraise "rails-5.0" do
+  gem "activerecord", "~> 5.0.0"
+  gem "sqlite3", "~> 1.3.13"
+end
+
+appraise "rails-5.1" do
+  gem "activerecord", "~> 5.1.0"
+  gem "sqlite3", "~> 1.3.13"
+end
+
+appraise "rails-5.2" do
+  gem "activerecord", "~> 5.2.0"
+end
+
+appraise "rails-6.0" do
+  gem "activerecord", "~> 6.0.3.1"
+end
+
+appraise "rails-6.1" do
+  gem "activerecord", "~> 6.1.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.1.0
+
+* Feature: Add `fallback: :i18n` to use the fallbacks from `I18n.fallbacks`. Thanks to [sunny](https://github.com/sunny)!
+
 ## 5.0.0
 
 * Change `locale_columns` and `locales_for_attribute` to sort current locale first, then default locale (previously, it was default locale first). This makes more sense for our own apps, and hopefully other apps as well.

data/README.md

@@ -1,8 +1,8 @@
 # Traco
 
-[![Build Status](https://secure.travis-ci.org/barsoom/traco.png)](http://travis-ci.org/barsoom/traco)
+[![Build Status](https://secure.travis-ci.org/barsoom/traco.svg)](http://travis-ci.org/barsoom/traco)
 
-Translatable attributes for Ruby on Rails, stored in the model table itself.
+Translatable attributes for Ruby on Rails 4.2+, stored in the model table itself.
 
 Inspired by Iain Hecker's [translatable_columns](https://github.com/iain/translatable_columns/).
 
@@ -98,6 +98,8 @@ You can specify e.g. `translates :title, fallback: :any` to fall back first to t
 
 You can specify e.g. `translates :title, fallback: [:sv]` to explicitly declare fallbacks as an array of any length.
 
+You can specify e.g. `translates :title, fallback: :i18n` to use the fallbacks from `I18n.fallbacks`.
+
 You can override the default fallback strategy with a parameter passed to the reader: `post.title(fallback: :any)`.
 
 If you need to declare the default locale fallback, do `post.title(fallback: :default)`.

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2.0"
+gem "sqlite3", "~> 1.3.13"
+
+group :benchmark do
+  gem "benchmark-ips"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.13"
+
+group :benchmark do
+  gem "benchmark-ips"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.13"
+
+group :benchmark do
+  gem "benchmark-ips"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.0"
+
+group :benchmark do
+  gem "benchmark-ips"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.3.1"
+
+group :benchmark do
+  gem "benchmark-ips"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.1.0"
+
+group :benchmark do
+  gem "benchmark-ips"
+end
+
+gemspec path: "../"

data/lib/traco/locale_fallbacks.rb

@@ -7,6 +7,7 @@ module Traco
       ANY_FALLBACK = :any,
       NO_FALLBACK = false,
       DEFAULT_FIRST_FALLBACK = :default_first,
+      I18N_FALLBACK = :i18n,
     ]
 
     attr_reader :fallback_option
@@ -26,6 +27,7 @@ module Traco
       when ANY_FALLBACK           then [ current_locale, @default_locale, *@available_locales ].uniq
       when NO_FALLBACK            then [ current_locale ]
       when DEFAULT_FIRST_FALLBACK then [ @default_locale, *@available_locales ].uniq
+      when I18N_FALLBACK          then I18n.fallbacks[current_locale]
       when Array                  then [ current_locale, *fallback_option ]
       else                        raise "Unknown fallback."  # Should never get here.
       end

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "5.0.0"
+  VERSION = "5.1.0"
 end

data/spec/locale_fallbacks_spec.rb

@@ -1,7 +1,6 @@
-require "spec_helper"
 require "traco/locale_fallbacks"
 
-describe Traco::LocaleFallbacks do
+RSpec.describe Traco::LocaleFallbacks do
   describe ".new" do
     it "raises ArgumentError if an unknown argument passed in" do
       expect { Traco::LocaleFallbacks.new(:foo) }.to raise_error(ArgumentError)
@@ -51,5 +50,20 @@ describe Traco::LocaleFallbacks do
         expect(subject[:sv]).to eq [ :uk, :de, :en, :sv ]
       end
     end
+
+    context "with the ':i18n' option" do
+      it "returns what is configured as a I18n fallback" do
+        I18n.fallbacks = I18n::Locale::Fallbacks.new(
+          en: [ :en, :uk, :de, :sv ],
+          uk: [ :uk, :en, :de, :sv ],
+          de: [ :de, :uk, :en, :sv ],
+          sv: [ :sv, :en, :uk, :de ],
+        )
+
+        subject = Traco::LocaleFallbacks.new(:i18n)
+        expect(subject[:sv]).to eq [ :sv, :en, :uk, :de ]
+        expect(subject[:de]).to eq [ :de, :uk, :en, :sv ]
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ require "i18n"
 RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
+  config.disable_monkey_patching!
 end
 
 I18n.enforce_available_locales = false
+
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)

data/spec/spec_helper_models.rb

@@ -1,5 +1,5 @@
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before do
     # Clear class state before each spec.
     Object.send(:remove_const, "Post")
     Object.send(:remove_const, "SubPost")

data/spec/traco_spec.rb

@@ -1,10 +1,9 @@
 # encoding: utf-8
 
-require "spec_helper"
 require "spec_helper_models"
 require "traco"
 
-describe Traco, ".split_localized_column" do
+RSpec.describe Traco, ".split_localized_column" do
   subject { described_class }
 
   it "returns attribute and locale" do
@@ -24,7 +23,7 @@ describe Traco, ".split_localized_column" do
   end
 end
 
-describe ActiveRecord::Base, ".translates" do
+RSpec.describe ActiveRecord::Base, ".translates" do
   it "is available" do
     expect(Post).to respond_to :translates
   end
@@ -57,7 +56,7 @@ describe ActiveRecord::Base, ".translates" do
   end
 end
 
-describe Post, ".translatable_attributes" do
+RSpec.describe Post, ".translatable_attributes" do
   before do
     Post.translates :title
   end
@@ -77,7 +76,7 @@ describe Post, ".translatable_attributes" do
   end
 end
 
-describe Post, ".locales_for_attribute" do
+RSpec.describe Post, ".locales_for_attribute" do
   before do
     Post.translates :title
     I18n.default_locale = :"pt-BR"
@@ -95,7 +94,7 @@ describe Post, ".locales_for_attribute" do
   end
 end
 
-describe Post, ".locale_columns" do
+RSpec.describe Post, ".locale_columns" do
   before do
     Post.translates :title
     I18n.default_locale = :"pt-BR"
@@ -124,7 +123,7 @@ it "supports multiple attributes" do
   end
 end
 
-describe Post, ".current_locale_column" do
+RSpec.describe Post, ".current_locale_column" do
   before do
     Post.translates :title
   end
@@ -140,7 +139,7 @@ describe Post, ".current_locale_column" do
   end
 end
 
-describe Post, "#title" do
+RSpec.describe Post, "#title" do
   let(:post) {
     Post.new(title_sv: "Hej", title_en: "Halloa", title_pt_br: "Olá")
   }
@@ -271,7 +270,7 @@ describe Post, "#title" do
   end
 end
 
-describe Post, "#title=" do
+RSpec.describe Post, "#title=" do
   before do
     Post.translates :title
   end
@@ -298,7 +297,7 @@ describe Post, "#title=" do
   end
 end
 
-describe Post, "#title?" do
+RSpec.describe Post, "#title?" do
   before do
     Post.translates :title
     I18n.locale = :sv
@@ -315,7 +314,7 @@ describe Post, "#title?" do
   end
 end
 
-describe Post, ".human_attribute_name" do
+RSpec.describe Post, ".human_attribute_name" do
   before do
     Post.translates :title
     I18n.locale = :sv

data/traco.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Henrik Nyh"]
   s.email       = ["henrik@barsoom.se"]
   s.homepage    = ""
-  s.summary     = "Translatable columns for Rails 3 or better, stored in the model table itself."
+  s.summary     = "Translatable columns for Rails 4.2 or better, stored in the model table itself."
   s.license     = "MIT"
 
   s.files         = `git ls-files`.split("\n")
@@ -18,10 +18,11 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.3.0"
 
-  s.add_dependency "activerecord", ">= 3.0"
+  s.add_dependency "activerecord", ">= 4.2"
 
   s.add_development_dependency "sqlite3"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "appraisal"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: 
 email:
 - henrik@barsoom.se
@@ -74,13 +88,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - benchmarks/overhead.rb
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/traco.rb
 - lib/traco/attributes.rb
 - lib/traco/class_methods.rb
@@ -113,11 +135,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Translatable columns for Rails 3 or better, stored in the model table itself.
+summary: Translatable columns for Rails 4.2 or better, stored in the model table itself.
 test_files:
 - spec/app/post.rb
 - spec/app/sv.yml