globalize3 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3415e9c85d0bbf0c55f9006d9ad91f7522c2ccac
+  data.tar.gz: 8faa411a7dc53b2cda49fcc1cab52c336c22a7c2
+SHA512:
+  metadata.gz: a4d3c7485e0a2ddfa68dd471a40d5044b45c439f2f76b5a93186e5e28d7bae8993f8e20b882f659ca5a6baeb410580ce0bb0ca453159d58cba38dfa7cf94c6b8
+  data.tar.gz: 837b3b58a48ddf844d7796aabdac0b7436441d82b468ca1facebbbd6002d20435e672238e52de202016e843798ede5fbd189fc092ac87e3f60259320a0bb6838

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/Gemfile.lock

@@ -1,85 +1,85 @@
 PATH
   remote: .
   specs:
-    globalize3 (0.3.0)
+    globalize3 (0.3.1)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       paper_trail (~> 2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
-    database_cleaner (0.5.2)
+    database_cleaner (0.6.7)
     erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
+    hike (1.2.3)
+    i18n (0.6.5)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.8.1)
     metaclass (0.0.1)
-    mocha (0.12.3)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
-    paper_trail (2.6.4)
+    multi_json (1.8.2)
+    paper_trail (2.7.2)
       activerecord (~> 3.0)
       railties (~> 3.0)
     pathname_local (0.0.2)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+    railties (3.2.15)
+      actionpack (= 3.2.15)
+      activesupport (= 3.2.15)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12)
+    rake (10.1.0)
+    rdoc (3.12.2)
       json (~> 1.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
+    sqlite3 (1.3.7)
     test_declarative (0.0.5)
-    thor (0.16.0)
-    tilt (1.3.3)
-    tzinfo (0.3.35)
+    thor (0.18.1)
+    tilt (1.4.1)
+    tzinfo (0.3.38)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  database_cleaner (= 0.5.2)
+  database_cleaner (~> 0.6.0)
   globalize3!
   mocha
   pathname_local

data/lib/globalize.rb

@@ -2,10 +2,12 @@ require 'active_record'
 require 'patches/active_record/xml_attribute_serializer'
 require 'patches/active_record/query_method'
 require 'patches/active_record/uniqueness_validator'
+require 'patches/active_record/relation'
 
 module Globalize
   autoload :ActiveRecord, 'globalize/active_record'
   autoload :Versioning,   'globalize/versioning'
+  autoload :Interpolation,   'globalize/interpolation'
 
   class << self
     def locale
@@ -18,9 +20,12 @@ module Globalize
 
     def with_locale(locale, &block)
       previous_locale = read_locale
-      set_locale(locale)
-      result = yield(locale)
-      set_locale(previous_locale)
+      begin
+        set_locale(locale)
+        result = yield(locale)
+      ensure
+        set_locale(previous_locale)
+      end
       result
     end
 

data/lib/globalize/active_record/act_macro.rb

@@ -4,45 +4,19 @@ module Globalize
       def translates(*attr_names)
 
         options = attr_names.extract_options!
-        attr_names = attr_names.map(&:to_sym)
-
-        unless translates?
-          options[:table_name] ||= "#{table_name.singularize}_translations"
-          options[:foreign_key] ||= class_name.foreign_key
-
-          class_attribute :translated_attribute_names, :translation_options, :fallbacks_for_empty_translations
-          self.translated_attribute_names = []
-          self.translation_options        = options
-          self.fallbacks_for_empty_translations = options[:fallbacks_for_empty_translations]
-
-          include InstanceMethods
-          extend  ClassMethods, Migration
-
-          translation_class.table_name = options[:table_name] if translation_class.table_name.blank?
-
-          has_many :translations, :class_name  => translation_class.name,
-                                  :foreign_key => options[:foreign_key],
-                                  :dependent   => :destroy,
-                                  :extend      => HasManyExtensions
-
-          after_create :save_translations!
-          after_update :save_translations!
-
-          if options[:versioning]
-            ::ActiveRecord::Base.extend(Globalize::Versioning::PaperTrail)
+        setup_translates!(options) unless translates?
 
-            translation_class.has_paper_trail
-            delegate :version, :versions, :to => :translation
-          end
+        attr_names = attr_names.map(&:to_sym)
+        attr_names -= translated_attribute_names if defined?(translated_attribute_names)
 
+        if attr_names.present?
           translation_class.instance_eval %{
-            attr_accessible :#{(attr_names | [:locale]).join(', :')}
+            attr_accessible :#{attr_names.join(', :')}
           }
 
-          # detect and apply serialization
           attr_names.each do |attr_name|
+            # Detect and apply serialization.
             serializer = self.serialized_attributes[attr_name.to_s]
-
             if serializer.present?
               if defined?(::ActiveRecord::Coders::YAMLColumn) &&
                  serializer.is_a?(::ActiveRecord::Coders::YAMLColumn)
@@ -52,12 +26,15 @@ module Globalize
 
               translation_class.send :serialize, attr_name, serializer
             end
+
+            # Create accessors for the attribute.
+            translated_attr_accessor(attr_name)
+            translations_accessor(attr_name)
+
+            # Add attribute to the list.
+            self.translated_attribute_names << attr_name
           end
         end
-
-        new_attr_names = attr_names - translated_attribute_names
-        new_attr_names.each { |attr_name| translated_attr_accessor(attr_name) }
-        self.translated_attribute_names += new_attr_names
       end
 
       def class_name
@@ -70,6 +47,44 @@ module Globalize
       def translates?
         included_modules.include?(InstanceMethods)
       end
+
+      protected
+      def setup_translates!(options)
+        options[:table_name] ||= "#{table_name.singularize}_translations"
+        options[:foreign_key] ||= class_name.foreign_key
+
+        class_attribute :translated_attribute_names, :translation_options, :fallbacks_for_empty_translations
+        self.translated_attribute_names = []
+        self.translation_options        = options
+        self.fallbacks_for_empty_translations = options[:fallbacks_for_empty_translations]
+
+        include InstanceMethods
+        extend  ClassMethods, Migration
+
+        translation_class.table_name = options[:table_name]
+
+        has_many :translations, :class_name  => translation_class.name,
+                                :foreign_key => options[:foreign_key],
+                                :dependent   => :destroy,
+                                :extend      => HasManyExtensions,
+                                :autosave    => false
+
+        after_create :save_translations!
+        after_update :save_translations!
+
+        if options[:versioning]
+          if options[:versioning].is_a?(Hash)
+            translation_class.versioned options[:versioning]
+          else
+            ::ActiveRecord::Base.extend(Globalize::Versioning::PaperTrail)
+
+            translation_class.has_paper_trail
+            delegate :version, :versions, :to => :translation
+          end
+        end
+
+        translation_class.instance_eval %{ attr_accessible :locale }
+      end
     end
 
     module HasManyExtensions

data/lib/globalize/active_record/adapter.rb

@@ -19,6 +19,10 @@ module Globalize
         return nil
       end
 
+      def stash_contains?(locale, name)
+        stash.contains?(locale, name)
+      end
+
       def fetch(locale, name)
         record.globalize_fallbacks(locale).each do |fallback|
           value = stash.contains?(fallback, name) ? fetch_stash(fallback, name) : fetch_attribute(fallback, name)
@@ -37,16 +41,21 @@ module Globalize
       end
 
       def save_translations!
+        existing_translations_by_locale = {}
+        record.translations.each do |t|
+          existing_translations_by_locale[t.locale.to_s] = t
+        end
+        
         stash.each do |locale, attrs|
           if attrs.any?
-            translation = record.translations.find_or_initialize_by_locale(locale.to_s)
+            locale_str = locale.to_s
+            translation = existing_translations_by_locale[locale_str] ||
+              record.translations.find_or_initialize_by_locale(locale_str)
             attrs.each { |name, value| translation[name] = value }
             translation.save!
           end
         end
 
-        record.translations.each(&:reload)
-        record.translations.reset
         reset
       end
 

data/lib/globalize/active_record/class_methods.rb

@@ -45,7 +45,7 @@ module Globalize
             klass = self.const_set(:Translation, Class.new(Globalize::ActiveRecord::Translation))
           end
 
-          klass.belongs_to name.underscore.gsub('/', '_').to_sym, :class_name => self.name
+          klass.belongs_to :globalized_model, :class_name => self.name, :foreign_key => translation_options[:foreign_key]
           klass
         end
       end
@@ -145,11 +145,27 @@ module Globalize
           write_attribute(name, value)
         end
         define_method(name) do |*args|
-          read_attribute(name, {:locale => args.first})
+          Globalize::Interpolation.interpolate(name, self, args)
         end
         alias_method :"#{name}_before_type_cast", name
       end
 
+      def translations_accessor(name)
+        define_method(:"#{name}_translations") do
+          result = translations.each_with_object(HashWithIndifferentAccess.new) do |translation, result|
+            result[translation.locale] = translation.send(name)
+          end
+          globalize.stash.keys.each_with_object(result) do |locale, result|
+            result[locale] = globalize.fetch_stash(locale, name) if globalize.stash_contains?(locale, name)
+          end
+        end
+        define_method(:"#{name}_translations=") do |value|
+          value.each do |(locale, value)|
+            write_attribute name, value, :locale => locale
+          end
+        end
+      end
+
     end
 
   end

data/lib/globalize/active_record/instance_methods.rb

@@ -44,8 +44,21 @@ module Globalize
             options = {:locale => options}
           end
           options = {:locale => Globalize.locale}.merge(options)
-          attribute_will_change! name.to_s
-
+          
+          # Dirty tracking, paraphrased from
+          # ActiveRecord::AttributeMethods::Dirty#write_attribute.
+          name_str = name.to_s
+          if attribute_changed?(name_str)
+            # If there's already a change, delete it if this undoes the change.
+            old = changed_attributes[name_str]
+            changed_attributes.delete(name_str) if value == old
+          else
+            # If there's not a change yet, record it.
+            old = globalize.fetch(options[:locale], name)
+            old = old.clone if old.duplicable?
+            changed_attributes[name_str] = old if value != old
+          end
+          
           globalize.write(options[:locale], name, value)
         else
           super(name, value)
@@ -63,7 +76,7 @@ module Globalize
         if self.class.translated?(name) and options[:translated]
           if (value = globalize.fetch(options[:locale] || Globalize.locale, name))
             value
-          elsif respond_to?(:serialized_attributes) && serialized_attributes.has_key?(name.to_s)
+          else
             super(name)
           end
         else
@@ -105,6 +118,7 @@ module Globalize
           end
           translation.save
         end
+        globalize.reset
       end
 
       def reload(options = nil)
@@ -154,6 +168,24 @@ module Globalize
         translation_caches[::Globalize.locale] = translation.previous_version
       end
 
+      def column_for_attribute name
+        translated_attribute_names.include?(name) ? globalize.send(:column_for_attribute, name) : super
+      end
+
+    private
+
+      def update(*)
+        I18n.with_locale(read_attribute(:locale) || I18n.default_locale) do
+          super
+        end
+      end
+
+      def create(*)
+        I18n.with_locale(read_attribute(:locale) || I18n.default_locale) do
+          super
+        end
+      end
+
     protected
 
       def each_locale_and_translated_attribute
@@ -177,7 +209,11 @@ module Globalize
 
       def with_given_locale(attributes, &block)
         attributes.symbolize_keys! if attributes.respond_to?(:symbolize_keys!)
-        if locale = attributes.try(:delete, :locale)
+
+        locale = respond_to?(:locale=) ? attributes.try(:[], :locale) :
+                                         attributes.try(:delete, :locale)
+
+        if locale
           Globalize.with_locale(locale, &block)
         else
           yield

data/lib/globalize/active_record/migration.rb

@@ -9,7 +9,7 @@ module Globalize
         @globalize_migrator ||= Migrator.new(self)
       end
 
-      delegate :create_translation_table!, :drop_translation_table!,
+      delegate :create_translation_table!, :add_translation_fields!, :drop_translation_table!,
         :translation_index_name, :translation_locale_index_name,
         :to => :globalize_migrator
 
@@ -26,20 +26,29 @@ module Globalize
 
         def create_translation_table!(fields = {}, options = {})
           @fields = fields
-          complete_translated_fields
+          # If we have fields we only want to create the translation table with those fields
+          complete_translated_fields if fields.blank?
           validate_translated_fields
 
           create_translation_table
+          add_translation_fields!(fields, options)
+          create_translations_index
+          clear_schema_cache!
+        end
+
+        def add_translation_fields!(fields, options = {})
+          @fields = fields
+          validate_translated_fields
+
+          add_translation_fields
+          clear_schema_cache!
           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
-          translated_attribute_names.each do |attribute|
-            connection.remove_column(table_name, attribute)
-          end
+          connection.remove_columns(table_name, *fields.keys)
         end
 
         def drop_translation_table!(options = {})
@@ -49,6 +58,8 @@ module Globalize
           clear_schema_cache!
         end
 
+        # This adds all the current translated attributes of the model
+        # It's a problem because in early migrations would add all the translated attributes
         def complete_translated_fields
           translated_attribute_names.each do |name|
             fields[name] = column_type(name) unless fields[name]
@@ -57,8 +68,14 @@ module Globalize
 
         def create_translation_table
           connection.create_table(translations_table_name) do |t|
-            t.references table_name.sub(/^#{table_name_prefix}/, '').singularize
-            t.string :locale
+            t.references table_name.sub(/^#{table_name_prefix}/, '').singularize, :null => false
+            t.string :locale, :null => false
+            t.timestamps
+          end
+        end
+
+        def add_translation_fields
+          connection.change_table(translations_table_name) do |t|
             fields.each do |name, options|
               if options.is_a? Hash
                 t.column name, options.delete(:type), options
@@ -66,7 +83,6 @@ module Globalize
                 t.column name, options
               end
             end
-            t.timestamps
           end
         end
 
@@ -94,10 +110,9 @@ module Globalize
 
         def move_data_to_translation_table
           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]
+            translation = record.translation_for(I18n.default_locale) || record.translations.build(:locale => I18n.default_locale)
+            fields.each do |attribute_name, attribute_type|
+              translation[attribute_name] = record.read_attribute(attribute_name, {:translated => false})
             end
             translation.save!
           end
@@ -144,16 +159,20 @@ module Globalize
 
         def translation_index_name
           index_name = "index_#{translations_table_name}_on_#{table_name.singularize}_id"
-          index_name.size < connection.index_name_length ? index_name : "index_#{Digest::SHA1.hexdigest(index_name)}"
+          index_name.size < connection.index_name_length ? index_name :
+            "index_#{Digest::SHA1.hexdigest(index_name)}"[0, connection.index_name_length]
         end
 
         def translation_locale_index_name
           index_name = "index_#{translations_table_name}_on_locale"
-          index_name.size < connection.index_name_length ? index_name : "index_#{Digest::SHA1.hexdigest(index_name)}"
+          index_name.size < connection.index_name_length ? index_name :
+            "index_#{Digest::SHA1.hexdigest(index_name)}"[0, connection.index_name_length]
         end
 
         def clear_schema_cache!
           connection.schema_cache.clear! if connection.respond_to? :schema_cache
+          model::Translation.reset_column_information
+          model.reset_column_information
         end
 
         private

data/lib/globalize/active_record/translation.rb

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

data/lib/globalize/interpolation.rb

@@ -0,0 +1,28 @@
+module Globalize
+  module Interpolation
+    def interpolate(name, model, args)
+      translation = model.read_attribute(name, {:locale => locale_from(args)})
+      try_interpolation translation, interpolation_args_from(args)
+    end
+
+    private
+
+    def interpolation_args_from(args)
+      args.detect {|a| a.is_a? Hash }
+    end
+
+    def locale_from(args)
+      args.detect {|a| !a.is_a? Hash }
+    end
+
+    def try_interpolation(translation,args)
+      if args
+        I18n.interpolate(translation,args)
+      else
+        translation
+      end
+    end
+
+    extend self
+  end
+end

data/lib/globalize3/version.rb

@@ -1,3 +1,3 @@
 module Globalize3
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/patches/active_record/relation.rb

@@ -0,0 +1,15 @@
+module ActiveRecord
+  class Relation
+    if ::ActiveRecord::VERSION::STRING >= "3.2.1"
+      def where_values_hash
+        _translations_table_name = klass.respond_to?(:translations_table_name) ? klass.translations_table_name : nil
+
+        equalities = with_default_scope.where_values.grep(Arel::Nodes::Equality).find_all { |node|
+          [table_name, _translations_table_name].compact.include? node.left.relation.name
+        }
+
+        Hash[equalities.map { |where| [where.left.name, where.right] }].with_indifferent_access
+      end
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize3
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -11,139 +10,124 @@ authors:
 - John-Paul Bader
 - Tomasz Stachewicz
 - Philip Arndt
+- Chris Salzberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
 - !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
 - !ruby/object:Gem::Dependency
   name: paper_trail
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2'
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2'
-    none: false
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
-    none: false
+        version: 0.6.0
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
-    none: false
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: pathname_local
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Rails I18n de-facto standard library for ActiveRecord 3 model/data translation.
 email: nobody@globalize-rails.org
 executables: []
@@ -159,6 +143,7 @@ files:
 - lib/globalize/active_record/migration.rb
 - lib/globalize/active_record/translation.rb
 - lib/globalize/active_record.rb
+- lib/globalize/interpolation.rb
 - lib/globalize/versioning/paper_trail.rb
 - lib/globalize/versioning.rb
 - lib/globalize.rb
@@ -167,6 +152,7 @@ files:
 - lib/i18n/missing_translations_log_handler.rb
 - lib/i18n/missing_translations_raise_handler.rb
 - lib/patches/active_record/query_method.rb
+- lib/patches/active_record/relation.rb
 - lib/patches/active_record/uniqueness_validator.rb
 - lib/patches/active_record/xml_attribute_serializer.rb
 - Gemfile
@@ -175,27 +161,36 @@ files:
 - Rakefile
 homepage: http://github.com/svenfuchs/globalize3
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message: |2+
+
+  HEADS UP! Globalize3 has been renamed "Globalize" and now supports both
+  ActiveRecord 3.x and ActiveRecord 4. To use the new gem with ActiveRecord
+  3.x, replace "gem 'globalize3'" with "gem 'globalize', '~> 3.0.0'" in your
+  Gemfile.
+
+  All future updates to the ActiveRecord 3.x version of Globalize will happen
+  in versions 3.x of the new gem (globalize). globalize3 is deprecated and will
+  no longer be updated.
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 1.8.24
+rubyforge_project: '[none]'
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord 3 model/data translation
 test_files: []
 has_rdoc: