globalize3 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    globalize3 (0.2.0.beta8)
+    globalize3 (0.3.0)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       paper_trail (~> 2)
@@ -9,93 +9,73 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
-    builder (3.0.0)
+    arel (3.0.2)
+    builder (3.0.4)
     database_cleaner (0.5.2)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.1)
-    json (1.6.5)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
     metaclass (0.0.1)
-    mime-types (1.17.2)
-    mocha (0.10.3)
+    mocha (0.12.3)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
-    paper_trail (2.6.0)
-      rails (~> 3)
+    multi_json (1.5.0)
+    paper_trail (2.6.4)
+      activerecord (~> 3.0)
+      railties (~> 3.0)
     pathname_local (0.0.2)
-    polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
-      bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    sprockets (2.1.2)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     test_declarative (0.0.5)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.35)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test

data/lib/globalize.rb

@@ -1,6 +1,7 @@
 require 'active_record'
 require 'patches/active_record/xml_attribute_serializer'
 require 'patches/active_record/query_method'
+require 'patches/active_record/uniqueness_validator'
 
 module Globalize
   autoload :ActiveRecord, 'globalize/active_record'
@@ -29,12 +30,20 @@ module Globalize
       end
     end
 
-    def fallbacks?
+    def fallbacks=(locales)
+      set_fallbacks(locales)
+    end
+
+    def i18n_fallbacks?
       I18n.respond_to?(:fallbacks)
     end
 
-    def fallbacks(locale = self.locale)
-      fallbacks? ? I18n.fallbacks[locale] : [locale.to_sym]
+    def fallbacks(for_locale = self.locale)
+      read_fallbacks[for_locale] || default_fallbacks(for_locale)
+    end
+
+    def default_fallbacks(for_locale = self.locale)
+      i18n_fallbacks? ? I18n.fallbacks[for_locale] : [for_locale.to_sym]
     end
 
   protected
@@ -44,7 +53,21 @@ module Globalize
     end
 
     def set_locale(locale)
-      Thread.current[:globalize_locale] = locale.to_sym rescue nil
+      Thread.current[:globalize_locale] = locale.try(:to_sym)
+    end
+
+    def read_fallbacks
+      Thread.current[:fallbacks] || HashWithIndifferentAccess.new
+    end
+
+    def set_fallbacks(locales)
+      fallback_hash = HashWithIndifferentAccess.new
+
+      locales.each do |key, value|
+        fallback_hash[key] = value.presence || [key]
+      end if locales.present?
+
+      Thread.current[:fallbacks] = fallback_hash
     end
   end
 end

data/lib/globalize/active_record/act_macro.rb

@@ -2,37 +2,62 @@ module Globalize
   module ActiveRecord
     module ActMacro
       def translates(*attr_names)
-        return if translates?
 
         options = attr_names.extract_options!
-        options[:table_name] ||= "#{table_name.singularize}_translations"
+        attr_names = attr_names.map(&:to_sym)
 
-        class_attribute :translated_attribute_names, :translation_options, :fallbacks_for_empty_translations
-        self.translated_attribute_names = attr_names.map(&:to_sym)
-        self.translation_options        = options
-        self.fallbacks_for_empty_translations = options[:fallbacks_for_empty_translations]
+        unless translates?
+          options[:table_name] ||= "#{table_name.singularize}_translations"
+          options[:foreign_key] ||= class_name.foreign_key
 
-        include InstanceMethods
-        extend  ClassMethods, Migration
+          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]
 
-        translation_class.table_name = options[:table_name] if translation_class.table_name.blank?
+          include InstanceMethods
+          extend  ClassMethods, Migration
 
-        has_many :translations, :class_name  => translation_class.name,
-                                :foreign_key => class_name.foreign_key,
-                                :dependent   => :destroy,
-                                :extend      => HasManyExtensions
+          translation_class.table_name = options[:table_name] if translation_class.table_name.blank?
 
-        after_create :save_translations!
-        after_update :save_translations!
+          has_many :translations, :class_name  => translation_class.name,
+                                  :foreign_key => options[:foreign_key],
+                                  :dependent   => :destroy,
+                                  :extend      => HasManyExtensions
 
-        if options[:versioning]
-          ::ActiveRecord::Base.extend(Globalize::Versioning::PaperTrail)
+          after_create :save_translations!
+          after_update :save_translations!
 
-          translation_class.has_paper_trail
-          delegate :version, :versions, :to => :translation
+          if options[:versioning]
+            ::ActiveRecord::Base.extend(Globalize::Versioning::PaperTrail)
+
+            translation_class.has_paper_trail
+            delegate :version, :versions, :to => :translation
+          end
+
+          translation_class.instance_eval %{
+            attr_accessible :#{(attr_names | [:locale]).join(', :')}
+          }
+
+          # detect and apply serialization
+          attr_names.each do |attr_name|
+            serializer = self.serialized_attributes[attr_name.to_s]
+
+            if serializer.present?
+              if defined?(::ActiveRecord::Coders::YAMLColumn) &&
+                 serializer.is_a?(::ActiveRecord::Coders::YAMLColumn)
+
+                serializer = serializer.object_class
+              end
+
+              translation_class.send :serialize, attr_name, serializer
+            end
+          end
         end
 
-        attr_names.each { |attr_name| translated_attr_accessor(attr_name) }
+        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

data/lib/globalize/active_record/adapter.rb

@@ -20,14 +20,15 @@ module Globalize
       end
 
       def fetch(locale, name)
-        Globalize.fallbacks(locale).each do |fallback|
-          value = fetch_stash(fallback, name) || fetch_attribute(fallback, name)
+        record.globalize_fallbacks(locale).each do |fallback|
+          value = stash.contains?(fallback, name) ? fetch_stash(fallback, name) : fetch_attribute(fallback, name)
 
           unless fallbacks_for?(value)
             set_metadata(value, :locale => fallback, :requested_locale => locale)
             return value
           end
         end
+
         return nil
       end
 
@@ -74,7 +75,7 @@ module Globalize
       end
 
       def fetch_attribute(locale, name)
-        translation = record.translation_for(locale)
+        translation = record.translation_for(locale, false)
         return translation && translation.send(name)
       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('/', '_')
+          klass.belongs_to name.underscore.gsub('/', '_').to_sym, :class_name => self.name
           klass
         end
       end
@@ -70,7 +70,7 @@ module Globalize
 
       def supported_on_missing?(method_id)
         return super unless RUBY_VERSION < '1.9' || respond_to?(:translated_attribute_names)
-        match = ::ActiveRecord::DynamicFinderMatch.match(method_id) || ::ActiveRecord::DynamicScopeMatch.match(method_id)
+        match = defined?(::ActiveRecord::DynamicFinderMatch) && (::ActiveRecord::DynamicFinderMatch.match(method_id) || ::ActiveRecord::DynamicScopeMatch.match(method_id))
         return false if match.nil?
 
         attribute_names = match.attribute_names.map(&:to_sym)
@@ -98,12 +98,46 @@ module Globalize
           scope = scope.send(:"scoped_by_#{unt}", arguments[index])
         end
 
-        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)
+        if defined?(::ActiveRecord::DynamicFinderMatch) && match.is_a?(::ActiveRecord::DynamicFinderMatch)
+          if match.instantiator? and scope.blank?
+            return scope.find_or_instantiator_by_attributes match, attribute_names, *arguments, &block
+          end
+          match_finder_method = match.finder.to_s
+          match_finder_method << "!" if match.bang? && ::ActiveRecord::VERSION::STRING >= "3.1.0"
+          return scope.send(match_finder_method).tap do |found|
+            found.is_a?(Array) ? found.map { |f| f.translations.reload } : found.translations.reload unless found.nil?
+          end
+        end
         return scope
       end
 
+      def find_or_instantiator_by_attributes(match, attributes, *args)
+        options = args.size > 1 && args.last(2).all?{ |a| a.is_a?(Hash) } ? args.extract_options! : {}
+        protected_attributes_for_create, unprotected_attributes_for_create = {}, {}
+        args.each_with_index do |arg, i|
+          if arg.is_a?(Hash)
+            protected_attributes_for_create = args[i].with_indifferent_access
+          else
+            unprotected_attributes_for_create[attributes[i]] = args[i]
+          end
+        end
+
+        record = if ::ActiveRecord::VERSION::STRING < "3.1.0"
+          new do |r|
+            r.send(:attributes=, protected_attributes_for_create, true) unless protected_attributes_for_create.empty?
+            r.send(:attributes=, unprotected_attributes_for_create, false) unless unprotected_attributes_for_create.empty?
+          end
+        else
+          new(protected_attributes_for_create, options) do |r|
+            r.assign_attributes(unprotected_attributes_for_create, :without_protection => true)
+          end
+        end
+        yield(record) if block_given?
+        record.send(match.bang? ? :save! : :save) if match.instantiator.eql?(:create)
+
+        record
+      end
+
     protected
 
       def translated_attr_accessor(name)

data/lib/globalize/active_record/instance_methods.rb

@@ -37,19 +37,16 @@ module Globalize
       end
 
       def write_attribute(name, value, options = {})
-        # raise 'y' if value.nil? # TODO.
-
         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)
+          options = {:locale => Globalize.locale}.merge(options)
           attribute_will_change! name.to_s
-          the_locale = options[:locale] || Globalize.locale
-          self.translations.reject!{|t| t.new_record? && t.locale != the_locale}
-          globalize.write(the_locale, name, value)
+
+          globalize.write(options[:locale], name, value)
         else
           super(name, value)
         end
@@ -64,7 +61,11 @@ module Globalize
 
         options = {:translated => true, :locale => nil}.merge(options)
         if self.class.translated?(name) and options[:translated]
-          globalize.fetch(options[:locale] || Globalize.locale, name)
+          if (value = globalize.fetch(options[:locale] || Globalize.locale, name))
+            value
+          elsif respond_to?(:serialized_attributes) && serialized_attributes.has_key?(name.to_s)
+            super(name)
+          end
         else
           super(name)
         end
@@ -97,12 +98,17 @@ module Globalize
       def set_translations(options)
         options.keys.each do |locale|
           translation = translation_for(locale) ||
-            translations.build(:locale => locale.to_s)
-          translation.update_attributes!(options[locale])
+                        translations.build(:locale => locale.to_s)
+
+          options[locale].each do |key, value|
+            translation.send :"#{key}=", value
+          end
+          translation.save
         end
       end
 
       def reload(options = nil)
+        translation_caches.clear
         translated_attribute_names.each { |name| @attributes.delete(name.to_s) }
         globalize.reset
         super(options)
@@ -125,20 +131,27 @@ module Globalize
         translation_for(::Globalize.locale)
       end
 
-      def translation_for(locale)
-        @translation_caches ||= {}
-        unless @translation_caches[locale]
+      def translation_for(locale, build_if_missing = true)
+        unless translation_caches[locale]
           # 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
+          _translation ||= translations.with_locale(locale).first unless translations.loaded?
+          _translation ||= translations.build(:locale => locale) if build_if_missing
+          translation_caches[locale] = _translation if _translation
         end
-        @translation_caches[locale]
+        translation_caches[locale]
+      end
+
+      def translation_caches
+        @translation_caches ||= {}
+      end
+
+      def globalize_fallbacks(locale)
+        Globalize.fallbacks(locale)
       end
 
       def rollback
-        @translation_caches[::Globalize.locale] = translation.previous_version
+        translation_caches[::Globalize.locale] = translation.previous_version
       end
 
     protected
@@ -159,7 +172,7 @@ module Globalize
 
       def save_translations!
         globalize.save_translations!
-        @translation_caches = {}
+        translation_caches.clear
       end
 
       def with_given_locale(attributes, &block)

data/lib/globalize/active_record/migration.rb

@@ -10,7 +10,8 @@ module Globalize
       end
 
       delegate :create_translation_table!, :drop_translation_table!,
-        :translation_index_name, :to => :globalize_migrator
+        :translation_index_name, :translation_locale_index_name,
+        :to => :globalize_migrator
 
       class Migrator
         include Globalize::ActiveRecord::Exceptions
@@ -58,7 +59,13 @@ module Globalize
           connection.create_table(translations_table_name) do |t|
             t.references table_name.sub(/^#{table_name_prefix}/, '').singularize
             t.string :locale
-            fields.each { |name, type| t.column name, type }
+            fields.each do |name, options|
+              if options.is_a? Hash
+                t.column name, options.delete(:type), options
+              else
+                t.column name, options
+              end
+            end
             t.timestamps
           end
         end
@@ -72,7 +79,8 @@ module Globalize
           # index for select('DISTINCT locale') call in translation.rb
           connection.add_index(
             translations_table_name,
-            :locale
+            :locale,
+            :name => translation_locale_index_name
           )
         end
 
@@ -112,9 +120,13 @@ module Globalize
         end
 
         def validate_translated_fields
-          fields.each do |name, type|
+          fields.each do |name, options|
             raise BadFieldName.new(name) unless valid_field_name?(name)
-            raise BadFieldType.new(name, type) unless valid_field_type?(name, type)
+            if options.is_a? Hash
+              raise BadFieldType.new(name, options[:type]) unless valid_field_type?(name, options[:type])
+            else
+              raise BadFieldType.new(name, options) unless valid_field_type?(name, options)
+            end
           end
         end
 
@@ -131,9 +143,13 @@ module Globalize
         end
 
         def translation_index_name
-          # FIXME what's the max size of an index name?
           index_name = "index_#{translations_table_name}_on_#{table_name.singularize}_id"
-          index_name.size < 50 ? index_name : "index_#{Digest::SHA1.hexdigest(index_name)}"
+          index_name.size < connection.index_name_length ? index_name : "index_#{Digest::SHA1.hexdigest(index_name)}"
+        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)}"
         end
 
         def clear_schema_cache!

data/lib/globalize/active_record/translation.rb

@@ -1,6 +1,10 @@
 module Globalize
   module ActiveRecord
     class Translation < ::ActiveRecord::Base
+
+      attr_accessible :locale
+      validates :locale, :presence => true
+
       class << self
         # Sometimes ActiveRecord queries .table_exists? before the table name
         # has even been set which results in catastrophic failure.
@@ -12,7 +16,7 @@ module Globalize
           # Avoid using "IN" with SQL queries when only using one locale.
           locales = locales.flatten.map(&:to_s)
           locales = locales.first if locales.one?
-          where(:locale => locales)
+          where :locale => locales
         end
         alias with_locale with_locales
 
@@ -22,11 +26,12 @@ module Globalize
       end
 
       def locale
-        read_attribute(:locale).to_sym
+        _locale = read_attribute :locale
+        _locale.present? ? _locale.to_sym : _locale
       end
 
       def locale=(locale)
-        write_attribute(:locale, locale.to_s)
+        write_attribute :locale, locale.to_s
       end
     end
   end

data/lib/globalize3/version.rb

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

data/lib/patches/active_record/uniqueness_validator.rb

@@ -0,0 +1,55 @@
+require 'active_record/validations/uniqueness.rb'
+
+ActiveRecord::Validations::UniquenessValidator.class_eval do
+  def validate_each_with_translations(record, attribute, value)
+    klass = record.class
+    if klass.translates? && klass.translated?(attribute)
+      if methods.include?(:build_relation) || respond_to?(:build_relation)
+        finder_class = klass.translation_class
+        table = finder_class.arel_table
+
+        relation = build_relation(finder_class, table, attribute, value).and(table[:locale].eq(Globalize.locale))
+        relation = relation.and(table[klass.reflect_on_association(:translations).foreign_key].not_eq(record.send(:id))) if record.persisted?
+
+  #      TODO: add scope with translated attributes
+        if options[:scope]
+          ActiveRecord::Base.logger.warn("WARNING: Globalize3 does not currently support `scope` option on uniqueness validation for translated attributes.")
+        end
+
+        if finder_class.unscoped.where(relation).exists?
+          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+        end
+      else
+        finder_class = klass.translation_class
+        table = finder_class.unscoped
+
+        table_name   = finder_class.quoted_table_name
+
+        if value && klass.serialized_attributes.key?(attribute.to_s)
+          value = YAML.dump value
+        end
+
+        sql, params  = mount_sql_and_params(finder_class, table_name, attribute, value)
+
+        relation = table.where(sql, *params).where(:locale => Globalize.locale)
+
+        Array.wrap(options[:scope]).each do |scope_item|
+          scope_value = record.send(scope_item)
+          relation = relation.where(scope_item => scope_value)
+        end
+
+        if record.persisted?
+          fk = klass.reflect_on_association(:translations).options[:foreign_key]
+          relation = relation.where(finder_class.arel_table[fk].not_eq(record.send(:id)))
+        end
+
+        if relation.exists?
+          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
+        end
+      end
+    else
+      validate_each_without_translations(record, attribute, value)
+    end
+  end
+  alias_method_chain :validate_each, :translations
+end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: globalize3
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Sven Fuchs
 - Joshua Harvey
 - Clemens Kofler
@@ -19,136 +14,142 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  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: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  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: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
+    none: false
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  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: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.5.2
+    none: false
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+    none: false
+- !ruby/object:Gem::Dependency
   name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  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: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  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: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   name: sqlite3
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   type: :development
-  version_requirements: *id008
-description: "Rails I18n: de-facto standard library for ActiveRecord 3 model/data translation."
+  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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/globalize/active_record/act_macro.rb
 - lib/globalize/active_record/adapter.rb
 - lib/globalize/active_record/attributes.rb
@@ -166,45 +167,35 @@ 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/uniqueness_validator.rb
 - lib/patches/active_record/xml_attribute_serializer.rb
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - Rakefile
-- README.textile
 homepage: http://github.com/svenfuchs/globalize3
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
 requirements: []
-
-rubyforge_project: "[none]"
-rubygems_version: 1.8.17
+rubyforge_project: ! '[none]'
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: "Rails I18n: de-facto standard library for ActiveRecord 3 model/data translation"
+summary: Rails I18n de-facto standard library for ActiveRecord 3 model/data translation
 test_files: []
-
 has_rdoc: 

data/README.textile

@@ -1,205 +0,0 @@
-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 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.
-
-h2. Requirements
-
-ActiveRecord > 3.0.0
-I18n
-
-h2. Installation
-
-To install Globalize3 with its default setup just use:
-
-<pre><code>
-$ gem install globalize3
-</code></pre>
-
-h2. Model translations
-
-Model translations allow you to translate your models' attribute values. E.g.
-
-<pre><code>
-class Post < ActiveRecord::Base
-  translates :title, :text
-end
-</code></pre>
-
-Allows you to translate the attributes :title and :text per locale:
-
-<pre><code>
-I18n.locale = :en
-post.title # => Globalize3 rocks!
-
-I18n.locale = :he
-post.title # => גלובאלייז2 שולט!
-</code></pre>
-
-In order to make this work, you'll need to add the appropriate translation tables. Globalize3 comes with a handy helper method to help you do this. It's called @create_translation_table!@. Here's an example:
-
-<em>Note that if you're using rails ~> 3.1.0.rc migrations has only the <tt>change</tt> instance method</em>
-
-h3. Rails 3.0
-
-<pre><code>
-class CreatePosts < ActiveRecord::Migration
-  def self.up
-    create_table :posts do |t|
-      t.timestamps
-    end
-    Post.create_translation_table! :title => :string, :text => :text
-  end
-  def self.down
-    drop_table :posts
-    Post.drop_translation_table!
-  end
-end
-</code></pre>
-
-h3. Rails ~> 3.1.0.rc
-
-<em>Do not use the change method</em>
-
-<pre><code>
-class CreatePosts < ActiveRecord::Migration
-  def up
-    create_table :posts do |t|
-      t.timestamps
-    end
-    Post.create_translation_table! :title => :string, :text => :text
-  end
-  def down
-    drop_table :posts
-    Post.drop_translation_table!
-  end
-end
-</code></pre>
-
-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_attributes@ 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
-"paper_trail":https://github.com/airblade/paper_trail.  To add versioning 
-support to your model, you'll want to add the <code>:versioning => true</code>
-option to your call to <code>translates</code>.  An example from our test suite:
-
-<pre><code>
-  translates :title, :content, :published, :published_at, :versioning => true
-</code></pre>
-
-You will also need to have already generated the versions table that paper_trail
-expects.  See the paper_trail README for more details.
-
-Also, please see the tests in test/globalize3/versioning_test.rb for some current gotchas.
-
-h2. I18n fallbacks for empty translations
-
-It is possible to enable fallbacks for empty translations. It will depend on the configuration setting you have set for I18n translations in your Rails config.
-
-You can enable them by adding the next line to @config/application.rb@ (or only @config/environments/production.rb@ if you only want them in production)
-
-<pre><code>config.i18n.fallbacks = true</code></pre>
-
-By default, globalize3 will only use fallbacks when your translation model does not exist or the translation value for the item you've requested is @nil@. However it is possible to also use fallbacks for @blank@ translations by adding @:fallbacks_for_empty_translations => true@ to the @translates@ method.
-
-<pre><code>
-  class Post < ActiveRecord::Base
-    translates :title, :name
-  end
-
-  puts post.translations.inspect
-  # => [#<Post::Translation id: 1, post_id: 1, locale: "en", title: "Globalize3 rocks!", name: "Globalize3">, #<Post::Translation id: 2, post_id: 1, locale: "nl", title: '', name: nil>]
-
-  I18n.locale = :en
-  post.title # => 'Globalize3 rocks!'
-  post.name  # => 'Globalize3'
-
-  I18n.locale = :nl
-  post.title # => ''
-  post.name  # => 'Globalize3'
-</code></pre>
-<pre><code>
-  class Post < ActiveRecord::Base
-    translates :title, :name, :fallbacks_for_empty_translations => true
-  end
-
-  puts post.translations.inspect
-  # => [#<Post::Translation id: 1, post_id: 1, locale: "en", title: "Globalize3 rocks!", name: "Globalize3">, #<Post::Translation id: 2, post_id: 1, locale: "nl", title: '', name: nil>]
-
-  I18n.locale = :en
-  post.title # => 'Globalize3 rocks!'
-  post.name  # => 'Globalize3'
-
-  I18n.locale = :nl
-  post.title # => 'Globalize3 rocks!'
-  post.name  # => 'Globalize3'
-</code></pre>
-
-
-h2. Scoping objects by those with translations
-
-To only return objects that have a translation for the given locale we can use the `with_translations` scope. This will only return records that have a translations for the passed in locale.
-
-<pre><code>
-
-Post.with_translations('en') # => [#<Post::Translation id: 1, post_id: 1, locale: "en", title: "Globalize3 rocks!", name: "Globalize3">, #<Post::Translation id: 2, post_id: 1, locale: "nl", title: '', name: nil>]
-
-Post.with_translations(I18n.locale) # => [#<Post::Translation id: 1, post_id: 1, locale: "en", title: "Globalize3 rocks!", name: "Globalize3">, #<Post::Translation id: 2, post_id: 1, locale: "nl", title: '', name: nil>]
-
-Post.with_translations('de') # => []
-
-</code></pre>
-
-h2. Changes since Globalize2
-
-* `translation_table_name` was renamed to `translations_table_name`
-* `available_locales` has been removed. please use `translated_locales`
-
-h2. Migration from Globalize for Rails (version 1)
-
-See this script by Tomasz Stachewicz: http://gist.github.com/120867
-
-h2. Alternative Solutions
-
-* "Veger's fork":http://github.com/veger/globalize2 - uses default AR schema for the default locale, delegates to the translations table for other locales only
-* "TranslatableColumns":http://github.com/iain/translatable_columns - have multiple languages of the same attribute in a model (Iain Hecker)
-* "localized_record":http://github.com/glennpow/localized_record - allows records to have localized attributes without any modifications to the database (Glenn Powell)
-* "model_translations":http://github.com/janne/model_translations - Minimal implementation of Globalize2 style model translations (Jan Andersson)
-
-h2. Related solutions
-
-* "globalize2_versioning":http://github.com/joshmh/globalize2_versioning - acts_as_versioned style versioning for globalize2 (Joshua Harvey)
-* "i18n_multi_locales_validations":http://github.com/ZenCocoon/i18n_multi_locales_validations - multi-locales attributes validations to validates attributes from globalize2 translations models (Sébastien Grosjean)
-* "globalize2 Demo App":http://github.com/svenfuchs/globalize2-demo - demo application for globalize2 (Sven Fuchs)</li>
-* "migrate_from_globalize1":http://gist.github.com/120867 - migrate model translations from Globalize1 to globalize2 (Tomasz Stachewicz)</li>
-* "easy_globalize2_accessors":http://github.com/astropanic/easy_globalize2_accessors - easily access (read and write) globalize2-translated fields (astropanic, Tomasz Stachewicz)</li>
-* "globalize2-easy-translate":http://github.com/bsamman/globalize2-easy-translate - adds methods to easily access or set translated attributes to your model (bsamman)</li>
-* "batch_translations":http://github.com/alvarezrilla/batch_translations - allow saving multiple globalize2 translations in the same request (Jose Alvarez Rilla)</li>