has_translations 0.3.0 → 0.3.1

data/README.md

@@ -1,9 +1,11 @@
-HasTranslations v0.3.pre
-====================
+HasTranslations v0.3.1
+======================
 
 This simple plugin creates translations for your model.
 Uses delegation pattern: http://en.wikipedia.org/wiki/Delegation_pattern
 
+Tested with ActiveRecord versions: 2.3.5, 2.3.9, 3.0.0 (to test with Rails 3 run `rake RAILS_VERSION=3.0`)
+
 Installation
 ============
 
@@ -117,7 +119,6 @@ I suggest you to use latest i18n gem, include it in your rails 2 environment:
 TODO
 ====
 
-* active record 3 (rails 3) support
 * add installation description to readme
 * model and migration generators
 * caching
@@ -139,9 +140,7 @@ I know three of them:
 Used in
 =======
 
-* [noch.es](http://noch.es/)
-* [eten.es](http://www.eten.es))
-* [sem.ee](http://sem.ee/)
+[noch.es](http://noch.es/), [eten.es](http://www.eten.es), [sem.ee](http://sem.ee/)
 
 
-Copyright (c) 2009-2010 [Dmitry Polushkin], released under the MIT license
+Copyright (c) 2009-2010 [Dmitry Polushkin], released under the MIT license

data/lib/has_translations.rb

@@ -140,7 +140,12 @@ class ActiveRecord::Base
     translation_class.validates_presence_of :locale
     translation_class.validates_uniqueness_of :locale, :scope => :"#{belongs_to}_id"
 
-    named_scope :translated, lambda { |locale| {:conditions => ["#{translation_class.table_name}.locale = ?", locale.to_s], :joins => :translations} }
+    # 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
 
     private
 
@@ -149,4 +154,4 @@ class ActiveRecord::Base
       translations.detect { |t| t.locale == locale }
     end
   end
-end
+end

data/test/has_translations_test.rb

@@ -7,7 +7,6 @@ class HasTranslationsTest < Test::Unit::TestCase
     [Article, ArticleTranslation, Team, TeamTranslation].each do |k|
       k.delete_all
     end
-    I18n.available_locales = :ru, :en, :es
     I18n.locale = :ru
   end
 

data/test/test_helper.rb

@@ -1,14 +1,26 @@
 require 'rubygems'
 require 'test/unit'
 
-gem 'activerecord', '~> 2.3'
-gem 'i18n', '~> 0.4'
+case ENV['RAILS_VERSION']
+when '3.0' then
+  gem 'activerecord', '~> 3.0.0'
+  gem 'activesupport', '~> 3.0.0'
+else
+  gem 'activerecord', '~> 2.3.0'
+  gem 'activesupport', '~> 2.3.0'
+end
 
 require 'active_record'
 require 'logger'
 
 require 'has_translations'
 
+begin
+  I18n.available_locales = :ru, :en, :es
+rescue
+  p "[WARNING]: This test should have the I18n.available_locales= method, which were included in versions ~> 0.3.0"
+end
+
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
 ActiveRecord::Base.logger = nil
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
@@ -22,4 +34,4 @@ def teardown_db
   ActiveRecord::Base.connection.tables.each do |table|
     ActiveRecord::Base.connection.drop_table(table)
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_translations
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Dmitry Polushkin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +01:00
+date: 2010-09-09 00:00:00 +01:00
 default_executable: 
 dependencies: []