traco 0.2.3 → 0.2.4

data/lib/traco.rb

@@ -1,4 +1,4 @@
 require "traco/version"
 require "traco/translates"
 require "traco/class_methods"
-require "traco/instance_methods"
+require "traco/localized_reader"

data/lib/traco/class_methods.rb

@@ -3,13 +3,7 @@ module Traco
     def locales_for_column(column)
       column_names.grep(/\A#{column}_([a-z]{2})\z/) {
         $1.to_sym
-      }.sort_by { |locale|
-        if locale == I18n.default_locale
-         "0"
-        else
-          locale.to_s
-        end
-      }
+      }.sort_by { |locale| locale_sort_value(locale) }
     end
 
     def human_attribute_name(attribute, options = {})
@@ -25,6 +19,16 @@ module Traco
 
     private
 
+    def locale_sort_value(locale)
+      if locale == I18n.default_locale
+        # Sort the default locale first.
+        "0"
+      else
+        # Sort the rest alphabetically.
+        locale.to_s
+      end
+    end
+
     def translates?(column)
       translatable_columns.include?(column.to_sym)
     end

data/lib/traco/localized_reader.rb

@@ -0,0 +1,39 @@
+module Traco
+  class LocalizedReader
+    def initialize(record, column)
+      @record = record
+      @column = column
+    end
+
+    def value
+      locales.each do |locale|
+        value = @record.send("#{@column}_#{locale}")
+        return value if value.present?
+      end
+
+      nil
+    end
+
+    private
+
+    def locales
+      @record.class.locales_for_column(@column).sort_by { |locale|
+        locale_sort_value(locale)
+      }
+    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
+    end
+  end
+end

data/lib/traco/translates.rb

@@ -18,7 +18,6 @@ module Traco
       return if respond_to?(:translatable_columns)
 
       extend Traco::ClassMethods
-      include Traco::InstanceMethods
 
       class_attribute :translatable_columns
       self.translatable_columns = []
@@ -30,13 +29,14 @@ module Traco
 
     def define_localized_reader(column)
       define_method(column) do
-        read_localized_value(column)
+        @localized_reader ||= Traco::LocalizedReader.new(self, column)
+        @localized_reader.value
       end
     end
 
     def define_localized_writer(column)
       define_method("#{column}=") do |value|
-        write_localized_value(column, value)
+        send("#{column}_#{I18n.locale}=", value)
       end
     end
   end

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70300030903820 !ruby/object:Gem::Requirement
+  requirement: &70337754840160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300030903820
+  version_requirements: *70337754840160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70300030903360 !ruby/object:Gem::Requirement
+  requirement: &70337754839700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300030903360
+  version_requirements: *70337754839700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70300030902900 !ruby/object:Gem::Requirement
+  requirement: &70337754839240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300030902900
+  version_requirements: *70337754839240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70300030902460 !ruby/object:Gem::Requirement
+  requirement: &70337754838800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300030902460
+  version_requirements: *70337754838800
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70300030901980 !ruby/object:Gem::Requirement
+  requirement: &70337754838320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300030901980
+  version_requirements: *70337754838320
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70300030901500 !ruby/object:Gem::Requirement
+  requirement: &70337754837840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300030901500
+  version_requirements: *70337754837840
 description: 
 email:
 - henrik@barsoom.se
@@ -93,7 +93,7 @@ files:
 - Rakefile
 - lib/traco.rb
 - lib/traco/class_methods.rb
-- lib/traco/instance_methods.rb
+- lib/traco/localized_reader.rb
 - lib/traco/translates.rb
 - lib/traco/version.rb
 - spec/app/post.rb

data/lib/traco/instance_methods.rb

@@ -1,28 +0,0 @@
-module Traco
-  module InstanceMethods
-
-    private
-
-    def read_localized_value(column)
-      locales_for_reading_column(column).each do |locale|
-        value = send("#{column}_#{locale}")
-        return value if value.present?
-      end
-      nil
-    end
-
-    def write_localized_value(column, value)
-      send("#{column}_#{I18n.locale}=", value)
-    end
-
-    def locales_for_reading_column(column)
-      self.class.locales_for_column(column).sort_by { |locale|
-        case locale
-        when I18n.locale then "0"
-        when I18n.default_locale then "1"
-        else locale.to_s
-        end
-      }
-    end
-  end
-end