traco 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9060bececc2eb2a4f5bf6fd798f1b6c16523dd21
-  data.tar.gz: a32a98d4c86f84fc94430cf11ab660fe8993c973
+  metadata.gz: 995b6c0b60252d02350da1d58e7ea0268a80a80b
+  data.tar.gz: 65c1db0ac8b1036daf10595d5c8745ccf2412aac
 SHA512:
-  metadata.gz: 23d5789232d16fa41117707e3502027d4d04328adee5bf8853213dd128ed26badb14f3ad03afbe073424c58d39eb98b46be78998f87d1bf000aa0f0f0d6f9bb5
-  data.tar.gz: c9461bd93ed5118f51da0862ee929f93df74964c7c56371ca60d88faba043e535b632fcc504e3351c50958f14f130ca2456ad32a06652e4f3dcf5c4ca5a98b6a
+  metadata.gz: 7f8fe7b9b21d2ea1ac651bf85d0eaa642e276533973347e8feb7248616632c764a1368a5670f8ee64d2afb519160cdbdec68a53ccb2c730e23c81330db3f657f
+  data.tar.gz: 448dff9dd08c1e8fb9c3d4dcfa57bf3fd4e66311ec84c66410fbaea44fac667fe7c8c1add591bb11b6a665648582dd6de59ce35aef604fe14d2a7e3d0444690b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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.
+
 ## 4.0.0
 
 * Drop support for end-of-lifed Ruby 2.1 and 2.2.

data/README.md

@@ -52,7 +52,7 @@ You can still use your accessors like `title_sv` and `title_sv=` in forms, valid
 
 `.translatable_attributes`: Returns an array like `[:title, :body]`.
 
-`.locale_columns(:title)`: Returns an array like `[:title_sv, :title_en]` sorted with default locale first and then alphabetically. Suitable for looping in forms:
+`.locale_columns(:title)`: Returns an array like `[:title_sv, :title_en]` sorted with current locale first, then default locale, and then alphabetically. Suitable for looping in forms:
 
 ```erb
 <% Post.locale_columns(:title).each do |column| %>
@@ -81,7 +81,7 @@ The return value will be sorted like `[:title_sv, :title_en, :body_sv, :body_en]
 
 `.current_locale_column(:title)`: Returns `:title_sv` if `:sv` is the current locale. Suitable for some SQL queries, such as sorting.
 
-`.locales_for_attribute(:title)`: Returns an array like `[:sv, :en]` sorted with default locale first and then alphabetically.
+`.locales_for_attribute(:title)`: Returns an array like `[:sv, :en]` sorted with current locale first, then default locale, and then alphabetically.
 
 And the equivalent methods for `body`, of course.
 

data/lib/traco/class_methods.rb

@@ -1,13 +1,13 @@
 module Traco
   module ClassMethods
     def locales_for_attribute(attribute)
-      traco_cache(attribute, fallback: LocaleFallbacks::DEFAULT_FIRST_FALLBACK).keys
+      traco_cache(attribute, fallback: LocaleFallbacks::ANY_FALLBACK).keys
     end
 
     def locale_columns(*attributes)
-      attributes.each_with_object([]) do |attribute, columns|
-        columns.concat(_locale_columns_for_attribute(attribute, fallback: LocaleFallbacks::DEFAULT_FIRST_FALLBACK))
-      end
+      attributes.flat_map { |attribute|
+        _locale_columns_for_attribute(attribute, fallback: LocaleFallbacks::ANY_FALLBACK)
+      }
     end
 
     # Consider this method internal.

data/lib/traco/version.rb

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

data/spec/spec_helper_models.rb

@@ -21,8 +21,8 @@ ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 
 ActiveRecord::Schema.define(version: 0) do
   create_table :posts, force: true do |t|
-    t.string :title_sv, :title_en, :title_pt_br
-    t.string :body_sv, :body_en, :body_pt_br
+    t.string :title_sv, :title_en, :title_pt_br, :title_de
+    t.string :body_sv, :body_en, :body_pt_br, :body_de
   end
 end
 

data/spec/traco_spec.rb

@@ -84,8 +84,8 @@ describe Post, ".locales_for_attribute" do
     I18n.locale = :en
   end
 
-  it "lists the locales for that attribute, default locale first and then alphabetically" do
-    expect(Post.locales_for_attribute(:title)).to eq [ :"pt-BR", :en, :sv ]
+  it "lists the locales for that attribute, current locale first, then default locale, and then alphabetically" do
+    expect(Post.locales_for_attribute(:title)).to eq [ :en, :"pt-BR", :de, :sv ]
   end
 
   it "doesn't include a locale if there's no corresponding column for it" do
@@ -102,9 +102,9 @@ describe Post, ".locale_columns" do
     I18n.locale = :en
   end
 
-  it "lists the columns-with-locale for that attribute, default locale first and then alphabetically" do
+  it "lists the columns-with-locale for that attribute, current locale first, then default locale, and then alphabetically" do
     expect(Post.locale_columns(:title)).to eq [
-      :title_pt_br, :title_en, :title_sv
+      :title_en, :title_pt_br, :title_de, :title_sv,
     ]
   end
 
@@ -114,12 +114,12 @@ describe Post, ".locale_columns" do
     expect(Post.locale_columns(:title)).not_to include(:title_ru)
   end
 
-  it "supports multiple attributes" do
-    Post.translates :body
+it "supports multiple attributes" do
+  Post.translates :body
 
     expect(Post.locale_columns(:body, :title)).to eq [
-      :body_pt_br, :body_en, :body_sv,
-      :title_pt_br, :title_en, :title_sv,
+      :body_en, :body_pt_br, :body_de, :body_sv,
+      :title_en, :title_pt_br, :title_de, :title_sv,
     ]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord