traco 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDRjODY3Yjg3NmE2MmJiZWQ3NjBhNGE2MDJhNDIwM2ZhNjY4MjNjOQ==
+  data.tar.gz: !binary |-
+    MzIxZjkyY2JiODc3YzU3NDhmYWNiNzI2ODMzMjI5MWY4ZmQ2YmRhMQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZTNhZjQyMzEyZTgyNGQwYzg1NTgyZWIzYTc2MjJlZWUwYTNhMGY5OTkwMWQ3
+    YzNhMWEyNDhiNjE0ZjYxYTc5N2IzMjljOWEyOGVlNDVhZTZhZTljOWE2MTM2
+    NzgwYTk3OGNjY2Y3ZWY0YTcwNWQxMzg2YWI4MWZmMDBiZDM5YzA=
+  data.tar.gz: !binary |-
+    YTQ4NmNhMDMxZmI2NTQxMzBkMWYzNDc1MGU0OTgzODEyYTUzZTE3MTAyOTFi
+    NDhlZDg5MzEzZTVjZThlYmU3NzExYTZmZjM1ZTMwYTQxOWQyMTE1ZTMxZjYw
+    NGM5ZDVlYTViYTlmMDE4MmI3YzgzMGQ2Y2U5YmQyYTgxMGI0NGI=

data/README.md

@@ -97,6 +97,8 @@ end
 
 then `#title` will return `nil` if there is no translation in the current locale, instead of falling back to the default locale.
 
+If you still want to fall back in some cases, call `post.title(fallback: true)`.
+
 
 ### Overriding methods
 
@@ -144,7 +146,6 @@ Possible improvements to make:
 
   * Validation that checks that at least one translation for a column exists.
   * Validation that checks that every translation for a column exists.
-  * Option to disable fallback.
   * Scopes like `translated`, `translated_to(locale)`.
   * Support for region locales, like `en-US` and `en-GB`.
 

data/lib/traco/attribute_setup.rb

@@ -49,9 +49,11 @@ module Traco
     end
 
     def define_localized_reader(attribute, options)
-      fallback = options.fetch(:fallback, true)
+      default_fallback = options.fetch(:fallback, true)
+
+      custom_define_method(attribute) do |method_opts = {}|
+        fallback = method_opts.fetch(:fallback, default_fallback)
 
-      custom_define_method(attribute) do
         @localized_readers ||= {}
         @localized_readers[attribute] ||= Traco::LocalizedReader.new(self, attribute, fallback: fallback)
         @localized_readers[attribute].value

data/lib/traco/version.rb

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

data/spec/traco_spec.rb

@@ -111,6 +111,12 @@ describe Post, "#title" do
     post.title.should be_nil
   end
 
+  it "does not fall back if called with fallback: false" do
+    I18n.locale = :sv
+    post.title_sv = ""
+    post.title(fallback: false).should be_nil
+  end
+
   it "returns nil if all are blank" do
     post.title_sv = " "
     post.title_en = ""
@@ -136,7 +142,7 @@ describe Post, "#title" do
     post.title.should == "title"
     post.body.should == "body"
   end
-  
+
   it "reflects locale change" do
     post.title.should == "Hej"
     I18n.locale = :en
@@ -145,7 +151,7 @@ describe Post, "#title" do
     post.title.should == "Hej"
   end
 
-  context "with fallback: false" do
+  context "when the translation was defined with fallback: false" do
     let(:post) {
       Post.new(title_sv: "Hej", title_en: "Halloa")
     }
@@ -165,6 +171,11 @@ describe Post, "#title" do
       post.title_sv = " "
       post.title.should be_nil
     end
+
+    it "still falls back if called with fallback: true" do
+      I18n.locale = :ru
+      post.title(fallback: true).should == "Halloa"
+    end
   end
 end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,33 +93,26 @@ files:
 - traco.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4140218999015648570
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4140218999015648570
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Translatable columns for Rails 3 or better, stored in the model table itself.
 test_files:
 - spec/app/post.rb