has_translations 0.3.2 → 0.3.3

data/README.md

@@ -1,10 +1,11 @@
-HasTranslations v0.3.2
+HasTranslations v0.3.3
 ======================
 
 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`)
+And tested with ruby 1.8.7 and 1.9.2
 
 Installation
 ============

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.2'
+    gemspec.version = '0.3.3'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/TODO

@@ -0,0 +1,2 @@
+http://github.com/technicalpickles/jeweler
+http://wiki.github.com/qrush/gemcutter/create

data/has_translations.gemspec

@@ -5,15 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_translations}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   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.date = %q{2011-02-21}
   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"
+    "README.md",
+    "TODO"
   ]
   s.files = [
     "MIT-LICENSE",
@@ -34,7 +35,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/dmitry/has_translations}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Create translations for your ActiveRecord models.}
   s.test_files = [
     "test/has_translations_test.rb",
@@ -43,6 +44,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/has_translations.rb

@@ -94,6 +94,18 @@ class ActiveRecord::Base
     write_inheritable_attribute :has_translations_options, options
     class_inheritable_reader :has_translations_options
 
+    # Workaround to support Rails 2
+    scope_method = if ActiveRecord::VERSION::MAJOR < 3 then :named_scope else :scope end
+
+    # associations, validations and scope definitions
+    has_many :translations, :class_name => translation_class_name, :dependent => :destroy
+    translation_class.belongs_to belongs_to
+    translation_class.validates_presence_of :locale
+    translation_class.validates_uniqueness_of :locale, :scope => :"#{belongs_to}_id"
+    send scope_method, :translated, lambda { |locale| {:conditions => ["#{translation_class.table_name}.locale = ?", locale.to_s], :joins => :translations} }
+
+    public
+
     def find_or_create_translation(locale)
       locale = locale.to_s
       (find_translation(locale) || self.translations.new).tap do |t|
@@ -142,17 +154,6 @@ class ActiveRecord::Base
       end
     end
 
-    has_many :translations, :class_name => translation_class_name, :dependent => :destroy
-    
-    translation_class.belongs_to belongs_to
-    translation_class.validates_presence_of :locale
-    translation_class.validates_uniqueness_of :locale, :scope => :"#{belongs_to}_id"
-
-    # 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
 
     def find_translation(locale)

data/test/has_translations_test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'test_helper'
 
 class HasTranslationsTest < Test::Unit::TestCase

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_translations
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 21
+  prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Dmitry Polushkin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +00:00
+date: 2011-02-21 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
+- TODO
 files: 
 - MIT-LICENSE
 - README.md
@@ -43,6 +44,7 @@ files:
 - test/schema.rb
 - test/test_helper.rb
 - uninstall.rb
+- TODO
 has_rdoc: true
 homepage: http://github.com/dmitry/has_translations
 licenses: []
@@ -73,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Create translations for your ActiveRecord models.