puret 1.0.2 → 1.0.3

data/README.rdoc

@@ -2,7 +2,9 @@
 
 Puret is a minimal pure translation library for translating database values for Rails 3.
 
-Puret is quiet like model_translations http://github.com/janne/model_translations (and borrowed much of its code), but comes with generators to help you get started and does not create the translation model dynamically but create it with generator.
+Puret is quiet like model_translations http://github.com/janne/model_translations (and borrowed much of its code), but comes with generators to help you get started.
+
+Puret does not create the translation model dynamically (like model_translations does) but creates the file via generator. Puret wants to leave out as much magic as possible and want to allow customizing every part of your application.
 
 
 == Installation
@@ -43,7 +45,7 @@ You now need to create a migration for the translations table:
 
   create_table(:post_translations) do |t|
     t.references :post
-    t.string :locale, :limit => 2
+    t.string :locale
 
     t.string :title
     t.text :description
@@ -58,12 +60,24 @@ Now you are able to translate values for the attributes :title and :description
 
   I18n.locale = :en
   post.title = 'Puret really rocks!'
-  post.title #=> Puret really rocks!
   I18n.locale = :de
   post.title = 'Puret rockt wirklich!'
-  post.title #=> Puret rockt wirklich!
+
   I18n.locale = :en
   post.title #=> Puret really rocks!
+  I18n.locale = :de
+  post.title #=> Puret rockt wirklich!
+
+
+== Translation lookup fallback
+
+If a translation is not available in your locale, puret looks 
+
+1. for an instance method called *default_locale* and the corresponding translation
+2. for a class method called *default_locale* and the corresponding translation
+3. for a translation in I18n.default_locale
+
+In case a translation is not available in the default locale, puret uses the first locale it could find. That order is specified by creation time, so the first created translation will be returned.
 
 
 == Generators

data/lib/generators/puret/model/templates/migration.rb

@@ -2,7 +2,7 @@ class Create<%= translations_table_name.camelize %> < ActiveRecord::Migration
   def self.up 
     create_table(:<%= translations_table_name %>) do |t|
       t.references :<%= reference_name %>
-      t.string :locale, :limit => 2
+      t.string :locale
 
 <% attributes.each do |attribute| -%>
       t.<%= attribute.type %> :<%= attribute.name %>

data/lib/puret/active_record_extensions.rb

@@ -15,7 +15,7 @@ module Puret
       # Configure translated attributes.
       # Eg:
       #   class Post < ActiveRecord::Base
-      #     puret :title, description
+      #     puret :title, :description
       #   end
       def puret(*attributes)
         make_it_puret! unless included_modules.include?(InstanceMethods)
@@ -37,7 +37,7 @@ module Puret
             # use default locale, if present.
             # Otherwise use first translation
             translation = translations.detect { |t| t.locale.to_sym == I18n.locale } ||
-              translations.detect { |t| t.locale.to_sym == I18n.default_locale } ||
+              translations.detect { |t| t.locale.to_sym == puret_default_locale } ||
               translations.first
 
             translation ? translation[attribute] : nil
@@ -51,12 +51,18 @@ module Puret
       def make_it_puret!
         include InstanceMethods
 
-        has_many :translations, :class_name => "#{self.to_s}Translation", :dependent => :destroy
+        has_many :translations, :class_name => "#{self.to_s}Translation", :dependent => :destroy, :order => "created_at DESC"
         after_save :update_translations!
       end
     end
 
     module InstanceMethods
+      def puret_default_locale
+        return default_locale.to_sym if respond_to?(:default_locale)
+        return self.class.default_locale.to_sym if self.class.respond_to?(:default_locale)
+        I18n.default_locale
+      end
+
       # attributes are stored in @puret_attributes instance variable via setter
       def puret_attributes
         @puret_attributes ||= Hash.new { |hash, key| hash[key] = {} }

data/lib/puret/version.rb

@@ -1,3 +1,3 @@
 module Puret
-  VERSION = "1.0.2".freeze
+  VERSION = "1.0.3".freeze
 end

data/test/puret_test.rb

@@ -12,7 +12,7 @@ class PuretTest < ActiveSupport::TestCase
   end
 
   test "database setup" do
-    assert Post.count == 1
+    assert_equal 1, Post.count
   end
  
   test "allow translation" do
@@ -23,10 +23,40 @@ class PuretTest < ActiveSupport::TestCase
     assert_equal 'English title', Post.first.title
   end
  
-  test "assert fallback to default" do
-    assert Post.first.title == 'English title'
+  test "assert fallback to default locale" do
+    post = Post.first
+    I18n.locale = :sv
+    post.title = 'Svensk titel'
+    I18n.locale = :en
+    assert_equal 'English title', post.title
+    I18n.locale = :de
+    assert_equal 'English title', post.title
+  end
+ 
+  test "assert fallback to saved default locale defined on instance" do
+    post = Post.first
+    def post.default_locale() :sv; end
+    assert_equal :sv, post.puret_default_locale
+    I18n.locale = :sv
+    post.title = 'Svensk titel'
+    post.save!
+    I18n.locale = :en
+    assert_equal 'English title', post.title
+    I18n.locale = :de
+    assert_equal 'Svensk titel', post.title
+  end
+ 
+  test "assert fallback to saved default locale defined on class level" do
+    post = Post.first
+    def Post.default_locale() :sv; end
+    assert_equal :sv, post.puret_default_locale
+    I18n.locale = :sv
+    post.title = 'Svensk titel'
+    post.save!
+    I18n.locale = :en
+    assert_equal 'English title', post.title
     I18n.locale = :de
-    assert Post.first.title == 'English title'
+    assert_equal 'Svensk titel', post.title
   end
  
   test "post has_many translations" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: puret
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - "Johannes J\xC3\xB6rg Schmidt"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +01:00
+date: 2010-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: []