globalize 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eeaeaa894fcfa1bda7a09f0082888c1daeb2867
-  data.tar.gz: e66a9181bbf984d8ecd2d3e37c70de70d944733a
+  metadata.gz: 6f79ee6b19f357cae4c848d662d6f081a6375b8c
+  data.tar.gz: 1f4fe986e59139c19acd2c2eac58b7598213ed85
 SHA512:
-  metadata.gz: 3c0d7d63119d1b46a47b3a33466a23ad153656678b8c98fda5345e3e36f7d7b1794fc00368140d9826307e8fe3ae4e6cef5d04404f3ae04d3b277141e6dffaeb
-  data.tar.gz: 36ab294d22cb53542122c8e2111020445ec1f9495def8d4ea9daecf2d9d6a81a4bb2fd50798d585f0d2cba1fc77024c7f5f9c97c632707b2b24d99396995c8cf
+  metadata.gz: 5f9894c0da31c4734117700845576c612e24a9c4575fc19370c87f788837ea6bf0968fe46c51d094c9a75d0fc39d1c7204b2b581716a5663a5a82ef901ae12de
+  data.tar.gz: c6ee550b86c3cec2e43443d11791b88a03c0d541cb1791a1b3aed249f664297ca96b0721823322c78ba8a869e4b82508727b70889d8c47b4a83f86caa6505a64

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Globalize Changelog
 
-## 5.0.0 (2014-03-03)
+## 5.0.1 (2015-02-15)
+
+* Don't touch table when model is loaded. [#412](https://github.com/globalize/globalize/pull/412)
+* Remove handling for locale attribute on parent model [#411](https://github.com/globalize/globalize/pull/411) by awesome [Tekin Suleyman](https://github.com/tekin).
+
+## 5.0.0 (2015-02-03)
 * Added support for Rails 4.2, but removed support for every previous version of Rails.  This is a backward incompatible change, thus the version is now 5.0.0. (thanks [Nico Ritsche](https://github.com/ncri) and others). [#396](https://github.com/globalize/globalize/pull/396).
 
 ## 4.0.3 (2014-11-24)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    globalize (4.0.3)
+    globalize (5.0.1)
       activemodel (>= 4.2.0, < 4.3)
       activerecord (>= 4.2.0, < 4.3)
 

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/serialization'
 require 'patches/active_record/uniqueness_validator'
 require 'patches/active_record/persistence'
 
@@ -77,4 +78,7 @@ module Globalize
   end
 end
 
+ActiveRecord::Base.mattr_accessor :globalize_serialized_attributes, instance_writer: false
+ActiveRecord::Base.globalize_serialized_attributes = {}
+
 ActiveRecord::Base.extend(Globalize::ActiveRecord::ActMacro)

data/lib/globalize/active_record/act_macro.rb

@@ -51,7 +51,7 @@ module Globalize
       end
 
       def enable_serializable_attribute(attr_name)
-        serializer = serializer_for_attribute(attr_name)
+        serializer = self.globalize_serialized_attributes[attr_name]
         if serializer.present?
           if defined?(::ActiveRecord::Coders::YAMLColumn) &&
             serializer.is_a?(::ActiveRecord::Coders::YAMLColumn)
@@ -62,13 +62,6 @@ module Globalize
         end
       end
 
-      def serializer_for_attribute(attr_name)
-        column = self.columns_hash[attr_name.to_s]
-        if column && column.cast_type.is_a?(::ActiveRecord::Type::Serialized)
-          column.cast_type.coder
-        end
-      end
-
       def setup_translates!(options)
         apply_globalize_options(options)
 

data/lib/globalize/active_record/class_methods.rb

@@ -47,7 +47,7 @@ module Globalize
             klass = self.const_set(:Translation, Class.new(Globalize::ActiveRecord::Translation))
           end
 
-          klass.belongs_to :globalized_model, :class_name => self.name, :foreign_key => translation_options[:foreign_key], :touch => true
+          klass.belongs_to :globalized_model, :class_name => self.name, :foreign_key => translation_options[:foreign_key]
           klass
         end
       end

data/lib/globalize/active_record/instance_methods.rb

@@ -45,9 +45,7 @@ module Globalize
         options = {:translated => true, :locale => nil}.merge(options)
         return super(name) unless options[:translated]
 
-        if name == :locale
-          self.try(:locale).presence || self.translation.locale
-        elsif self.class.translated?(name)
+        if translated?(name)
           if (value = globalize.fetch(options[:locale] || Globalize.locale, name))
             value
           else
@@ -66,7 +64,7 @@ module Globalize
 
       def translated_attributes
         translated_attribute_names.inject({}) do |attributes, name|
-          attributes.merge(name.to_s => self.send(name))
+          attributes.merge(name.to_s => send(name))
         end
       end
 
@@ -150,7 +148,7 @@ module Globalize
       end
 
       def save(*)
-        Globalize.with_locale(read_attribute(:locale) || I18n.default_locale) do
+        Globalize.with_locale(translation.locale || I18n.default_locale) do
           super
         end
       end
@@ -161,6 +159,10 @@ module Globalize
         globalize.send(:column_for_attribute, name)
       end
 
+      def cache_key
+        [super, translation.cache_key].join("/")
+      end
+
     protected
 
       def each_locale_and_translated_attribute
@@ -185,10 +187,7 @@ module Globalize
       def with_given_locale(attributes, &block)
         attributes.symbolize_keys! if attributes.respond_to?(:symbolize_keys!)
 
-        locale = respond_to?(:locale=) ? attributes.try(:[], :locale) :
-                                         attributes.try(:delete, :locale)
-
-        if locale
+        if locale = attributes.try(:delete, :locale)
           Globalize.with_locale(locale, &block)
         else
           yield

data/lib/globalize/version.rb

@@ -1,3 +1,3 @@
 module Globalize
-  Version = '5.0.0'
+  Version = '5.0.1'
 end

data/lib/patches/active_record/serialization.rb

@@ -0,0 +1,24 @@
+module ActiveRecord
+  module AttributeMethods
+    module Serialization
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def serialize_with_globalize(attr_name, class_name_or_coder = Object)
+          serialize_without_globalize(attr_name, class_name_or_coder)
+
+          coder = if class_name_or_coder == ::JSON
+                    Coders::JSON
+                  elsif [:load, :dump].all? { |x| class_name_or_coder.respond_to?(x) }
+                    class_name_or_coder
+                  else
+                    Coders::YAMLColumn.new(class_name_or_coder)
+                  end
+
+          self.globalize_serialized_attributes[attr_name] = coder
+        end
+        alias_method_chain :serialize, :globalize
+      end
+    end
+  end
+end

data/readme.md

@@ -64,6 +64,12 @@ I18n.locale = :he
 post.title # => גלובאלייז2 שולט!
 ```
 
+You can also set translations with mass-assignment by specifying the locale:
+
+```ruby
+post.attributes = { title: 'גלובאלייז2 שולט!', locale: :he }
+```
+
 In order to make this work, you'll need to add the appropriate translation tables.
 Globalize comes with a handy helper method to help you do this.
 It's called `create_translation_table!`. Here's an example:
@@ -164,6 +170,11 @@ NOTE: Remember to add the new field to the model:
 ```ruby
 translates :title, :author
 ```
+## Gotchas
+
+Because globalize uses the `:locale` key to specify the locale during
+mass-assignment, you should avoid having a `locale` attribute on the parent
+model.
 
 ## Versioning with Globalize
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -153,7 +153,6 @@ files:
 - LICENSE
 - Rakefile
 - globalize.gemspec
-- init.rb
 - lib/globalize.rb
 - lib/globalize/active_record.rb
 - lib/globalize/active_record/act_macro.rb
@@ -171,6 +170,7 @@ files:
 - lib/i18n/missing_translations_raise_handler.rb
 - lib/patches/active_record/persistence.rb
 - lib/patches/active_record/query_method.rb
+- lib/patches/active_record/serialization.rb
 - lib/patches/active_record/uniqueness_validator.rb
 - lib/patches/active_record/xml_attribute_serializer.rb
 - readme.md

data/init.rb

@@ -1 +0,0 @@
-require 'globalize'