globalize2 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/globalize2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{globalize2}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sven Fuchs, Joshua Harvey, Clemens Kofler"]
-  s.date = %q{2010-04-22}
+  s.date = %q{2010-04-29}
   s.description = %q{Rails I18n: de-facto standard library for ActiveRecord data translation}
   s.email = %q{joshmh@gmail.com}
   s.extra_rdoc_files = [

data/lib/globalize/active_record.rb

@@ -125,7 +125,12 @@ module Globalize
         def find_first_by_translated_attr_and_locales(name, value)
           query = "#{translated_attr_name(name)} = ? AND #{translated_attr_name('locale')} IN (?)"
           locales = Globalize.fallbacks(locale || I18n.locale).map(&:to_s)
-          find(:first, :joins => :translations, :conditions => [query, value, locales])
+          find(
+            :first,
+            :joins => :translations,
+            :conditions => [query, value, locales],
+            :readonly => false
+          )
         end
 
         def translated_attr_accessor(name)
@@ -149,6 +154,14 @@ module Globalize
         @globalize ||= Adapter.new self
       end
 
+      def attributes
+        self.attribute_names.inject({}) do |attrs, name|
+          attrs[name] = read_attribute(name) ||
+            (globalize.fetch(I18n.locale, name) rescue nil)
+          attrs
+        end
+      end
+
       def attributes=(attributes, *args)
         if attributes.respond_to?(:delete) && locale = attributes.delete(:locale)
           self.class.with_locale(locale) { super }
@@ -157,6 +170,10 @@ module Globalize
         end
       end
 
+      def attribute_names
+        translated_attribute_names.map(&:to_s) + super
+      end
+
       def available_locales
         translations.scoped(:select => 'DISTINCT locale').map(&:locale)
       end

data/lib/globalize/active_record/migration.rb

@@ -13,7 +13,7 @@ module Globalize
         end
 
         self.connection.create_table(translation_table_name) do |t|
-          t.references self.table_name.singularize
+          t.references table_name.sub(/^#{table_name_prefix}/, "").singularize
           t.string :locale
           fields.each do |name, type|
             t.column name, type
@@ -21,7 +21,11 @@ module Globalize
           t.timestamps
         end
 
-        self.connection.add_index(translation_table_name, "#{self.table_name.singularize}_id", :name => translation_index_name)
+        self.connection.add_index(
+          translation_table_name, 
+          "#{table_name.sub(/^#{table_name_prefix}/, "").singularize}_id",
+          :name => translation_index_name
+        )
       end
 
       def translation_index_name

data/test/active_record/translates_test.rb

@@ -84,4 +84,13 @@ class TranslatesTest < ActiveSupport::TestCase
     post.subject = 'title'
     assert_equal 'title', post.subject
   end
+  
+  test "find_by_xx records have writable attributes" do
+    Post.create :subject => "change me"
+    p = Post.find_by_subject("change me")
+    p.subject = "changed"
+    assert_nothing_raised(ActiveRecord::ReadOnlyRecord) do
+      p.save
+    end
+  end
 end

data/test/active_record_test.rb

@@ -68,7 +68,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
   test "update_attributes fails with invalid values" do
     post = Post.create(:subject => 'foo', :content => 'bar')
     assert !post.update_attributes(:subject => '')
-    assert_nil post.reload.attributes['subject']
+    assert_not_nil post.reload.attributes['subject']
     assert_equal 'foo', post.subject
   end
 
@@ -442,6 +442,22 @@ class ActiveRecordTest < ActiveSupport::TestCase
     User.expects(:reflect_on_all_validations => validations)
     assert_equal [:name], User.required_attributes
   end
+  
+  test "attribute_names returns translated and regular attribute names" do
+    Post.create :subject => "foo", :content => "bar"
+    assert_equal Post.last.attribute_names.sort, %w[blog_id content id subject]
+  end
+  
+  test "attributes returns translated and regular attributes" do
+    Post.create :subject => "foo", :content => "bar"
+    assert_equal Post.last.attributes.keys.sort, %w[blog_id content id subject]
+  end
+  
+  test "to_xml includes translated fields" do
+    Post.create :subject => "foo", :content => "bar"
+    assert Post.last.to_xml =~ /subject/
+    assert Post.last.to_xml =~ /content/
+  end
 end
 
 # TODO error checking for fields that exist in main table, don't exist in

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sven Fuchs, Joshua Harvey, Clemens Kofler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +02:00
+date: 2010-04-29 00:00:00 +02:00
 default_executable: 
 dependencies: []