has_translations 0.3.1 → 0.3.2

data/README.md

@@ -1,4 +1,4 @@
-HasTranslations v0.3.1
+HasTranslations v0.3.2
 ======================
 
 This simple plugin creates translations for your model.

data/Rakefile

@@ -31,7 +31,7 @@ begin
     gemspec.email = "dmitry.polushkin@gmail.com"
     gemspec.homepage = "http://github.com/dmitry/has_translations"
     gemspec.authors = ["Dmitry Polushkin"]
-    gemspec.version = '0.3.0'
+    gemspec.version = '0.3.2'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/has_translations.gemspec

@@ -0,0 +1,54 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{has_translations}
+  s.version = "0.3.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Dmitry Polushkin"]
+  s.date = %q{2011-02-04}
+  s.description = %q{Create translations for your ActiveRecord models. Uses delegate pattern. Fully tested and used in a several production sites.}
+  s.email = %q{dmitry.polushkin@gmail.com}
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    "MIT-LICENSE",
+    "README.md",
+    "Rakefile",
+    "generators/has_translations/USAGE",
+    "generators/has_translations/has_translations_generator.rb",
+    "has_translations.gemspec",
+    "init.rb",
+    "install.rb",
+    "lib/has_translations.rb",
+    "tasks/has_translations_tasks.rake",
+    "test/.gitignore",
+    "test/has_translations_test.rb",
+    "test/schema.rb",
+    "test/test_helper.rb",
+    "uninstall.rb"
+  ]
+  s.homepage = %q{http://github.com/dmitry/has_translations}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.0}
+  s.summary = %q{Create translations for your ActiveRecord models.}
+  s.test_files = [
+    "test/has_translations_test.rb",
+    "test/schema.rb",
+    "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/lib/has_translations.rb

@@ -89,15 +89,23 @@ class ActiveRecord::Base
 
     translation_class_name = "#{self.model_name}Translation"
     translation_class = translation_class_name.constantize
-    belongs_to = self.model_name.demodulize.singularize.underscore.to_sym
+    belongs_to = self.model_name.demodulize.underscore.to_sym
 
     write_inheritable_attribute :has_translations_options, options
     class_inheritable_reader :has_translations_options
 
-    send :define_method, :find_or_build_translation do |*args|
-      locale = args.first.to_s
-      build = args.second.present?
-      find_translation(locale) || (build ? self.translations.build(:locale => locale) : self.translations.new(:locale => locale))
+    def find_or_create_translation(locale)
+      locale = locale.to_s
+      (find_translation(locale) || self.translations.new).tap do |t|
+        t.locale = locale
+      end
+    end
+
+    def find_or_build_translation(locale)
+      locale = locale.to_s
+      (find_translation(locale) || self.translations.build).tap do |t|
+        t.locale = locale
+      end
     end
 
     def translation(locale, fallback=has_translations_options[:fallback])
@@ -107,7 +115,7 @@ class ActiveRecord::Base
 
     def all_translations
       t = I18n.available_locales.map do |locale|
-        [locale, find_or_build_translation(locale)]
+        [locale, find_or_create_translation(locale)]
       end
       ActiveSupport::OrderedHash[t]
     end
@@ -128,7 +136,7 @@ class ActiveRecord::Base
     if options[:writer]
       attrs.each do |name|
         send :define_method, "#{name}=" do |value|
-          translation = find_or_build_translation(I18n.locale, true)
+          translation = find_or_build_translation(I18n.locale)
           translation.send(:"#{name}=", value)
         end
       end
@@ -140,12 +148,10 @@ class ActiveRecord::Base
     translation_class.validates_presence_of :locale
     translation_class.validates_uniqueness_of :locale, :scope => :"#{belongs_to}_id"
 
-    # Rails 3.0
-    if Object.const_defined?("ActiveModel")
-      scope :translated, lambda { |locale| {:conditions => ["#{translation_class.table_name}.locale = ?", locale.to_s], :joins => :translations} }
-    else
-      named_scope :translated, lambda { |locale| {:conditions => ["#{translation_class.table_name}.locale = ?", locale.to_s], :joins => :translations} }
-    end
+    # Workaround to support Rails 2
+    scope_method = if ActiveRecord::VERSION::MAJOR < 3 then :named_scope else :scope end
+
+    send scope_method, :translated, lambda { |locale| {:conditions => ["#{translation_class.table_name}.locale = ?", locale.to_s], :joins => :translations} }
 
     private
 

data/test/has_translations_test.rb

@@ -23,7 +23,10 @@ class HasTranslationsTest < Test::Unit::TestCase
 
   def test_reader_text_for_a_given_locale
     article = Article.create!
-    article_translation = ArticleTranslation.create!(:article => article, :locale => 'en', :description => 'desc', :text => 'text')
+    article_translation = ArticleTranslation.new(:description => 'desc', :text => 'text')
+    article_translation.article = article
+    article_translation.locale = 'en'
+    article_translation.save!
     assert_not_equal article.text, article_translation.text
     I18n.locale = :en
     assert_equal article.text, article_translation.text
@@ -45,7 +48,10 @@ class HasTranslationsTest < Test::Unit::TestCase
   def test_translations_association_and_translations
     article = Article.create!
     assert_equal [], article.translations
-    article_translation = ArticleTranslation.create!(:article => article, :locale => 'ru', :description => 'описание', :text => 'текст')
+    article_translation = ArticleTranslation.new(:description => 'описание', :text => 'текст')
+    article_translation.article = article
+    article_translation.locale = 'ru'
+    article_translation.save!
     assert_equal [], article.translations
     assert_equal [article_translation], article.reload.translations
     assert_equal 'текст', article.text
@@ -57,6 +63,12 @@ class HasTranslationsTest < Test::Unit::TestCase
     assert_equal [], ArticleTranslation.all
   end
 
+  def test_all_translation_works_fine_with_attr_accessible
+    article = Article.create!
+    t = article.all_translations
+    assert_equal 'ru', t[:ru].locale
+  end
+
   def test_translation_validations
     article_translation = ArticleTranslation.create(:description => 'description', :text => 'text')
     assert article_translation.errors[:locale].present?

data/test/schema.rb

@@ -22,15 +22,14 @@ ActiveRecord::Schema.define(:version => 0) do
 end
 
 class ArticleTranslation < ActiveRecord::Base
+  attr_accessible :description, :text
 end
-
 class Article < ActiveRecord::Base
   translations :description, :text, :writer => true
 end
 
 class TeamTranslation < ActiveRecord::Base
 end
-
 class Team < ActiveRecord::Base
   translations :text, :fallback => true, :nil => nil
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_translations
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Dmitry Polushkin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - Rakefile
 - generators/has_translations/USAGE
 - generators/has_translations/has_translations_generator.rb
+- has_translations.gemspec
 - init.rb
 - install.rb
 - lib/has_translations.rb
@@ -47,8 +48,8 @@ homepage: http://github.com/dmitry/has_translations
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -72,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Create translations for your ActiveRecord models.