globalize3 0.2.0.beta4 → 0.2.0.beta6

data/Gemfile

@@ -2,8 +2,3 @@ source :rubygems
 
 gemspec
 
-gem 'ruby-debug', :platform => :mri_18
-gem 'ruby-debug19', :platform => :mri_19 if RUBY_VERSION < '1.9.3'
-
-gem 'activerecord', '3.0.10'
-gem 'activemodel', '3.0.10'

data/Gemfile.lock

@@ -9,114 +9,101 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
-      mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
-    archive-tar-minitar (0.5.2)
-    arel (2.0.10)
-    builder (2.1.2)
-    columnize (0.3.4)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
     database_cleaner (0.5.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.4)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
-    paper_trail (2.3.2)
+    multi_json (1.0.4)
+    paper_trail (2.5.0)
       rails (~> 3)
     pathname_local (0.0.2)
-    polyglot (0.3.2)
-    rack (1.2.3)
-    rack-mount (0.6.14)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.10)
-      actionmailer (= 3.0.10)
-      actionpack (= 3.0.10)
-      activerecord (= 3.0.10)
-      activeresource (= 3.0.10)
-      activesupport (= 3.0.10)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
       bundler (~> 1.0)
-      railties (= 3.0.10)
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2)
-    rbx-require-relative (0.0.5)
-    rdoc (3.9.4)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    sqlite3 (1.3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
     test_declarative (0.0.5)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (= 3.0.10)
-  activerecord (= 3.0.10)
   database_cleaner (= 0.5.2)
   globalize3!
   mocha
   pathname_local
-  ruby-debug
-  ruby-debug19
   sqlite3
   test_declarative

data/lib/globalize/active_record/instance_methods.rb

@@ -11,16 +11,29 @@ module Globalize
         super.merge(translated_attributes)
       end
 
-      def attributes=(attributes, *args)
-        with_given_locale(attributes) { super }
-      end
-
-      def update_attributes!(attributes, *args)
-        with_given_locale(attributes) { super }
-      end
-
-      def update_attributes(attributes, *args)
-        with_given_locale(attributes) { super }
+      def self.included(base)
+        # Maintain Rails 3.0.x compatibility while adding Rails 3.1.x compatibility
+        if base.method_defined?(:assign_attributes)
+          base.class_eval %{
+            def assign_attributes(attributes, options = {})
+              with_given_locale(attributes) { super }
+            end
+          }
+        else
+          base.class_eval %{
+            def attributes=(attributes, *args)
+              with_given_locale(attributes) { super }
+            end
+
+            def update_attributes!(attributes, *args)
+              with_given_locale(attributes) { super }
+            end
+
+            def update_attributes(attributes, *args)
+              with_given_locale(attributes) { super }
+            end
+          }
+        end
       end
 
       def write_attribute(name, value, options = {})
@@ -115,9 +128,9 @@ module Globalize
       def translation_for(locale)
         @translation_caches ||= {}
         unless @translation_caches[locale]
-          # Enumberable#detect is better since we have the translations collection (already) loaded
-          # using either Model.includes(:translations) or Model.with_translations
+          # Fetch translations from database as those in the translation collection may be incomplete
           _translation = translations.detect{|t| t.locale.to_s == locale.to_s}
+          _translation ||= translations.with_locale(locale).first
           _translation ||= translations.build(:locale => locale)
           @translation_caches[locale] = _translation
         end

data/lib/globalize/active_record/migration.rb

@@ -30,9 +30,16 @@ module Globalize
 
           create_translation_table
           move_data_to_translation_table if options[:migrate_data]
+          remove_source_columns if options[:remove_source_columns]
           create_translations_index
         end
 
+        def remove_source_columns
+          translated_attribute_names.each do |attribute|
+            connection.remove_column(table_name, attribute)
+          end
+        end
+
         def drop_translation_table!(options = {})
           move_data_to_model_table if options[:migrate_data]
           drop_translations_index
@@ -60,6 +67,11 @@ module Globalize
             "#{table_name.sub(/^#{table_name_prefix}/, "").singularize}_id",
             :name => translation_index_name
           )
+          # index for select('DISTINCT locale') call in translation.rb
+          connection.add_index(
+            translations_table_name,
+            :locale
+          )
         end
 
         def drop_translation_table
@@ -71,6 +83,16 @@ 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.collect {|m| m.untranslated_attributes}
@@ -82,6 +104,8 @@ module Globalize
         end
 
         def move_data_to_model_table
+          add_missing_columns
+
           # 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|
@@ -119,6 +143,18 @@ module Globalize
           index_name = "index_#{translations_table_name}_on_#{table_name.singularize}_id"
           index_name.size < 50 ? index_name : "index_#{Digest::SHA1.hexdigest(index_name)}"
         end
+
+
+        private
+
+        def add_missing_columns
+          translated_attribute_names.map(&:to_s).each do |attribute|
+            unless model.column_names.include?(attribute)
+              connection.add_column(table_name, attribute, model::Translation.columns_hash[attribute].type)
+            end
+          end
+        end
+
       end
     end
   end

data/lib/globalize3/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: globalize3
 version: !ruby/object:Gem::Version 
-  hash: 62196363
+  hash: -2195621950
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - beta
-  - 4
-  version: 0.2.0.beta4
+  - 6
+  version: 0.2.0.beta6
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -22,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 Z
+date: 2012-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord