globalize3 0.2.0.beta1 → 0.2.0.beta3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    globalize3 (0.2.0.beta1)
+    globalize3 (0.2.0.beta2)
       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.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -23,19 +23,19 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     builder (2.1.2)
@@ -54,29 +54,31 @@ GEM
     mime-types (1.16)
     mocha (0.9.10)
       rake
-    paper_trail (2.2.4)
+    paper_trail (2.2.9)
       rails (~> 3)
     pathname_local (0.0.2)
-    polyglot (0.3.1)
+    polyglot (0.3.2)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.8.7)
+    rdoc (3.9.2)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -90,9 +92,10 @@ GEM
     sqlite3-ruby (1.3.2)
     test_declarative (0.0.5)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby

data/README.textile

@@ -39,6 +39,10 @@ post.title # => גלובאלייז2 שולט!
 
 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
@@ -54,6 +58,25 @@ class CreatePosts < ActiveRecord::Migration
 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
@@ -95,6 +118,64 @@ Please also note that @update_attribute@ currently hides itself from dirty track
 
 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`

data/lib/globalize/active_record/act_macro.rb

@@ -7,9 +7,10 @@ module Globalize
         options = attr_names.extract_options!
         options[:table_name] ||= "#{table_name.singularize}_translations"
 
-        class_attribute :translated_attribute_names, :translation_options
+        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]
 
         include InstanceMethods
         extend  ClassMethods, Migration

data/lib/globalize/active_record/adapter.rb

@@ -23,7 +23,7 @@ module Globalize
         Globalize.fallbacks(locale).each do |fallback|
           value = fetch_stash(fallback, name) || fetch_attribute(fallback, name)
 
-          if value
+          unless fallbacks_for?(value)
             set_metadata(value, :locale => fallback, :requested_locale => locale)
             return value
           end
@@ -41,6 +41,7 @@ module Globalize
           attrs.each { |name, value| translation[name] = value }
           translation.save!
         end
+        record.translations.each(&:reload)
         record.translations.reset
         stash.clear
       end
@@ -84,6 +85,14 @@ module Globalize
         class << object; attr_accessor :translation_metadata end
         object.translation_metadata ||= {}
       end
+
+      def fallbacks_for?(object)
+        object.nil? || (fallbacks_for_empty_translations? && object.blank?)
+      end
+
+      def fallbacks_for_empty_translations?
+        record.fallbacks_for_empty_translations
+      end
     end
   end
 end

data/lib/globalize/active_record/instance_methods.rb

@@ -113,7 +113,9 @@ module Globalize
       def translation_for(locale)
         @translation_caches ||= {}
         unless @translation_caches[locale]
-          _translation = translations.with_locale(locale).first
+          # 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)
           @translation_caches[locale] = _translation
         end

data/lib/globalize3/version.rb

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

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: globalize3
 version: !ruby/object:Gem::Version 
+  hash: 62196357
   prerelease: 6
-  version: 0.2.0.beta1
+  segments: 
+  - 0
+  - 2
+  - 0
+  - beta
+  - 3
+  version: 0.2.0.beta3
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -13,8 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +12:00
-default_executable: 
+date: 2011-08-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -24,6 +30,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -35,6 +46,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id002
@@ -46,6 +62,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :runtime
   version_requirements: *id003
@@ -57,6 +76,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
   type: :development
   version_requirements: *id004
@@ -68,6 +92,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -79,6 +106,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -90,17 +120,23 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  name: ruby-debug
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -112,6 +148,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -147,7 +186,6 @@ files:
 - LICENSE
 - Rakefile
 - README.textile
-has_rdoc: true
 homepage: http://github.com/svenfuchs/globalize3
 licenses: []
 
@@ -161,17 +199,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: "Rails I18n: de-facto standard library for ActiveRecord 3 model/data translation"