globalize3 0.2.0.beta6 → 0.2.0.beta7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    globalize3 (0.2.0.beta4)
+    globalize3 (0.2.0.beta6)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       paper_trail (~> 2)
@@ -9,74 +9,72 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
       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)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    arel (3.0.0)
     builder (3.0.0)
     database_cleaner (0.5.2)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.4)
-    mail (2.3.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)
     metaclass (0.0.1)
     mime-types (1.17.2)
-    mocha (0.10.0)
+    mocha (0.10.3)
       metaclass (~> 0.0.1)
     multi_json (1.0.4)
-    paper_trail (2.5.0)
+    paper_trail (2.6.0)
       rails (~> 3)
     pathname_local (0.0.2)
     polyglot (0.3.3)
-    rack (1.3.6)
+    rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    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.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -84,7 +82,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    sprockets (2.0.3)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)

data/README.textile

@@ -106,15 +106,17 @@ the translation was applied. Here's an example (which assumes you already have a
 
 h2. Versioning with Globalize3
 
-Globalize3 nicely integrates with "vestal_versions":http://github.com/laserlemon/vestal_versions:
+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>
-require 'globalize/versioning/vestal_versions'
+  translates :title, :content, :published, :published_at, :versioning => true
 </code></pre>
 
-As of writing (2010-08-05) the original vestal_versions respository has not been updated to be compatible with Rails 3 though. You can use "this fork":http://github.com/svenfuchs/vestal_versions though. "Globalize3's Gemfile":http://github.com/svenfuchs/globalize3/blob/master/Gemfile#L10 is currently set up accordingly.
-
-Please also note that @update_attribute@ currently hides itself from dirty tracking in ActiveRecord >= 3.0.0.beta (which is considered a "regression":http://github.com/rails/rails/commit/01629d180468049d17a8be6900e27a4f0d2b18c4#commitcomment-123199). That means that you currently need to use attribute writers or @update_attributes@ in order to track changes/versions for your models.
+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.
 

data/lib/globalize/active_record/act_macro.rb

@@ -15,6 +15,8 @@ module Globalize
         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 => class_name.foreign_key,
                                 :dependent   => :destroy,

data/lib/globalize/active_record/migration.rb

@@ -79,11 +79,11 @@ module Globalize
         end
 
         def drop_translations_index
-          connection.remove_index(translations_table_name, :name => translation_index_name) rescue nil
+          connection.remove_index(translations_table_name, :name => translation_index_name)
         end
 
         def move_data_to_translation_table
-        # this refactored version might be a good idea, 
+        # 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)
@@ -92,10 +92,10 @@ module Globalize
         #    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}
+          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}

data/lib/globalize3/version.rb

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

metadata

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