traco 3.1.6 → 3.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzZlZTA3YTcxYTNiNDA3ZmQ3MTdhMzE5ZGQxNzA1Yzg4YmFhMjI5Mg==
+    ODYwOGJlNTZiOWNkMmU1Y2MxYTA1ZDExZTc0ZGQ0MjQ5ZjhjMjI5ZA==
   data.tar.gz: !binary |-
-    OTQ3MzczNzVmZDI4ZWMwYjBhOGY0NjMyZmU4MWE1N2UyN2RhMTZkMA==
+    MmYzNmJhMjkwYjRjNmYzMThjYjk2NmFmOTYxOGNlMThkM2U0MGU0Ng==
 SHA512:
   metadata.gz: !binary |-
-    ZjkwNjFmOWJiNmM2ZDg1MzI3ZGNlNDBkMzU3ZTIwYWRiN2NkNjJmMzFjMjQ3
-    ZGNlOGIyNzA1MzM5OGQ4YzBlN2M2ZmFlZjE5ZTg5ZjgyNzY5YmMxZDQ4MDcz
-    MTBiYTAyOGMyYjNmOWVkNzU0Yzk0MDU4NGE2NDY3ZjZhYmQxMjQ=
+    OWY1ZDRhZmVkNDIzOTNiOThjNmU4MjIxMTViMWE5ZTI2MzU4NGI3MzgyZGYx
+    YmU5OWE3YTA5YmNhMWNkOWI0MjNmZjdjZWY5ZWNiN2E0YWVlYWMzZDY3MGUx
+    ODgxM2MwNGYzZjNkMjY1MGVhNmM3NjM4NjVjMGUyYTFjYWRhYmM=
   data.tar.gz: !binary |-
-    MjdkMWE2YzM0NzcxYjZkYjkzNzZiYWVmZTMyMGUxMjVmNzMxYjAyZjVmYzBi
-    YmRhMDY3YWM5OTI3MzdmNDBhNTVjZjVkMDBmZTQ4ZjE5OWVhMjQ0ZjhkYTk3
-    OWE1MjBlZWM4ZWYxNzMyYWJjNzE5Njk4OWMxNDRkYTU2Nzg3YTA=
+    NzMzNzFkOGM0NjUwN2MwOGM4NDUzYTRhYTQzZDY3NWNmYzEzNmNmODFmNGQ2
+    ZTgzYjYwNDFiMDhiZGNiMmMyZjViNDc1YjBjMjA4NzkzYTFlMjY5MjQyNDJj
+    YWZiYmU2ZTIwNzE4MjFmYzJmYmYyOTlmMDJmNThjYzBlYjI3NmU=

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.2.0
+
+* Introduce e.g. `fallback: [:sv]` to explicitly specify fallbacks.
+
 ## 3.1.6
 
 Make [license (MIT)](LICENSE.txt) easier to autodetect.

data/README.md

@@ -94,6 +94,8 @@ You can specify e.g. `translates :title, fallback: false` to never fall back and
 
 You can specify e.g. `translates :title, fallback: :any` to fall back first to the default locale, then to any other locale.
 
+You can specify e.g. `translates :title, fallback: [:sv]` to explicitly declare fallbacks as an array of any length.
+
 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/lib/traco/locale_fallbacks.rb

@@ -13,7 +13,9 @@ module Traco
     private :fallback_option
 
     def initialize(fallback_option)
-      @fallback_option = validate_option(fallback_option)
+      validate_option(fallback_option)
+
+      @fallback_option = fallback_option
       @default_locale = I18n.default_locale
       @available_locales = I18n.available_locales.sort
     end
@@ -24,6 +26,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 Array                  then fallback_option
       else                        raise "Unknown fallback."  # Should never get here.
       end
     end
@@ -31,12 +34,11 @@ module Traco
     private
 
     def validate_option(fallback_option)
-      if OPTIONS.include?(fallback_option)
-        fallback_option
-      else
-        valids = OPTIONS.map(&:inspect).join(", ")
-        raise ArgumentError.new("Unsupported fallback: #{fallback_option.inspect} (expected one of #{valids})")
-      end
+      return if OPTIONS.include?(fallback_option)
+      return if fallback_option.is_a?(Array)
+
+      valids = OPTIONS.map(&:inspect).join(", ")
+      raise ArgumentError.new("Unsupported fallback: #{fallback_option.inspect} (expected one of #{valids}, or an array)")
     end
   end
 end

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "3.1.6"
+  VERSION = "3.2.0"
 end

data/spec/locale_fallbacks_spec.rb

@@ -35,6 +35,13 @@ describe Traco::LocaleFallbacks do
       end
     end
 
+    context "with an explicit list of locales" do
+      it "returns only those locales" do
+        subject = Traco::LocaleFallbacks.new([ :en ])
+        expect(subject[:sv]).to eq [ :en ]
+      end
+    end
+
     context "with the ':default_first' option" do
       it "returns default locale, then remaining available locales alphabetically" do
         I18n.default_locale = :uk

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.2.0
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord