traco 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b558d968305b0326939037fb16d4a871092c39cc
-  data.tar.gz: 204f5478a41436d55d0c19954ce0ef971f86dc45
+  metadata.gz: c6593f9b00040b46726794a81103b204f708badd
+  data.tar.gz: 65bb9ab64475d9935ecdee1adf0369898d7c8a90
 SHA512:
-  metadata.gz: 4e4745b20173434cb983d53bb2cb18074f398685f2fea9efb011e41f95842fe3108644fa11a0e971752bd30db436219d45455839d969aed988ce4936414ed28d
-  data.tar.gz: ccc4cdbbccf49ff129f2d9e634e1a9aab80650a1600d820f82cfabf8a2977ab669496fdeca1f3ffd7749f2abfc3eba6351fdca74773e8115245a503f35db871b
+  metadata.gz: fcb768c9e6f93a6f2682875c87e5b028c6c5168f4d044e5970a3d3ecf57a768e39cda38a67ca381f31eb4da066b7379fdf9fb71830d2da9e4d506f0392670196
+  data.tar.gz: 5083c41205a6d2c144b6dceb585b8fa88ee9cc66e133c8e86d567c3fa968e89000c7dba315a4c28e7de9605f841b0faa83b2969a760c15e07475b074ea8657e2

data/README.md

@@ -94,6 +94,8 @@ You can specify e.g. `translates :title, fallback: :any` to fall back first to t
 
 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)`.
+
 
 ### Overriding methods
 

data/lib/traco/attribute_setup.rb

@@ -49,7 +49,7 @@ module Traco
     end
 
     def define_localized_reader(attribute, options)
-      default_fallback = options.fetch(:fallback, true)
+      default_fallback = options.fetch(:fallback, Traco::LocalizedReader::DEFAULT_FALLBACK)
 
       custom_define_method(attribute) do |method_opts = {}|
         fallback = method_opts.fetch(:fallback, default_fallback)

data/lib/traco/localized_reader.rb

@@ -1,9 +1,16 @@
 module Traco
   class LocalizedReader
+    FALLBACK_OPTIONS = [
+      DEFAULT_FALLBACK = :default,
+      ANY_FALLBACK = :any,
+      NO_FALLBACK = false,
+    ]
+
     def initialize(record, attribute, options)
       @record = record
       @attribute = attribute
       @fallback = options[:fallback]
+      validate_fallback
     end
 
     def value
@@ -24,13 +31,20 @@ module Traco
     def locale_chain
       chain = []
       chain << I18n.locale
-      chain << I18n.default_locale    if @fallback
-      chain += I18n.available_locales if @fallback == :any
+      chain << I18n.default_locale    if [DEFAULT_FALLBACK, ANY_FALLBACK].include?(@fallback)
+      chain += I18n.available_locales if @fallback == ANY_FALLBACK
       chain.map { |locale| Traco.locale_suffix(locale) }
     end
 
     def locales_for_attribute
       @record.class.locales_for_attribute(@attribute)
     end
+
+    def validate_fallback
+      unless FALLBACK_OPTIONS.include?(@fallback)
+        valids = FALLBACK_OPTIONS.map(&:inspect).join(", ")
+        raise "Unsupported fallback: #{@fallback.inspect} (expected one of #{valids})"
+      end
+    end
   end
 end

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "2.2.0"
+  VERSION = "3.0.0"
 end

data/spec/traco_spec.rb

@@ -172,9 +172,9 @@ describe Post, "#title" do
       post.title.should be_nil
     end
 
-    it "still falls back if called with fallback: true" do
+    it "still falls back if called with fallback: :default" do
       I18n.locale = :ru
-      post.title(fallback: true).should == "Halloa"
+      post.title(fallback: :default).should == "Halloa"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Henrik Nyh