traco 0.2.6 → 0.3.1

data/README.markdown

@@ -36,7 +36,7 @@ Declare these columns in the model:
 
 You can still use your accessors like `title_sv` and `title_sv=` in forms, validations and other code, but you also get:
 
-`#title`:  Shows the title in the current locale. If blank, falls back to default locale, then to any locale.
+`#title`: Shows the title in the current locale. If blank, falls back to default locale. Otherwise nil.
 
 `#title=`: Assigns the title to the column for the current locale, if present. Raises if the column doesn't exist.
 
@@ -56,6 +56,18 @@ You can still use your accessors like `title_sv` and `title_sv=` in forms, valid
 And the equivalent methods for `body`, of course.
 
 
+### Disable fallback
+
+if you specify
+
+    class Post < ActiveRecord::Base
+      translates :title, :body,
+        fallback: false
+    end
+
+then `#title` will return `nil` if there is no translation in the current locale, instead of falling back to the default locale.
+
+
 ## Installation
 
 Add this to your `Gemfile` if you use Bundler 1.1+:

data/lib/traco/localized_reader.rb

@@ -1,12 +1,13 @@
 module Traco
   class LocalizedReader
-    def initialize(record, column)
+    def initialize(record, column, options)
       @record = record
       @column = column
+      @fallback = options[:fallback]
     end
 
     def value
-      locales.each do |locale|
+      locales_to_try.each do |locale|
         value = @record.send("#{@column}_#{locale}")
         return value if value.present?
       end
@@ -16,24 +17,19 @@ module Traco
 
     private
 
-    def locales
-      @record.class.locales_for_column(@column).sort_by { |locale|
-        locale_sort_value(locale)
-      }
+    def locales_to_try
+      @locales_to_try ||= locale_chain & locales_for_column
     end
 
-    def locale_sort_value(locale)
-      case locale
-      when I18n.locale
-        # Sort the current locale first.
-        "0"
-      when I18n.default_locale
-        # Sort the default locale second.
-        "1"
-      else
-        # Sort the rest alphabetically.
-        locale.to_s
-      end
+    def locale_chain
+      chain = []
+      chain << I18n.locale
+      chain << I18n.default_locale if @fallback
+      chain
+    end
+
+    def locales_for_column
+      @record.class.locales_for_column(@column)
     end
   end
 end

data/lib/traco/translates.rb

@@ -1,8 +1,9 @@
 module Traco
   module Translates
     def translates(*columns)
+      options = columns.extract_options!
       set_up_once
-      store_as_translatable_columns columns.map(&:to_sym)
+      store_as_translatable_columns columns.map(&:to_sym), options
     end
 
     private
@@ -18,19 +19,27 @@ module Traco
       self.translatable_columns = []
     end
 
-    def store_as_translatable_columns(columns)
+    def store_as_translatable_columns(columns, options)
+      fallback = options.fetch(:fallback, true)
+
       self.translatable_columns |= columns
 
       columns.each do |column|
-        define_localized_reader column
+        define_localized_reader column, :fallback => fallback
         define_localized_writer column
       end
     end
 
-    def define_localized_reader(column)
+    def define_localized_reader(column, options)
+      fallback = options[:fallback]
+
       define_method(column) do
         @localized_readers ||= {}
-        @localized_readers[column] ||= Traco::LocalizedReader.new(self, column)
+        @localized_readers[column] ||= Traco::LocalizedReader.new(
+          self,
+          column,
+          :fallback => fallback
+        )
         @localized_readers[column].value
       end
     end

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "0.2.6"
+  VERSION = "0.3.1"
 end

data/spec/traco_spec.rb

@@ -76,10 +76,10 @@ describe Post, "#title" do
     post.title.should == "Halloa"
   end
 
-  it "should fall back to any other locale if default locale is blank" do
+  it "should not fall back to any other locale if default locale is blank" do
     post.title_sv = " "
     post.title_en = ""
-    post.title.should == "Moi moi"
+    post.title.should be_nil
   end
 
   it "should return nil if all are blank" do
@@ -97,6 +97,28 @@ describe Post, "#title" do
     post.title.should == "title"
     post.body.should == "body"
   end
+
+  context "with :fallback => false" do
+    let(:post) {
+      Post.new(:title_sv => "Hej", :title_en => "Halloa")
+    }
+
+    before do
+      Post.translates :title, fallback: false
+      I18n.default_locale = :en
+    end
+
+    it "should not fall back to the default locale if locale has no column" do
+      I18n.locale = :ru
+      post.title.should be_nil
+    end
+
+    it "should not fall back to the default locale if blank" do
+      I18n.locale = :sv
+      post.title_sv = " "
+      post.title.should be_nil
+    end
+  end
 end
 
 describe Post, "#title=" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70236680064560 !ruby/object:Gem::Requirement
+  requirement: &70244124230460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70236680064560
+  version_requirements: *70244124230460
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70236680064100 !ruby/object:Gem::Requirement
+  requirement: &70244124230040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236680064100
+  version_requirements: *70244124230040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70236680063600 !ruby/object:Gem::Requirement
+  requirement: &70244124213140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236680063600
+  version_requirements: *70244124213140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70236680063180 !ruby/object:Gem::Requirement
+  requirement: &70244124212720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236680063180
+  version_requirements: *70244124212720
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70236680062740 !ruby/object:Gem::Requirement
+  requirement: &70244124212300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236680062740
+  version_requirements: *70244124212300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70236680062280 !ruby/object:Gem::Requirement
+  requirement: &70244124211880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236680062280
+  version_requirements: *70244124211880
 description: 
 email:
 - henrik@barsoom.se
@@ -113,12 +113,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2678658822643103053
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2678658822643103053
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5
@@ -130,4 +136,3 @@ test_files:
 - spec/app/sv.yml
 - spec/spec_helper.rb
 - spec/traco_spec.rb
-has_rdoc: