traco 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDRjODY3Yjg3NmE2MmJiZWQ3NjBhNGE2MDJhNDIwM2ZhNjY4MjNjOQ==
-  data.tar.gz: !binary |-
-    MzIxZjkyY2JiODc3YzU3NDhmYWNiNzI2ODMzMjI5MWY4ZmQ2YmRhMQ==
+SHA1:
+  metadata.gz: b558d968305b0326939037fb16d4a871092c39cc
+  data.tar.gz: 204f5478a41436d55d0c19954ce0ef971f86dc45
 SHA512:
-  metadata.gz: !binary |-
-    ZTNhZjQyMzEyZTgyNGQwYzg1NTgyZWIzYTc2MjJlZWUwYTNhMGY5OTkwMWQ3
-    YzNhMWEyNDhiNjE0ZjYxYTc5N2IzMjljOWEyOGVlNDVhZTZhZTljOWE2MTM2
-    NzgwYTk3OGNjY2Y3ZWY0YTcwNWQxMzg2YWI4MWZmMDBiZDM5YzA=
-  data.tar.gz: !binary |-
-    YTQ4NmNhMDMxZmI2NTQxMzBkMWYzNDc1MGU0OTgzODEyYTUzZTE3MTAyOTFi
-    NDhlZDg5MzEzZTVjZThlYmU3NzExYTZmZjM1ZTMwYTQxOWQyMTE1ZTMxZjYw
-    NGM5ZDVlYTViYTlmMDE4MmI3YzgzMGQ2Y2U5YmQyYTgxMGI0NGI=
+  metadata.gz: 4e4745b20173434cb983d53bb2cb18074f398685f2fea9efb011e41f95842fe3108644fa11a0e971752bd30db436219d45455839d969aed988ce4936414ed28d
+  data.tar.gz: ccc4cdbbccf49ff129f2d9e634e1a9aab80650a1600d820f82cfabf8a2977ab669496fdeca1f3ffd7749f2abfc3eba6351fdca74773e8115245a503f35db871b

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3

data/README.md

@@ -84,20 +84,15 @@ And the equivalent methods for `body`, of course.
 Please note that your `translates :title, :body` declaration must be called before you call `locale_columns`. Otherwise you will get an error like "NoMethodError: undefined method `locale\_columns' for #\<Class:0x00000003f69188\>".
 
 
-### Disable fallback
+### Fallbacks
 
-if you specify
+By default, Traco will fall back to the default locale if there is no translation in the current locale.
 
-```ruby
-class Post < ActiveRecord::Base
-  translates :title, :body,
-    fallback: false
-end
-```
+You can specify e.g. `translates :title, fallback: false` to never fall back and instead return `nil`.
 
-then `#title` will return `nil` if there is no translation in the current locale, instead of falling back to the default locale.
+You can specify e.g. `translates :title, fallback: :any` to fall back first to the default locale, then to any other locale.
 
-If you still want to fall back in some cases, call `post.title(fallback: true)`.
+You can override the default fallback strategy with a parameter passed to the reader: `post.title(fallback: :any)`.
 
 
 ### Overriding methods

data/lib/traco/localized_reader.rb

@@ -24,7 +24,8 @@ module Traco
     def locale_chain
       chain = []
       chain << I18n.locale
-      chain << I18n.default_locale if @fallback
+      chain << I18n.default_locale    if @fallback
+      chain += I18n.available_locales if @fallback == :any
       chain.map { |locale| Traco.locale_suffix(locale) }
     end
 

data/lib/traco/version.rb

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

data/spec/spec_helper.rb

@@ -29,4 +29,5 @@ silence_stream(STDOUT) do
   end
 end
 
+I18n.enforce_available_locales = false
 I18n.load_path << "spec/app/sv.yml"

data/spec/traco_spec.rb

@@ -177,6 +177,24 @@ describe Post, "#title" do
       post.title(fallback: true).should == "Halloa"
     end
   end
+
+  context "when the translation was defined with fallback: :any" do
+    before do
+      Post.translates :title, fallback: :any
+      I18n.default_locale = :en
+      I18n.locale = :"pt-BR"
+    end
+
+    it "falls back to any locale, not just the default" do
+      post = Post.new(title_en: "", title_pt_br: "", title_sv: "Hej")
+      post.title.should == "Hej"
+    end
+
+    it "prefers the default locale" do
+      post = Post.new(title_en: "Hello", title_pt_br: "", title_sv: "Hej")
+      post.title.should == "Hello"
+    end
+  end
 end
 
 describe Post, "#title=" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Henrik Nyh
@@ -14,56 +14,56 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: 
@@ -73,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".rvmrc"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -100,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Translatable columns for Rails 3 or better, stored in the model table itself.