has_translations 0.3.4 → 0.3.5

data/README.md

@@ -1,10 +1,10 @@
-HasTranslations v0.3.3
+HasTranslations v0.3.5
 ======================
 
 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`)
+Tested with ActiveRecord versions: 2.3.5, 2.3.9, 3.0.0, 3.1.0 (to test with Rails 3.1 run `rake RAILS_VERSION=3.1`)
 And tested with ruby 1.8.7 and 1.9.2
 
 Installation

data/has_translations.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.license          = 'MIT'
-  s.add_dependency "activesupport", "~> 2.3"
-  s.add_dependency 'activerecord', '~> 2.3'
+  s.add_dependency 'activesupport', '> 2.3'
+  s.add_dependency 'activerecord', '> 2.3'
 end

data/lib/has_translations.rb

@@ -78,27 +78,35 @@ class ActiveRecord::Base
   # <tt>all_translations</tt> method that returns all possible translations in
   # ordered hash (useful when creating forms with nested attributes).
   def self.translations(*attrs)
+    new_options = attrs.extract_options!
     options = {
       :fallback => false,
       :reader => true,
       :writer => false,
-      :nil => ''
-    }.merge(attrs.extract_options!)
+      :nil => '',
+      :autosave => new_options[:writer]
+    }.merge(new_options)
 
-    options.assert_valid_keys([:fallback, :reader, :writer, :nil])
+    options.assert_valid_keys([:fallback, :reader, :writer, :nil, :autosave])
 
     translation_class_name = "#{self.model_name}Translation"
     translation_class = translation_class_name.constantize
     belongs_to = self.model_name.demodulize.underscore.to_sym
 
-    write_inheritable_attribute :has_translations_options, options
-    class_inheritable_reader :has_translations_options
+    if ActiveRecord::VERSION::MAJOR < 3
+      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
+      scope_method = :named_scope
+    else
+      class_attribute :has_translations_options
+      self.has_translations_options = options
+
+      scope_method = :scope
+    end
 
     # associations, validations and scope definitions
-    has_many :translations, :class_name => translation_class_name, :dependent => :destroy, :autosave => true
+    has_many :translations, :class_name => translation_class_name, :dependent => :destroy, :autosave => options[:autosave]
     translation_class.belongs_to belongs_to
     translation_class.validates_presence_of :locale
     translation_class.validates_uniqueness_of :locale, :scope => :"#{belongs_to}_id"

data/lib/has_translations/version.rb

@@ -1,3 +1,3 @@
 module HasTranslations
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 
-rails_version = "~> #{ENV['RAILS_VERSION'] || '3.0.0'}"
+rails_version = "~> #{ENV['RAILS_VERSION'] || '3.1.0'}"
 
 gem 'activerecord', rails_version
 gem 'activesupport', rails_version

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_translations
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Dmitry Polushkin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 Z
+date: 2011-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -23,7 +23,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
@@ -38,7 +38,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version 
         hash: 5
         segments: