globalize3 0.2.0.beta8 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    globalize3 (0.2.0.beta7)
+    globalize3 (0.2.0.beta8)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       paper_trail (~> 2)

data/lib/globalize/active_record/adapter.rb

@@ -79,7 +79,7 @@ module Globalize
       end
 
       def set_metadata(object, metadata)
-        object.translation_metadata.merge!(meta_data) if object.respond_to?(:translation_metadata)
+        object.translation_metadata.merge!(metadata) if object.respond_to?(:translation_metadata)
         object
       end
 

data/lib/globalize/active_record/class_methods.rb

@@ -98,7 +98,9 @@ module Globalize
           scope = scope.send(:"scoped_by_#{unt}", arguments[index])
         end
 
-        return scope.send(match.finder) if match.is_a?(::ActiveRecord::DynamicFinderMatch)
+        return scope.send(match.finder).tap do |found|
+          found.is_a?(Array) ? found.map { |f| f.translations.reload } : found.translations.reload unless found.nil?
+        end if match.is_a?(::ActiveRecord::DynamicFinderMatch)
         return scope
       end
 

data/lib/globalize/active_record/migration.rb

@@ -32,6 +32,7 @@ module Globalize
           move_data_to_translation_table if options[:migrate_data]
           remove_source_columns if options[:remove_source_columns]
           create_translations_index
+          clear_schema_cache!
         end
 
         def remove_source_columns
@@ -44,6 +45,7 @@ module Globalize
           move_data_to_model_table if options[:migrate_data]
           drop_translations_index
           drop_translation_table
+          clear_schema_cache!
         end
 
         def complete_translated_fields
@@ -83,23 +85,13 @@ module Globalize
         end
 
         def move_data_to_translation_table
-        # this refactored version might be a good idea,
-        #  but only if made into a code that doesn't break tests
-        # model.find_each do |record|
-        #   translation = record.translations.build(:locale => I18n.default_locale)
-        #    translated_attribute_names.each do |attribute|
-        #      translation[attribute] = record[attribute]
-        #    end
-        #    translation.save!
-        # end
-
-          # Find all of the existing untranslated attributes for this model.
-          all_model_fields = @model.all
-          model_attributes = all_model_fields.map(&: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!
+          model.find_each do |record|
+            untranslated_attributes = record.untranslated_attributes
+            translation = record.translations.build(:locale => I18n.default_locale)
+            translated_attribute_names.each do |attribute|
+              translation[attribute] = untranslated_attributes[attribute.to_s]
+            end
+            translation.save!
           end
         end
 
@@ -144,6 +136,9 @@ module Globalize
           index_name.size < 50 ? index_name : "index_#{Digest::SHA1.hexdigest(index_name)}"
         end
 
+        def clear_schema_cache!
+          connection.schema_cache.clear! if connection.respond_to? :schema_cache
+        end
 
         private
 
@@ -158,4 +153,4 @@ module Globalize
       end
     end
   end
-end
+end

data/lib/globalize/active_record/translation.rb

@@ -17,7 +17,7 @@ module Globalize
         alias with_locale with_locales
 
         def translated_locales
-          select('DISTINCT locale').map(&:locale)
+          select('DISTINCT locale').map(&:locale).sort { |l,r| l.to_s <=> r.to_s }
         end
       end
 

data/lib/globalize3/version.rb

@@ -1,3 +1,3 @@
 module Globalize3
-  VERSION = '0.2.0.beta8'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: globalize3
 version: !ruby/object:Gem::Version 
-  hash: -4090334684
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 2
   - 0
-  - beta
-  - 8
-  version: 0.2.0.beta8
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -22,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 Z
+date: 2012-02-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -194,20 +192,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: "Rails I18n: de-facto standard library for ActiveRecord 3 model/data translation"
 test_files: []
 
+has_rdoc: