gettext_i18n_rails 0.9.4 → 0.10.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.9.4)
+    gettext_i18n_rails (0.10.0)
       fast_gettext (>= 0.4.8)
 
 GEM

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'appraisal'
 require 'bump/tasks'
@@ -7,5 +8,5 @@ task :spec do
 end
 
 task :default do
-  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
+  sh "rake appraisal:install && rake appraisal spec"
 end

data/Readme.md

@@ -233,6 +233,8 @@ If want to use your .PO files on client side javascript you should have a look a
  - [Ivan Necas](https://github.com/iNecas)
  - [Andrey Chernih](https://github.com/AndreyChernyh)
  - [Imre Farkas](https://github.com/ifarkas)
+ - [Trong Tran](https://github.com/trongrg)
+ - [Dmitri Dolguikh](https://github.com/witlessbird)
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>

data/gemfiles/rails.2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.9.2)
+    gettext_i18n_rails (0.9.4)
       fast_gettext (>= 0.4.8)
 
 GEM

data/gemfiles/rails.3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.9.2)
+    gettext_i18n_rails (0.9.4)
       fast_gettext (>= 0.4.8)
 
 GEM

data/gemfiles/rails.3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.9.2)
+    gettext_i18n_rails (0.9.4)
       fast_gettext (>= 0.4.8)
 
 GEM

data/gemfiles/rails.3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.9.2)
+    gettext_i18n_rails (0.9.4)
       fast_gettext (>= 0.4.8)
 
 GEM

data/lib/gettext_i18n_rails/active_model/translation.rb

@@ -10,10 +10,16 @@ module ActiveModel
       if attribute.ends_with?('_id')
         humanize_class_name(attribute)
       else
-        "#{self}|#{attribute.split('.').map! {|a| a.humanize }.join('|')}"
+        "#{inheritance_tree_root(self)}|#{attribute.split('.').map! {|a| a.humanize }.join('|')}"
       end
     end
 
+    def inheritance_tree_root(aclass)
+      return aclass unless aclass.respond_to?(:base_class)
+      base = aclass.base_class
+      base.superclass.abstract_class? ? base.superclass : base
+    end
+
     def humanize_class_name(name=nil)
       name ||= self.to_s
       name.underscore.humanize

data/lib/gettext_i18n_rails/model_attributes_finder.rb

@@ -34,27 +34,40 @@ module GettextI18nRails
     # current connection ---> {'cars'=>['model_name','type'],...}
     def find(options)
       found = ActiveSupport::OrderedHash.new([])
-
       models.each do |model|
-        next if model.abstract_class
-        table_name = model.table_name
-        next if ignored?(table_name,options[:ignore_tables])
-        model.columns.each do |column|
-          found[model] += [column.name] unless ignored?(column.name,options[:ignore_columns])
-        end
-        found[model].sort!
+        attributes = model_attributes(model, options[:ignore_tables], options[:ignore_columns])
+        found[model] = attributes.sort if attributes.any?
       end
-
       found
     end
 
+    # Rails < 3.0 doesn't have DescendantsTracker. 
+    # Instead of iterating over ObjectSpace (slow) the decision was made NOT to support
+    # class hierarchies with abstract base classes in Rails 2.x
+    def model_attributes(model, ignored_tables, ignored_cols)
+      return [] if model.abstract_class? && Rails::VERSION::MAJOR < 3
+      
+      if model.abstract_class?
+        model.direct_descendants.reject {|m| ignored?(m.table_name, ignored_tables)}.inject([]) do |attrs, m|
+          attrs.push(model_attributes(m, ignored_tables, ignored_cols)).flatten.uniq
+        end
+      elsif !ignored?(model.table_name, ignored_tables)
+        model.columns.reject { |c| ignored?(c.name, ignored_cols) }.collect { |c| c.name }
+      else
+        []
+      end
+    end
+
     def models
       if Rails::VERSION::MAJOR > 2
         Rails.application.eager_load! # make sure that all models are loaded so that direct_descendants works
         ::ActiveRecord::Base.direct_descendants
       else
-        ::ActiveRecord::Base.connection.tables.map {|t| table_name_to_namespaced_model(t) }
-      end.compact.sort {|c1, c2| c1.name <=> c2.name}
+        ::ActiveRecord::Base.connection.tables \
+          .map { |t| table_name_to_namespaced_model(t) } \
+          .compact \
+          .collect { |c| c.superclass.abstract_class? ? c.superclass : c }
+      end.uniq.sort_by(&:name)
     end
 
     def ignored?(name,patterns)

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.9.4'
+  Version = VERSION = '0.10.0'
 end

data/spec/gettext_i18n_rails/active_record_spec.rb

@@ -23,6 +23,16 @@ describe ActiveRecord::Base do
       CarSeat.should_receive(:s_).with('CarSeat|Parts|Name').and_return('Handle')
       CarSeat.human_attribute_name(:"parts.name").should == 'Handle'
     end
+
+    it "translates attributes of STI classes through FastGettext" do
+      StiChild.should_receive(:s_).with('StiParent|Child attribute').and_return('Kinderattribut')
+      StiChild.human_attribute_name(:child_attribute).should == 'Kinderattribut'
+    end
+
+    it "translates attributes of concrete children of abstract parent classes" do
+      ConcreteChildClass.should_receive(:s_).with('AbstractParentClass|Child attribute').and_return('Kinderattribut')
+      ConcreteChildClass.human_attribute_name(:child_attribute).should == 'Kinderattribut'
+    end
   end
 
   describe :gettext_translation_for_attribute_name do

data/spec/gettext_i18n_rails/model_attributes_finder_spec.rb

@@ -16,13 +16,16 @@ describe GettextI18nRails::ModelAttributesFinder do
     Rails.application rescue nil
   end
 
+  # Rails < 3.0 doesn't have DescendantsTracker. 
+  # Instead of iterating over ObjectSpace (slow) the decision was made NOT to support
+  # class hierarchies with abstract base classes in Rails 2.x
   describe :find do
     it "returns all AR models" do
       keys = finder.find({}).keys
       if Rails::VERSION::MAJOR > 2
-        keys.should == [CarSeat, NotConventional, Part]
+        keys.should == [AbstractParentClass, CarSeat, NotConventional, Part, StiParent]
       else
-        keys.should == [CarSeat, Part]
+        keys.should == [CarSeat, Part, StiParent]
       end
     end
 
@@ -31,6 +34,9 @@ describe GettextI18nRails::ModelAttributesFinder do
       attributes[CarSeat].should == ['id', 'seat_color']
       attributes[NotConventional].should == ['id', 'name'] if Rails::VERSION::MAJOR > 2
       attributes[Part].should == ['car_seat_id', 'id', 'name']
+      attributes[StiParent].should == ['child_attribute', 'id', 'type']
+      attributes[AbstractParentClass].should == 
+        ['another_child_attribute', 'child_attribute', 'id'] if Rails::VERSION::MAJOR > 2
     end
   end
 end

data/spec/spec_helper.rb

@@ -66,6 +66,19 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :not_at_all_conventionals, :force=>true do |t|
     t.string :name
   end
+  
+  create_table :sti_parents, :force => true do |t|
+    t.string :type
+    t.string :child_attribute
+  end
+  
+  create_table :concrete_child_classes, :force => true do |t|
+    t.string :child_attribute
+  end
+
+  create_table :other_concrete_child_classes, :force => true do |t|
+    t.string :another_child_attribute
+  end
 end
 
 class CarSeat < ActiveRecord::Base
@@ -78,6 +91,15 @@ class Part < ActiveRecord::Base
   belongs_to :car_seat
 end
 
+class StiParent < ActiveRecord::Base; end
+class StiChild < StiParent; end
+
+class AbstractParentClass < ActiveRecord::Base
+  self.abstract_class = true
+end
+class ConcreteChildClass < AbstractParentClass; end
+class OtherConcreteChildClass < AbstractParentClass; end
+
 class NotConventional < ActiveRecord::Base
   if ActiveRecord::VERSION::MAJOR == 3
     self.table_name = :not_at_all_conventionals

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3233874037614167619
+      hash: -2644697753242804887
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3233874037614167619
+      hash: -2644697753242804887
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25