traco 1.2.4 → 1.3.0

data/README.markdown

@@ -28,6 +28,8 @@ Write a migration to get database columns with locale suffixes, e.g. `title_sv`
 
 Don't create a database column named `title` without a suffix, since Traco will define a method with that name.
 
+E.g. `title_pt-BR` is also fine, if you need to use that locale format.
+
 Declare the attributes in the model:
 
     class Post < ActiveRecord::Base
@@ -70,6 +72,8 @@ The return value will be sorted like `[:title_sv, :title_en, :body_sv, :body_en]
 
 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
 

data/lib/traco/class_methods.rb

@@ -1,7 +1,9 @@
 module Traco
   module ClassMethods
+    LOCALE_RE = /[a-zA-Z]{2}(?:-[a-zA-Z]{2})?/
+
     def locales_for_attribute(attribute)
-      re = /\A#{attribute}_([a-z]{2})\z/
+      re = /\A#{attribute}_(#{LOCALE_RE})\z/
 
       column_names.
         grep(re) { $1.to_sym }.
@@ -18,7 +20,7 @@ module Traco
 
     def human_attribute_name(attribute, options = {})
       default = super(attribute, options.merge(:default => ""))
-      if default.blank? && attribute.to_s.match(/\A(\w+)_([a-z]{2})\z/)
+      if default.blank? && attribute.to_s.match(/\A(\w+)_(#{LOCALE_RE})\z/)
         column, locale = $1, $2.to_sym
         if translates?(column)
           return "#{super(column, options)} (#{locale_name(locale)})"

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "1.2.4"
+  VERSION = "1.3.0"
 end

data/spec/spec_helper.rb

@@ -23,8 +23,8 @@ ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":me
 silence_stream(STDOUT) do
   ActiveRecord::Schema.define(:version => 0) do
     create_table :posts, :force => true do |t|
-      t.string :title_sv, :title_en, :title_fi
-      t.string :body_sv, :body_en, :body_fi
+      t.string :title_sv, :title_en, :title_fi, 'title_pt-BR'
+      t.string :body_sv, :body_en, :body_fi, 'body_pt-BR'
     end
   end
 end

data/spec/traco_spec.rb

@@ -46,7 +46,7 @@ describe Post, ".locales_for_attribute" do
   it "lists the locales, default first and then alphabetically" do
     I18n.default_locale = :fi
     Post.locales_for_attribute(:title).should == [
-      :fi, :en, :sv
+      :fi, :en, :"pt-BR", :sv, 
     ]
   end
 end
@@ -59,15 +59,15 @@ describe Post, ".locale_columns" do
 
   it "lists the columns-with-locale for that attribute, default locale first and then alphabetically" do
     Post.locale_columns(:title).should == [
-      :title_fi, :title_en, :title_sv
+      :title_fi, :title_en, :"title_pt-BR", :title_sv
     ]
   end
 
   it "supports multiple attributes" do
     Post.translates :body
     Post.locale_columns(:body, :title).should == [
-      :body_fi, :body_en, :body_sv,
-      :title_fi, :title_en, :title_sv
+      :body_fi, :body_en, :"body_pt-BR", :body_sv,
+      :title_fi, :title_en, :"title_pt-BR", :title_sv
     ]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -143,12 +143,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2274355270320966914
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2274355270320966914
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24