globalize3 0.0.11 → 0.1.0.beta

data/README.textile

@@ -1,6 +1,6 @@
 h1. Globalize3
 
-Globalize3 is the successor of Globalize for Rails. Globalize is targeted at ActiveRecord 3. It is compatible with and builds on the new "I18n api in Ruby on Rails":http://guides.rubyonrails.org/i18n.html and adds model translations to ActiveRecord.
+Globalize3 is the successor of Globalize for Rails. Globalize is targeted at ActiveRecord 3. It is compatible with and builds on the new "I18n API in Ruby on Rails":http://guides.rubyonrails.org/i18n.html and adds model translations to ActiveRecord.
 
 Globalize3 is much more lightweight and compatible than its predecessor Globalize for Rails was. Model translations in Globalize3 use default ActiveRecord features and do not limit any ActiveRecord functionality any more.
 
@@ -56,6 +56,31 @@ end
 
 Note that the ActiveRecord model @Post@ must already exist and have a @translates@ directive listing the translated fields.
 
+h2. Migrating existing data to and from the translated version
+
+As well as creating a translation table, you can also use @create_translation_table!@ to migrate across any
+existing data to the default locale. This can also operate in reverse to restore any translations from the default locale
+back to the model when you don't want to use a translation table anymore using @drop_translation_table!@
+
+This feature makes use of @untranslated_fields@ which allows access to the model's attributes as they were before
+the translation was applied. Here's an example (which assumes you already have a model called @Post@ and its table exists):
+
+<pre><code>
+  class TranslatePosts < ActiveRecord::Migration
+    def self.up
+      Post.create_translation_table!({
+        :title => :string,
+        :text => :text
+      }, {
+        :migrate_data => true
+      })
+    end
+    def self.down
+      Post.drop_translation_table! :migrate_data => true
+    end
+  end
+</code></pre>
+
 h2. Versioning with Globalize3
 
 Globalize3 nicely integrates with "vestal_versions":http://github.com/laserlemon/vestal_versions:

data/lib/globalize/active_record/adapter.rb

@@ -74,7 +74,7 @@ module Globalize
           value, requested_locale = nil, locale
 
           Globalize.fallbacks(locale).each do |fallback|
-            translation = translations.detect { |t| t.locale == fallback }
+            translation = translations.to_a.detect { |t| t.locale == fallback }
             value  = translation && translation.send(name)
             locale = fallback && break if value
           end
@@ -97,3 +97,4 @@ module Globalize
     end
   end
 end
+

data/lib/globalize/active_record/class_methods.rb

@@ -43,7 +43,7 @@ module Globalize
         if(klass.nil? || (klass.class_name != (self.class_name + "Translation")))
           klass = self.const_set(:Translation, Class.new(Globalize::ActiveRecord::Translation))
         end
-        
+
         if klass.table_name == 'translations'
           klass.set_table_name(translation_options[:table_name])
           klass.belongs_to name.underscore.gsub('/', '_')
@@ -76,10 +76,10 @@ module Globalize
 
         def translated_attr_accessor(name)
           define_method(:"#{name}=") do |value|
-            write_attribute(name, value, Globalize.locale)
+            write_attribute(name, value)
           end
           define_method(name) do |*args|
-            read_attribute(name, args.first || Globalize.locale)
+            read_attribute(name, {:locale => args.first})
           end
           alias_method :"#{name}_before_type_cast", name
         end

data/lib/globalize/active_record/instance_methods.rb

@@ -23,26 +23,42 @@ module Globalize
         with_given_locale(attributes) { super }
       end
 
-      def write_attribute(name, value, locale = nil)
-        # Make sure that we return some value as some methods might 
+      def write_attribute(name, value, options = {})
+        # Make sure that we return some value as some methods might
         # rely on the data
         return_value = super(name, value)
-        return_value = globalize.write(locale || Globalize.locale, name, value) if translated?(name)
+
+        if translated?(name)
+          # Deprecate old use of locale
+          unless options.is_a?(Hash)
+            warn "[DEPRECATION] passing 'locale' as #{options.inspect} is deprecated. Please use {:locale => #{options.inspect}} instead."
+            options = {:locale => options}
+          end
+          options = {:locale => nil}.merge(options)
+          return_value = globalize.write(options[:locale] || Globalize.locale, name, value)
+        end
         return_value
       end
 
-      def read_attribute(name, locale = nil)
-        if self.class.translated?(name)
-          globalize.fetch(locale || Globalize.locale, name)
+      def read_attribute(name, options = {})
+        # Deprecate old use of locale
+        unless options.is_a?(Hash)
+          warn "[DEPRECATION] passing 'locale' as #{options.inspect} is deprecated. Please use {:locale => #{options.inspect}} instead."
+          options = {:locale => options}
+        end
+
+        options = {:translated => true, :locale => nil}.merge(options)
+        if self.class.translated?(name) and options[:translated]
+          globalize.fetch(options[:locale] || Globalize.locale, name)
         else
           super(name)
         end
       end
-          
+
       def attribute_names
         translated_attribute_names.map(&:to_s) + super
       end
-      
+
       def translated?(name)
         self.class.translated?(name)
       end
@@ -53,6 +69,16 @@ module Globalize
         end
       end
 
+      # This method is basically the method built into Rails
+      # but we have to pass {:translated => false}
+      def untranslated_attributes
+        attrs = {}
+        attribute_names.each do |name|
+          attrs[name] = read_attribute(name, {:translated => false})
+        end
+        attrs
+      end
+
       def set_translations(options)
         options.keys.each do |locale|
           translation = translations.find_by_locale(locale.to_s) ||

data/lib/globalize/active_record/migration.rb

@@ -71,11 +71,28 @@ module Globalize
         end
 
         def move_data_to_translation_table
-          # TODO
+          # Find all of the existing untranslated attributes for this model.
+          all_model_fields = @model.all
+          model_attributes = all_model_fields.collect {|m| m.untranslated_attributes}
+          all_model_fields.each do |model_record|
+            # Assign the attributes back to the model which will enable globalize3 to translate them.
+            model_record.attributes = model_attributes.detect{|a| a['id'] == model_record.id}
+            model_record.save!
+          end
         end
 
         def move_data_to_model_table
-          # TODO
+          # Find all of the translated attributes for all records in the model.
+          all_translated_attributes = @model.all.collect{|m| m.attributes}
+          all_translated_attributes.each do |translated_record|
+            # Create a hash containing the translated column names and their values.
+            translated_attribute_names.inject(fields_to_update={}) do |f, name|
+              f.update({name.to_sym => translated_record[name.to_s]})
+            end
+
+            # Now, update the actual model's record with the hash.
+            @model.update_all(fields_to_update, {:id => translated_record['id']})
+          end
         end
 
         def validate_translated_fields

data/lib/globalize3/version.rb

@@ -1,3 +1,3 @@
 module Globalize3
-  VERSION = '0.0.11'
+  VERSION = '0.1.0.beta'
 end

data/lib/patches/active_record/xml_attribute_serializer.rb

@@ -3,8 +3,7 @@ require 'active_record/serializers/xml_serializer'
 ActiveRecord::XmlSerializer::Attribute.class_eval do
   def compute_type_with_translations
     klass = @serializable.class
-    if klass.respond_to?(:translated_attribute_names) &&
-       klass.translated_attribute_names.include?(name.to_sym)
+    if klass.translates? && klass.translated_attribute_names.include?(name.to_sym)
       :string
     else
       compute_type_without_translations

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: globalize3
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 31098185
+  prerelease: 6
   segments: 
   - 0
+  - 1
   - 0
-  - 11
-  version: 0.0.11
+  - beta
+  version: 0.1.0.beta
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -18,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +01:00
+date: 2011-01-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,12 +193,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: "[none]"