gettext_column_mapping 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/gettext_column_mapping.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gettext_column_mapping}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hallelujah"]
-  s.date = %q{2010-07-06}
+  s.date = %q{2010-07-07}
   s.description = %q{Translate your database columns with gettext}
   s.email = %q{hery@rails-royce.org}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/gettext_column_mapping/parser/yaml.rb",
      "lib/gettext_column_mapping/railtie.rb",
      "lib/gettext_column_mapping/tasks.rb",
+     "lib/gettext_column_mapping/version.rb",
      "tasks/gettext_column_mapping.rake",
      "test/.gitignore",
      "test/activerecord_test.rb",
@@ -73,22 +74,22 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Translate your database columns with gettext}
   s.test_files = [
-    "test/helper.rb",
-     "test/static/data.rb",
-     "test/static/pluralization.rb",
-     "test/activerecord_test.rb",
-     "test/mapper_test.rb",
+    "test/gettext_column_mapping_test.rb",
      "test/fast_gettext_helper.rb",
-     "test/gettext_column_mapping_test.rb",
-     "test/extend_lib_path.rb",
-     "test/gettext_helper.rb",
-     "test/db/migrate/001_create_utilisateurs.rb",
-     "test/db/migrate/003_create_categories.rb",
-     "test/db/migrate/002_create_rubriques.rb",
-     "test/models/categorie.rb",
+     "test/test_helper.rb",
+     "test/static/pluralization.rb",
+     "test/static/data.rb",
      "test/models/rubrique.rb",
      "test/models/utilisateur.rb",
-     "test/test_helper.rb"
+     "test/models/categorie.rb",
+     "test/db/migrate/002_create_rubriques.rb",
+     "test/db/migrate/001_create_utilisateurs.rb",
+     "test/db/migrate/003_create_categories.rb",
+     "test/gettext_helper.rb",
+     "test/helper.rb",
+     "test/activerecord_test.rb",
+     "test/mapper_test.rb",
+     "test/extend_lib_path.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/gettext_column_mapping/mapper.rb

@@ -19,7 +19,7 @@ module GettextColumnMapping
     end
 
     def map_attribute(obj,key)
-      self[obj.name.underscore][:column_names][key]
+      self[obj.name.underscore][:column_names][key] rescue key.to_s.capitalize
     end
 
     def translate_key?(obj,key)

data/lib/gettext_column_mapping/model_attributes_finder.rb

@@ -17,12 +17,12 @@ module GettextColumnMapping
       f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
       ModelAttributesFinder.new.find(options).each do |model,column_names|
 
-        f.puts("s_('#{model.to_s_with_gettext}')") #!Keep in sync with ActiveRecord::Base.human_name
+        f.puts("s_(\"#{model.to_s_with_gettext}\")") #!Keep in sync with ActiveRecord::Base.human_name
 
         #all columns namespaced under the model
         column_names.each do |attribute|
           translation = model.gettext_translation_for_attribute_name(attribute)
-          f.puts("s_('#{translation}')")
+          f.puts("s_(\"#{translation}\")")
         end
       end
       if GettextColumnMapping.config.use_parent_level
@@ -30,12 +30,15 @@ module GettextColumnMapping
         GettextColumnMapping::ParentLevel.each_config do |klass_name,columns,parent_association,parent_key,conditions|
           model = klass_name.constantize
           options_hash = {}
+          if conditions
+            options_hash.merge!(:conditions => conditions)
+          end
           if parent_association
-           options_hash.merge!(:conditions => conditions, :include => parent_association)
+            options_hash.merge!( :include => parent_association)
           end
-          model.find_each do |record|
+          model.find_each(options_hash) do |record|
             columns.each do |column|
-              f.puts("s_('#{record.msgid_for_attribute(column)}')")
+              f.puts("s_(\"#{record.msgid_for_attribute(column)}\")")
             end
           end
         end
@@ -55,7 +58,7 @@ module GettextColumnMapping
         #all columns namespaced under the model
         column_names.each do |attribute|
           translation = model.gettext_translation_for_attribute_name(attribute)
-          f.puts("s_('#{translation}')")
+          f.puts("s_(\"#{translation}\")")
         end
 
         if GettextColumnMapping.config.use_parent_level
@@ -63,18 +66,21 @@ module GettextColumnMapping
           GettextColumnMapping::ParentLevel.item_config(model.name) do |klass_name,columns,parent_association,parent_key,conditions|
             model = klass_name.constantize
             options_hash = {}
+            if conditions
+              options_hash.merge!(:conditions => conditions)
+            end
             if parent_association
-              options_hash.merge!(:conditions => conditions, :include => parent_association)
+              options_hash.merge!( :include => parent_association)
             end
-            model.find_each do |record|
-              columns.each do |column|
-                f.puts("s_('#{record.msgid_for_attribute(column)}')")
+            model.find_each(options_hash) do |record|
+              columns.each do |key|
+                f.puts("s_(\"#{record.msgid_for_attribute(key)}\")")
               end
             end
           end
-      end
+        end
 
-      f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
+        f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
 
       end
     end
@@ -107,7 +113,8 @@ module GettextColumnMapping
       found = Hash.new([])
 
       GettextColumnMapping.activerecord_subclasses.each do |subclass|
-        next if  table_ignored?(subclass,options[:ignore_tables])
+        next if table_ignored?(subclass,options[:ignore_tables])
+        found[subclass] = [] if GettextColumnMapping.config.use_parent_level && ! GettextColumnMapping::ParentLevel.column_attributes_translation(subclass.name).blank?
         subclass.columns.each do |column|
           unless column_ignored?(subclass,column,options[:ignore_columns])
             found[subclass] += [column.name]

data/lib/gettext_column_mapping/parent_level.rb

@@ -33,8 +33,8 @@ module GettextColumnMapping
       def prefix(klass = nil,column = nil,parent = nil,key = nil)
         prefixes = [data_prefix]
         prefixes << "#{klass.to_s_with_gettext}" if klass
-        prefixes  << "#{parent[key]}" if parent
-        prefixes << "#{klass.column_map_attribute(column.to_s)}" if column
+        prefixes << parent[key] if parent
+        prefixes << klass.column_map_attribute(column.to_s) if column
         prefixes.join("|")
       end
 
@@ -58,13 +58,17 @@ module GettextColumnMapping
         if parent
           parent_key = parent[:key]
           parent_association = parent[:association]
-          conditions = parent[:conditions]
         end
+        conditions = conditions_translation(klass_name)
         results = [klass_name,columns,parent_association,parent_key,conditions]
         yield(*results) if block_given?
         results
       end
 
+      def conditions_translation(klass_name)
+        attributes_translation(klass_name) && attributes_translation(klass_name)[:conditions]
+      end
+
       def attributes_translation(klass_name)
         @attributes_translation[klass_name] = @parent_level_config[klass_name.underscore]
       end

data/lib/gettext_column_mapping/version.rb

@@ -0,0 +1,3 @@
+module GettextColumnMapping
+  VERSION = File.read(File.expand_path("../../../VERSION",__FILE__)).chomp
+end

data/lib/gettext_column_mapping.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 # Check the version of active_support to requiring all libs
+require 'gettext_column_mapping/version'
 require 'active_support/version'
 if Gem::Version.new(ActiveSupport::VERSION::STRING) > Gem::Version.new("2")
   require 'active_support/all'

data/test/activerecord_test.rb

@@ -1,8 +1,6 @@
 # coding: utf-8
 require 'test_helper'
-require 'models/utilisateur'
-require 'models/rubrique'
-require 'models/categorie'
+
 class ActiverecordTest < ActiveSupport::TestCase
 
   fixtures :categories,:rubriques

data/test/gettext_column_mapping_test.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 require 'test_helper'
-class GettextColumnMappingTest < Test::Unit::TestCase
+class GettextColumnMappingTest < ActiveSupport::TestCase
 
   def test_config
     assert_instance_of ActiveSupport::OrderedOptions, GettextColumnMapping.config

data/test/mapper_test.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'test_helper'
-require 'models/utilisateur'
-class UtilisateurTest < Test::Unit::TestCase
+class UtilisateurTest < ActiveSupport::TestCase
+  fixtures :categories, :rubriques
 
   class NotMapped < ActiveRecord::Base; end
 
@@ -27,6 +27,11 @@ class UtilisateurTest < Test::Unit::TestCase
     assert GettextColumnMapping.mapper.translate_class_name?(Utilisateur)
   end
 
+  def test_map_attribute
+    assert 'Label', GettextColumnMapping.mapper.map_attribute(NotMapped,'label')
+    assert 'Label', GettextColumnMapping.mapper.map_attribute(Categorie,'label')
+  end
+
   def test_translation
     GettextColumnMapping.locale = 'en'
     assert_equal 'User', Utilisateur.human_name

data/test/test_helper.rb

@@ -4,8 +4,13 @@ if ENV['GETTEXT']
 else
   require 'fast_gettext_helper'
 end
-require 'test/unit'
+
+require 'models/utilisateur'
+require 'models/categorie'
+require 'models/rubrique'
+
 require 'active_support/test_case'
+require 'test/unit'
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
   self.fixture_path = File.expand_path("../db/fixtures",__FILE__)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - hallelujah
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +02:00
+date: 2010-07-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -50,6 +50,7 @@ files:
 - lib/gettext_column_mapping/parser/yaml.rb
 - lib/gettext_column_mapping/railtie.rb
 - lib/gettext_column_mapping/tasks.rb
+- lib/gettext_column_mapping/version.rb
 - tasks/gettext_column_mapping.rake
 - test/.gitignore
 - test/activerecord_test.rb
@@ -110,19 +111,19 @@ signing_key:
 specification_version: 3
 summary: Translate your database columns with gettext
 test_files: 
-- test/helper.rb
-- test/static/data.rb
+- test/gettext_column_mapping_test.rb
+- test/fast_gettext_helper.rb
+- test/test_helper.rb
 - test/static/pluralization.rb
+- test/static/data.rb
+- test/models/rubrique.rb
+- test/models/utilisateur.rb
+- test/models/categorie.rb
+- test/db/migrate/002_create_rubriques.rb
+- test/db/migrate/001_create_utilisateurs.rb
+- test/db/migrate/003_create_categories.rb
+- test/gettext_helper.rb
+- test/helper.rb
 - test/activerecord_test.rb
 - test/mapper_test.rb
-- test/fast_gettext_helper.rb
-- test/gettext_column_mapping_test.rb
 - test/extend_lib_path.rb
-- test/gettext_helper.rb
-- test/db/migrate/001_create_utilisateurs.rb
-- test/db/migrate/003_create_categories.rb
-- test/db/migrate/002_create_rubriques.rb
-- test/models/categorie.rb
-- test/models/rubrique.rb
-- test/models/utilisateur.rb
-- test/test_helper.rb