globalize3 0.2.0.beta3 → 0.2.0.beta4

data/Gemfile

@@ -1,2 +1,9 @@
 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

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    globalize3 (0.2.0.beta2)
+    globalize3 (0.2.0.beta4)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       paper_trail (~> 2)
@@ -10,12 +10,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
       mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -23,27 +23,29 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    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.2)
+    columnize (0.3.4)
     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)
@@ -51,10 +53,11 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    metaclass (0.0.1)
     mime-types (1.16)
-    mocha (0.9.10)
-      rake
-    paper_trail (2.2.9)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    paper_trail (2.3.2)
       rails (~> 3)
     pathname_local (0.0.2)
     polyglot (0.3.2)
@@ -63,22 +66,28 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.8.7)
-    rdoc (3.9.2)
+    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)
@@ -89,7 +98,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    sqlite3-ruby (1.3.2)
+    sqlite3 (1.3.4)
     test_declarative (0.0.5)
     thor (0.14.6)
     treetop (1.4.10)
@@ -101,10 +110,13 @@ 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-ruby
+  sqlite3
   test_declarative

data/lib/globalize/active_record/adapter.rb

@@ -37,13 +37,16 @@ module Globalize
 
       def save_translations!
         stash.each do |locale, attrs|
-          translation = record.translations.find_or_initialize_by_locale(locale.to_s)
-          attrs.each { |name, value| translation[name] = value }
-          translation.save!
+          if attrs.any?
+            translation = record.translations.find_or_initialize_by_locale(locale.to_s)
+            attrs.each { |name, value| translation[name] = value }
+            translation.save!
+          end
         end
+
         record.translations.each(&:reload)
         record.translations.reset
-        stash.clear
+        reset
       end
 
       def reset

data/lib/globalize/active_record/instance_methods.rb

@@ -34,7 +34,9 @@ module Globalize
           end
           options = {:locale => nil}.merge(options)
           attribute_will_change! name.to_s
-          globalize.write(options[:locale] || Globalize.locale, name, value)
+          the_locale = options[:locale] || Globalize.locale
+          self.translations.reject!{|t| t.new_record? && t.locale != the_locale}
+          globalize.write(the_locale, name, value)
         else
           super(name, value)
         end
@@ -113,7 +115,7 @@ module Globalize
       def translation_for(locale)
         @translation_caches ||= {}
         unless @translation_caches[locale]
-          # Enumberable#detect is better since we have the translations collection (already) loaded 
+          # Enumberable#detect is better since we have the translations collection (already) loaded
           # using either Model.includes(:translations) or Model.with_translations
           _translation = translations.detect{|t| t.locale.to_s == locale.to_s}
           _translation ||= translations.build(:locale => locale)

data/lib/globalize3/version.rb

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

metadata

@@ -1,26 +1,28 @@
 --- !ruby/object:Gem::Specification 
 name: globalize3
 version: !ruby/object:Gem::Version 
-  hash: 62196357
+  hash: 62196363
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - beta
-  - 3
-  version: 0.2.0.beta3
+  - 4
+  version: 0.2.0.beta4
 platform: ruby
 authors: 
 - Sven Fuchs
 - Joshua Harvey
 - Clemens Kofler
 - John-Paul Bader
+- Tomasz Stachewicz
+- Philip Arndt
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -127,7 +129,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: sqlite3
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -140,20 +142,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id009
 description: "Rails I18n: de-facto standard library for ActiveRecord 3 model/data translation."
 email: nobody@globalize-rails.org
 executables: []
@@ -217,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: "Rails I18n: de-facto standard library for ActiveRecord 3 model/data translation"