gettext_i18n_rails 0.3.1 → 0.3.2

data/Readme.md

@@ -210,6 +210,7 @@ lib/tasks/gettext.rake:
  - [ed0h](http://github.com/ed0h)
  - [Nikos Dimitrakopoulos](http://blog.nikosd.com)
  - [Ben Tucker](http://btucker.net/)
+ - [Kamil Śliwak](https://github.com/cameel)
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/gettext_i18n_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gettext_i18n_rails}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-12-01}
+  s.date = %q{2011-12-04}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Gemfile",

data/lib/gettext_i18n_rails/model_attributes_finder.rb

@@ -2,25 +2,31 @@ module GettextI18nRails
   #write all found models/columns to a file where GetTexts ruby parser can find them
   def store_model_attributes(options)
     file = options[:to] || 'locale/model_attributes.rb'
-    File.open(file,'w') do |f|
-      f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
-      ModelAttributesFinder.new.find(options).each do |table_name,column_names|
-        #model name
-        begin
-          model = table_name.singularize.camelcase.constantize
-        rescue NameError
-          # Some tables are not models, for example: translation tables created by globalize2.
-          next
-        end
-        f.puts("_('#{model.human_name_without_translation}')")
-        
-        #all columns namespaced under the model
-        column_names.each do |attribute|
-          translation = model.gettext_translation_for_attribute_name(attribute)
-          f.puts("_('#{translation}')")
+    begin
+      File.open(file,'w') do |f|
+        f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
+        ModelAttributesFinder.new.find(options).each do |table_name,column_names|
+          #model name
+          model = table_name_to_namespaced_model(table_name)
+          if model == nil
+            # Some tables are not models, for example: translation tables created by globalize2.
+            puts "[Warning] Model not found for table '#{table_name}'"
+            next
+          end
+          f.puts("_('#{model.human_name_without_translation}')")
+
+          #all columns namespaced under the model
+          column_names.each do |attribute|
+            translation = model.gettext_translation_for_attribute_name(attribute)
+            f.puts("_('#{translation}')")
+          end
         end
+        f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
       end
-      f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
+    rescue
+      puts "[Error] Attribute extraction failed. Removing incomplete file (#{file})"
+      File.delete(file)
+      raise
     end
   end
   module_function :store_model_attributes
@@ -49,4 +55,54 @@ module GettextI18nRails
       patterns.detect{|p|p.to_s==name.to_s or (p.is_a?(Regexp) and name=~p)}
     end
   end
+
+private
+  # Tries to find the model class corresponding to specified table name.
+  # Takes into account that the model can be defined in a namespace.
+  # Searches only up to one level deep - won't find models nested in two
+  # or more modules.
+  #
+  # Note that if we allow namespaces, the conversion can be ambiguous, i.e.
+  # if the table is named "aa_bb_cc" and AaBbCc, Aa::BbCc and AaBb::Cc are
+  # all defined there's no absolute rule that tells us which one to use.
+  # This method prefers the less nested one and, if there are two at
+  # the same level, the one with shorter module name.
+  def table_name_to_namespaced_model(table_name)
+    # First assume that there are no namespaces
+    model = to_class(table_name.singularize.camelcase)
+    return model if model != nil
+
+    # If you were wrong, assume that the model is in a namespace.
+    # Iterate over the underscores and try to substitute each of them
+    # for a slash that camelcase() replaces with the scope operator (::).
+    underscore_position = table_name.index('_')
+    while underscore_position != nil
+      namespaced_table_name = table_name.dup
+      namespaced_table_name[underscore_position] = '/'
+      model = to_class(namespaced_table_name.singularize.camelcase)
+      return model if model != nil
+
+      underscore_position = table_name.index('_', underscore_position + 1)
+    end
+
+    # The model either is not defined or is buried more than one level
+    # deep in a module hierarchy
+    return nil
+  end
+
+  # Checks if there is a class of specified name and if so, returns
+  # the class object. Otherwise returns nil.
+  def to_class(name)
+    # I wanted to use Module.const_defined?() here to avoid relying
+    # on exceptions for normal program flow but it's of no use.
+    # If class autoloading is enabled, the constant may be undefined
+    # but turn out to be present when we actually try to use it.
+    begin
+      constant = name.constantize
+    rescue NameError
+      return nil
+    end
+
+    return constant.is_a?(Class) ? constant : nil
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 -08:00
+date: 2011-12-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency