traco 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a8bd7fc75a987a4f1f791ac9d4e1eec0aed2a63e
-  data.tar.gz: 4089adbb897a21f2eefd3c3ea2cc88ea746705e2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTBlNWVjMTY0MjQ4YzU3NGIwNjM0ZTlmYjI0Yzc4NjUyNzY1MGQ5OQ==
+  data.tar.gz: !binary |-
+    NDI5OGU2OGY5MzEwZjEyNWU4MWFlNzYzMjkxMmI1ZWZiZjY5YzYwMw==
 SHA512:
-  metadata.gz: 87640e9a6cf728ff073ed250497821582555b47a89c1274c14cdefcde446e39676fbd9091de27ac1f7f4ac373255393787600a1872469d27a858e57a86f44c6e
-  data.tar.gz: 1b64b064d9918cfb1909447dfb2a2f840de1f0f0f5142a4e5583b44b83c652f601557aab24712bff45d9d873a7702820fce21604f5a87e71ecf03fb6b0e64941
+  metadata.gz: !binary |-
+    Y2M4NGIyNDhlNmI0OTE5YTI1ZTI1ODQyOWE1YmMyZDM4YjM2ZmZlOTk1MjI0
+    NGQ4OWVhYjk1OTY4Y2UyODJhNGQ1MWIxMzAzNjRhZjU3YjRhMDdlYmMzMzk2
+    ZTBkMTQzNmFiN2QyZDAzMWFlODk4OWQ2ODYzNGYzYjQ5ZGY4MDQ=
+  data.tar.gz: !binary |-
+    ZDYzMDJkZTJhNjVjZTQ3YTZkNjExMTM3YmZlMTI5YmE0ZGVjYmM5OWUyMjc3
+    Y2ZmMzMxNzMxNTY0MmUzN2NhNGIwYmYwMzVjNjAzYjQxNmQxMGFmY2NhOTAw
+    ZTM5NzcyODM1Yzc3MDBkN2Q5MTE5OTE1YjVlNmE3NmY0MzIxM2E=

data/README.md

@@ -6,7 +6,7 @@ Translatable attributes for Rails 3 and 4 (Ruby 1.9+), stored in the model table
 
 Inspired by Iain Hecker's [translatable_columns](https://github.com/iain/translatable_columns/).
 
-To store translations outside the model, see Sven Fuchs' [globalize3](https://github.com/svenfuchs/globalize3).
+To store translations outside the model, see Sven Fuchs' [Globalize](https://github.com/globalize/globalize).
 
 
 ## Usage
@@ -155,7 +155,7 @@ Possible improvements to make:
 
 By [Barsoom](http://barsoom.se) under the MIT license:
 
->  Copyright (c) 2012 Barsoom AB
+>  Copyright © 2012–2014 Barsoom AB
 >
 >  Permission is hereby granted, free of charge, to any person obtaining a copy
 >  of this software and associated documentation files (the "Software"), to deal

data/lib/traco/attribute_setup.rb

@@ -54,9 +54,7 @@ module Traco
       custom_define_method(attribute) do |method_opts = {}|
         fallback = method_opts.fetch(:fallback, default_fallback)
 
-        @localized_readers ||= {}
-        @localized_readers[attribute] ||= Traco::LocalizedReader.new(self, attribute, fallback: fallback)
-        @localized_readers[attribute].value
+        Traco::LocalizedReader.new(self, attribute, fallback: fallback).value
       end
     end
 

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/spec/traco_spec.rb

@@ -5,28 +5,28 @@ require "traco"
 
 describe ActiveRecord::Base, ".translates" do
   it "is available" do
-    Post.should respond_to :translates
+    expect(Post).to respond_to :translates
   end
 
   it "adds functionality" do
-    Post.new.should_not respond_to :title
+    expect(Post.new).not_to respond_to :title
     Post.translates :title
-    Post.new.should respond_to :title
+    expect(Post.new).to respond_to :title
   end
 
   it "can be run more than once" do
-    Post.new.should_not respond_to :title, :body
+    expect(Post.new).not_to respond_to :title, :body
     Post.translates :title
     Post.translates :body
-    Post.new.should respond_to :title, :body
+    expect(Post.new).to respond_to :title, :body
   end
 
   it "inherits columns from the superclass" do
     Post.translates :title
     SubPost.translates :body
-    SubPost.new.should respond_to :title, :body
-    Post.new.should respond_to :title
-    Post.new.should_not respond_to :body
+    expect(SubPost.new).to respond_to :title, :body
+    expect(Post.new).to respond_to :title
+    expect(Post.new).not_to respond_to :body
   end
 end
 
@@ -36,7 +36,7 @@ describe Post, ".translatable_attributes" do
   end
 
   it "lists the translatable attributes" do
-    Post.translatable_attributes.should == [ :title ]
+    expect(Post.translatable_attributes).to match_array [ :title ]
   end
 end
 
@@ -47,7 +47,7 @@ describe Post, ".locales_for_attribute" do
 
   it "lists the locales, default first and then alphabetically" do
     I18n.default_locale = :"pt-BR"
-    Post.locales_for_attribute(:title).should == [
+    expect(Post.locales_for_attribute(:title)).to match_array [
       :pt_br, :en, :sv
     ]
   end
@@ -60,14 +60,14 @@ describe Post, ".locale_columns" do
   end
 
   it "lists the columns-with-locale for that attribute, default locale first and then alphabetically" do
-    Post.locale_columns(:title).should == [
+    expect(Post.locale_columns(:title)).to match_array [
       :title_pt_br, :title_en, :title_sv
     ]
   end
 
   it "supports multiple attributes" do
     Post.translates :body
-    Post.locale_columns(:body, :title).should == [
+    expect(Post.locale_columns(:body, :title)).to match_array [
       :body_pt_br, :body_en, :body_sv,
       :title_pt_br, :title_en, :title_sv
     ]
@@ -81,7 +81,7 @@ describe Post, ".current_locale_column" do
 
   it "returns the column name for the current locale" do
     I18n.locale = :sv
-    Post.current_locale_column(:title).should == :title_sv
+    expect(Post.current_locale_column(:title)).to eq :title_sv
   end
 end
 
@@ -97,42 +97,50 @@ describe Post, "#title" do
   end
 
   it "gives the title in the current locale" do
-    post.title.should == "Hej"
+    expect(post.title).to eq "Hej"
   end
 
   it "handles dashed locales" do
     I18n.locale = :"pt-BR"
-    post.title_pt_br.should == "Olá"
-    post.title.should == "Olá"
+    expect(post.title_pt_br).to eq "Olá"
+    expect(post.title).to eq "Olá"
   end
 
   it "falls back to the default locale if locale has no column" do
     I18n.locale = :ru
-    post.title.should == "Halloa"
+    expect(post.title).to eq "Halloa"
   end
 
   it "falls back to the default locale if blank" do
     post.title_sv = " "
-    post.title.should == "Halloa"
+    expect(post.title).to eq "Halloa"
   end
 
   it "does not fall back to any other locale if default locale is blank" do
     post.title_sv = " "
     post.title_en = ""
-    post.title.should be_nil
+    expect(post.title).to 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
+    expect(post.title(fallback: false)).to be_nil
+  end
+
+  # Had a bug: https://github.com/barsoom/traco/issues/25
+  it "does not incorrectly memoize fallback state" do
+    I18n.locale = :sv
+    post.title_sv = ""
+    expect(post.title(fallback: :any)).not_to be_nil
+    expect(post.title(fallback: false)).to be_nil
   end
 
   it "returns nil if all are blank" do
     post.title_sv = " "
     post.title_en = ""
     post.title_pt_br = nil
-    post.title.should be_nil
+    expect(post.title).to be_nil
   end
 
   it "is overridable" do
@@ -142,7 +150,7 @@ describe Post, "#title" do
       end
     end
 
-    post.title.should == "jeH"
+    expect(post.title).to eq "jeH"
   end
 
   # Had a regression.
@@ -150,16 +158,16 @@ describe Post, "#title" do
     Post.translates :title, :body
     post.title_sv = "title"
     post.body_sv = "body"
-    post.title.should == "title"
-    post.body.should == "body"
+    expect(post.title).to eq "title"
+    expect(post.body).to eq "body"
   end
 
   it "reflects locale change" do
-    post.title.should == "Hej"
+    expect(post.title).to eq "Hej"
     I18n.locale = :en
-    post.title.should == "Halloa"
+    expect(post.title).to eq "Halloa"
     I18n.locale = :sv
-    post.title.should == "Hej"
+    expect(post.title).to eq "Hej"
   end
 
   context "when the translation was defined with fallback: false" do
@@ -174,18 +182,18 @@ describe Post, "#title" do
 
     it "does not fall back to the default locale if locale has no column" do
       I18n.locale = :ru
-      post.title.should be_nil
+      expect(post.title).to be_nil
     end
 
     it "does not fall back to the default locale if blank" do
       I18n.locale = :sv
       post.title_sv = " "
-      post.title.should be_nil
+      expect(post.title).to be_nil
     end
 
     it "still falls back if called with fallback: :default" do
       I18n.locale = :ru
-      post.title(fallback: :default).should == "Halloa"
+      expect(post.title(fallback: :default)).to eq "Halloa"
     end
   end
 
@@ -198,12 +206,12 @@ describe Post, "#title" do
 
     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"
+      expect(post.title).to eq "Hej"
     end
 
     it "prefers the default locale" do
       post = Post.new(title_en: "Hello", title_pt_br: "", title_sv: "Hej")
-      post.title.should == "Hello"
+      expect(post.title).to eq "Hello"
     end
   end
 end
@@ -218,20 +226,20 @@ describe Post, "#title=" do
   it "assigns in the current locale" do
     I18n.locale = :sv
     post.title = "Hej"
-    post.title_sv.should == "Hej"
+    expect(post.title_sv).to eq "Hej"
   end
 
   it "handles dashed locales" do
     I18n.locale = :"pt-BR"
     post.title = "Olá"
-    post.title_pt_br.should == "Olá"
+    expect(post.title_pt_br).to eq "Olá"
   end
 
   it "raises if locale has no column" do
     I18n.locale = :ru
-    lambda {
+    expect {
       post.title = "Privet"
-    }.should raise_error(NoMethodError, /title_ru/)
+    }.to raise_error(NoMethodError, /title_ru/)
   end
 end
 
@@ -242,32 +250,32 @@ describe Post, ".human_attribute_name" do
   end
 
   it "uses explicit translations if present" do
-    Post.human_attribute_name(:title_sv).should == "Svensk titel"
+    expect(Post.human_attribute_name(:title_sv)).to eq "Svensk titel"
   end
 
   it "appends translated language name if present" do
-    Post.human_attribute_name(:title_en).should == "Titel (engelska)"
+    expect(Post.human_attribute_name(:title_en)).to eq "Titel (engelska)"
   end
 
   it "appends an abbreviation when language name is not translated" do
-    Post.human_attribute_name(:title_pt_br).should == "Titel (PT-BR)"
+    expect(Post.human_attribute_name(:title_pt_br)).to eq "Titel (PT-BR)"
   end
 
   it "passes through the default behavior for untranslated attributes" do
-    Post.human_attribute_name(:title).should == "Titel"
+    expect(Post.human_attribute_name(:title)).to eq "Titel"
   end
 
   it "passes through untranslated attributes even if the name suggests it's translated" do
-    Post.human_attribute_name(:body_sv).should == "Body sv"
+    expect(Post.human_attribute_name(:body_sv)).to eq "Body sv"
   end
 
   # ActiveModel::Errors#full_messages passes in an ugly default.
 
   it "does not honor passed-in defaults for locale columns" do
-    Post.human_attribute_name(:title_en, default: "Title en").should == "Titel (engelska)"
+    expect(Post.human_attribute_name(:title_en, default: "Title en")).to eq "Titel (engelska)"
   end
 
   it "passes through defaults" do
-    Post.human_attribute_name(:body_sv, default: "Boday").should == "Boday"
+    expect(Post.human_attribute_name(:body_sv, default: "Boday")).to eq "Boday"
   end
 end

data/traco.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = "Translatable columns for Rails 3 or better, stored in the model table itself."
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Translatable columns for Rails 3 or better, stored in the model table itself.