traco 3.1.3 → 3.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGU5NTFmYTU4ZDQ5ZDA5ZWUyMzIyYjNiZDkxOGZiYzkyZDAwOGU1ZA==
+    YzMxZDEzNjdmODYxYjJmNWVkOGUxNzI4YWYwNjE0Zjc2OTE1OWIzNw==
   data.tar.gz: !binary |-
-    OTI3ODAxOTgwNTE1OGQyZmFjYjUxMTJlZjQ1MmI0YjBkNTY0MjU5OA==
+    NjFmNjBhMDFhYzFhODgzYjkzYmFiYzJjZWQ4YzhlMTc0MTc1YWVkOQ==
 SHA512:
   metadata.gz: !binary |-
-    NGFlOGM1M2QyMjVjZmQzNjQ1MjRkZDYxNDE5ZWQzOGQ2MjFkODFlNjU3ZjI2
-    Y2UxNTJiYTZmYTRiM2FiMDFkYzYxMDRkMGNkMjA5NjVlNzIzYWNmMjJiZWFm
-    MzU4Y2NiZWNlODk1MWMxODEyMTg4NTRmMDQ1ZjBkZmRlNjlkNDg=
+    NmNkMjExZjYwODBlOGIyMWU1ODhhNmI4NTRkMjIxNjY3M2ZlYTUxZjdhZTQ5
+    ZDU0MjJjNWRkZWFjZGZlMjg3ZDE1ZGVkZjY1NmNlZTk1ZTk5NTVmNmY3N2Mx
+    NzYzYzE2ZmZlNDkzYTg1ZWJkNzkyNWMwMTQ2NWMzNWRmNDIwMjk=
   data.tar.gz: !binary |-
-    NWQ2MmFlZDZhY2FhZTllMTZkMTUzMWI2ZWRkZDEwNzBkMmY5M2Y2YmM0NjIz
-    MGIwZmY3MmY3YTgxYTY0NzVmODM4M2Q1Mjk0ZTI5MDU1MjYxOTM0N2U3Njll
-    NmQ0MWY4NzBmNjcyMjk2M2M2ZGQwNTdmMjBlNWU5ZmExMjU2MDA=
+    NDAxNjQ0NjM4NWY2ODcxYmFmZjA5ZTVlOTRkZTAwZjY4NDRjNGNhMGNmOTE4
+    NGE4NTQwYTFlODYzYjVhMDgzNWMwNTZlZmNkMjYzMjFjNTdjMTFlMmE0ODMy
+    MTA3OTMzZmIwMDkxMzYyZDcyZTIxNjE2NWQyMDBlYzNhYWVkYmI=

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 3.1.4
+
+* Bugfix: restore sorting of `locale_columns` and `locales_for_attribute` to put default locale first, not current locale. Thanks to Leung Ho Kuen.
+
+## 3.1.3
+
+ * ~20 time speedup thanks to optimizations by Andrii Malyshko.
+
+   Reading a Traco translated attribute used to be ~250x slower than an untranslated attribute; now it's down to ~10x slower.
+
+## 3.1.2
+
+* Bugfix: `.current_locale_column` handles dashed locales like "pt-BR" correctly. Thanks to Leung Ho Kuen.
+
+## 3.1.1
+
+* Bugfix around fallbacks and memoization. Thanks to Leung Ho Kuen.
+
 ## 3.1.0
 
 * Introduce `.current_locale_column`, e.g. `Post.current_locale_column(:title)  # => :title_sv`.
@@ -18,7 +36,7 @@
 
 ## 2.0.0
 
-* Backwards incompatible: for dashed locales like `:"pt-BR"`, the column names are now expected to end in e.g. `_pt_br`, not `_pt-BR`.
+* Backwards incompatible: for dashed locales like "pt-BR", the column names are now expected to end in e.g. `_pt_br`, not `_pt-BR`.
 
 ## 1.3.0
 

data/lib/traco/class_methods.rb

@@ -1,20 +1,20 @@
 module Traco
   module ClassMethods
     def locales_for_attribute(attribute)
-      traco_cache(attribute, LocaleFallbacks::ANY_FALLBACK).keys
-    end
-
-    # Consider this method internal.
-    def _locale_columns_for_attribute(attribute, fallback)
-      traco_cache(attribute, fallback).values
+      traco_cache(attribute, LocaleFallbacks::DEFAULT_FIRST_FALLBACK).keys
     end
 
     def locale_columns(*attributes)
       attributes.each_with_object([]) do |attribute, columns|
-        columns.concat(_locale_columns_for_attribute(attribute, LocaleFallbacks::ANY_FALLBACK))
+        columns.concat(_locale_columns_for_attribute(attribute, LocaleFallbacks::DEFAULT_FIRST_FALLBACK))
       end
     end
 
+    # Consider this method internal.
+    def _locale_columns_for_attribute(attribute, fallback)
+      traco_cache(attribute, fallback).values
+    end
+
     def current_locale_column(attribute)
       Traco.column(attribute, I18n.locale)
     end

data/lib/traco/locale_fallbacks.rb

@@ -6,6 +6,7 @@ module Traco
       DEFAULT_FALLBACK = :default,
       ANY_FALLBACK = :any,
       NO_FALLBACK = false,
+      DEFAULT_FIRST_FALLBACK = :default_first,
     ]
 
     attr_reader :fallback_option
@@ -17,23 +18,18 @@ module Traco
       @available_locales = I18n.available_locales.sort
     end
 
-    def [](for_locale)
-      chain = [for_locale]
-      chain << @default_locale if include_default_locale?
-      chain |= @available_locales if include_available_locales?
-      chain
+    def [](current_locale)
+      case fallback_option
+      when DEFAULT_FALLBACK       then [ current_locale, @default_locale ]
+      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
+      else                        raise "Unknown fallback."  # Should never get here.
+      end
     end
 
     private
 
-    def include_default_locale?
-      [ DEFAULT_FALLBACK, ANY_FALLBACK ].include?(fallback_option)
-    end
-
-    def include_available_locales?
-      ANY_FALLBACK == fallback_option
-    end
-
     def validate_option(fallback_option)
       if OPTIONS.include?(fallback_option)
         fallback_option

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "3.1.3"
+  VERSION = "3.1.4"
 end

data/spec/locale_fallbacks_spec.rb

@@ -2,23 +2,15 @@ require "spec_helper"
 require "traco/locale_fallbacks"
 
 describe Traco::LocaleFallbacks do
-  describe "#initialize" do
-    it "accepts :default, :any, and false as valid arguments" do
-      expect {
-        Traco::LocaleFallbacks.new(:default)
-        Traco::LocaleFallbacks.new(:any)
-        Traco::LocaleFallbacks.new(false)
-      }.not_to raise_error
-    end
-
-    it "raises ArgumentError if invalid argument passed in" do
-      expect { Traco::LocaleFallbacks.new(:invalid) }.to raise_error(ArgumentError)
+  describe ".new" do
+    it "raises ArgumentError if an unknown argument passed in" do
+      expect { Traco::LocaleFallbacks.new(:foo) }.to raise_error(ArgumentError)
       expect { Traco::LocaleFallbacks.new(nil) }.to raise_error(ArgumentError)
     end
   end
 
   describe "#[]" do
-        context "with the :default option" do
+        context "with the ':default' option" do
       it "returns given locale, then default locale" do
         I18n.default_locale = :en
         subject = Traco::LocaleFallbacks.new(:default)
@@ -26,20 +18,31 @@ describe Traco::LocaleFallbacks do
       end
     end
 
-    context "with the :any option" do
+    context "with the ':any' option" do
       it "returns given locale, then default locale, then remaining available locales alphabetically" do
         I18n.default_locale = :en
         I18n.available_locales = [ :en, :sv, :uk, :de ]
+
         subject = Traco::LocaleFallbacks.new(:any)
         expect(subject[:sv]).to eq [ :sv, :en, :de, :uk ]
       end
     end
 
-    context "with the false option" do
+    context "with the 'false' option" do
       it "returns only given locale" do
         subject = Traco::LocaleFallbacks.new(false)
         expect(subject[:sv]).to eq [ :sv ]
       end
     end
+
+    context "with the ':default_first' option" do
+      it "returns default locale, then remaining available locales alphabetically" do
+        I18n.default_locale = :uk
+        I18n.available_locales = [ :en, :sv, :uk, :de ]
+
+        subject = Traco::LocaleFallbacks.new(:default_first)
+        expect(subject[:sv]).to eq [ :uk, :de, :en, :sv ]
+      end
+    end
   end
 end

data/spec/spec_helper_models.rb

@@ -1,9 +1,12 @@
 RSpec.configure do |config|
-  # Clear class state before each spec.
   config.before(:each) do
+    # Clear class state before each spec.
     Object.send(:remove_const, 'Post')
     Object.send(:remove_const, 'SubPost')
     load "app/post.rb"
+
+    # Known state.
+    I18n.default_locale = :sv
   end
 end
 

data/spec/traco_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-require "spec_helper_models"
 require "spec_helper"
+require "spec_helper_models"
 require "traco"
 
 describe Traco, ".split_localized_column" do
@@ -80,44 +80,46 @@ end
 describe Post, ".locales_for_attribute" do
   before do
     Post.translates :title
-    I18n.locale = :"pt-BR"
+    I18n.default_locale = :"pt-BR"
+    I18n.locale = :en
   end
 
-  it "lists the current locale with :any locale fallback" do
-    expect(Traco).to receive(:locale_with_fallbacks).with(:"pt-BR", :any).and_return([:"pt-BR", :en, :sv])
+  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 ]
   end
 
   it "doesn't include a locale if there's no corresponding column for it" do
-    expect(Traco).to receive(:locale_with_fallbacks).with(:"pt-BR", :any).and_return([:"pt-BR", :ru])
-    expect(Post.locales_for_attribute(:title)).to eq [ :"pt-BR" ]
+    I18n.available_locales += [ :ru ]
+
+    expect(Post.locales_for_attribute(:title)).not_to include(:ru)
   end
 end
 
 describe Post, ".locale_columns" do
   before do
     Post.translates :title
-    I18n.locale = :"pt-BR"
+    I18n.default_locale = :"pt-BR"
+    I18n.locale = :en
   end
 
-  it "lists the columns-with-locale for current locale with :any locale fallback" do
-    expect(Traco).to receive(:locale_with_fallbacks).with(:"pt-BR", :any).and_return([:"pt-BR", :en, :sv])
+  it "lists the columns-with-locale for that attribute, default locale first and then alphabetically" do
     expect(Post.locale_columns(:title)).to eq [
       :title_pt_br, :title_en, :title_sv
     ]
   end
 
   it "doesn't include a column-with-locale if it doesn't exist" do
-    expect(Traco).to receive(:locale_with_fallbacks).with(:"pt-BR", :any).and_return([:"pt-BR", :ru])
-    expect(Post.locale_columns(:title)).to eq [ :title_pt_br ]
+    I18n.available_locales += [ :ru ]
+
+    expect(Post.locale_columns(:title)).not_to include(:title_ru)
   end
 
   it "supports multiple attributes" do
     Post.translates :body
-    expect(Traco).to receive(:locale_with_fallbacks).with(:"pt-BR", :any).twice.and_return([:"pt-BR", :en, :sv])
+
     expect(Post.locale_columns(:body, :title)).to eq [
       :body_pt_br, :body_en, :body_sv,
-      :title_pt_br, :title_en, :title_sv
+      :title_pt_br, :title_en, :title_sv,
     ]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord