gettext_column_mapping 0.2.6 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.2.6
+1.0.0

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] rescue key.to_s.capitalize
+      self[obj.name.underscore][:column_names][key] || key.to_s.capitalize rescue key.to_s.capitalize
     end
 
     def translate_key?(obj,key)

data/lib/gettext_column_mapping/parent_level.rb

@@ -43,7 +43,7 @@ module GettextColumnMapping
       end
 
       def translate_key_for_column?(klass, column)
-        column_attributes_translation(klass.name)[column]
+        column_attributes_translation(klass.name).include?(column.to_s)
       end
 
       def each_config(&block)
@@ -78,7 +78,7 @@ module GettextColumnMapping
       end
 
       def column_attributes_translation(klass_name)
-        @column_attributes_translation[klass_name] ||= (attributes_translation(klass_name) && attributes_translation(klass_name)[:columns]) || []
+        @column_attributes_translation[klass_name] ||= ((attributes_translation(klass_name) && attributes_translation(klass_name)[:columns]) || []).map(&:to_s)
       end
 
     end

data/test/config/database.yml

@@ -1,7 +1,7 @@
 # coding: utf-8
 test:
   database: gettext_column_mapping
-  adapter: mysql
+  adapter: mysql2
   host: localhost
   username: root
   password:

data/test/mapper_test.rb

@@ -28,8 +28,8 @@ class UtilisateurTest < ActiveSupport::TestCase
   end
 
   def test_map_attribute
-    assert 'Label', GettextColumnMapping.mapper.map_attribute(NotMapped,'label')
-    assert 'Label', GettextColumnMapping.mapper.map_attribute(Categorie,'label')
+    assert_equal 'Libelle', GettextColumnMapping.mapper.map_attribute(NotMapped,'libelle')
+    assert_equal 'Label', GettextColumnMapping.mapper.map_attribute(Categorie,'libelle')
   end
 
   def test_translation

data/test/po/fr/gettext_column_mapping.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
-"POT-Creation-Date: 2010-07-06 10:30+0200\n"
+"POT-Creation-Date: 2010-12-30 16:26+0100\n"
 "PO-Revision-Date: 2010-07-05 11:51+0200\n"
 "Last-Translator:  <hery@rails-royce.org>\n"
 "Language-Team: French\n"

data/test/po/gettext_column_mapping.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
-"POT-Creation-Date: 2010-07-06 10:30+0200\n"
+"POT-Creation-Date: 2010-12-30 16:26+0100\n"
 "PO-Revision-Date: 2010-07-05 11:48+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

data/test/static/data.rb

@@ -1,15 +1,15 @@
 # coding: utf-8
 #DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!
-s_('Model|Category')
-s_('Model|Category|Label')
-s_('Model|Division')
-s_('Model|Division|Label')
-s_('Model|User')
-s_('Model|User|First name')
-s_('Model|User|Last name')
-s_('Model|User|Gender')
-s_('Data|Model|Category|Sport|Label|Football')
-s_('Data|Model|Category|Sport|Label|World Cup')
-s_('Data|Model|Category|Event|Label|Football')
-s_('Data|Model|Category|Event|Label|World Cup')
+s_("Model|Category")
+s_("Model|Category|Label")
+s_("Model|Division")
+s_("Model|Division|Label")
+s_("Model|User")
+s_("Model|User|First name")
+s_("Model|User|Last name")
+s_("Model|User|Gender")
+s_("Data|Model|Category|Sport|Label|Football")
+s_("Data|Model|Category|Sport|Label|World Cup")
+s_("Data|Model|Category|Event|Label|Football")
+s_("Data|Model|Category|Event|Label|World Cup")
 #DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!

metadata

@@ -3,10 +3,10 @@ name: gettext_column_mapping
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - hallelujah
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 +02:00
+date: 2010-12-30 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -27,14 +27,12 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - examples/config/column_mapping.yml
 - examples/config/gettext_db_extract.yml
-- gettext_column_mapping.gemspec
 - init.rb
 - install.rb
 - lib/gettext_column_mapping.rb
@@ -83,8 +81,8 @@ homepage: http://github.com/hallelujah/gettext_column_mapping
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -111,19 +109,19 @@ signing_key:
 specification_version: 3
 summary: Translate your database columns with gettext
 test_files: 
-- test/helper.rb
-- test/static/data.rb
-- test/static/pluralization.rb
 - test/activerecord_test.rb
-- test/mapper_test.rb
+- test/db/migrate/001_create_utilisateurs.rb
+- test/db/migrate/002_create_rubriques.rb
+- test/db/migrate/003_create_categories.rb
+- test/extend_lib_path.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/helper.rb
+- test/mapper_test.rb
 - test/models/categorie.rb
 - test/models/rubrique.rb
 - test/models/utilisateur.rb
+- test/static/data.rb
+- test/static/pluralization.rb
 - test/test_helper.rb

data/.gitignore

@@ -1,6 +0,0 @@
-*.swp
-*~
-test/locale/
-coverage
-rdoc
-pkg

data/gettext_column_mapping.gemspec

@@ -1,105 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{gettext_column_mapping}
-  s.version = "0.2.6"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["hallelujah"]
-  s.date = %q{2010-10-28}
-  s.description = %q{Translate your database columns with gettext}
-  s.email = %q{hery@rails-royce.org}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "examples/config/column_mapping.yml",
-     "examples/config/gettext_db_extract.yml",
-     "gettext_column_mapping.gemspec",
-     "init.rb",
-     "install.rb",
-     "lib/gettext_column_mapping.rb",
-     "lib/gettext_column_mapping/backends/base.rb",
-     "lib/gettext_column_mapping/backends/gettext_activerecord.rb",
-     "lib/gettext_column_mapping/backends/gettext_i18n_rails.rb",
-     "lib/gettext_column_mapping/initializer.rb",
-     "lib/gettext_column_mapping/mapper.rb",
-     "lib/gettext_column_mapping/model_attributes_finder.rb",
-     "lib/gettext_column_mapping/parent_level.rb",
-     "lib/gettext_column_mapping/parent_level/attr_methods.rb",
-     "lib/gettext_column_mapping/parser.rb",
-     "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",
-     "test/config/column_mapping.yml",
-     "test/config/database.yml",
-     "test/config/parent_level_column_mapping.yml",
-     "test/db/fixtures/categories.yml",
-     "test/db/fixtures/rubriques.yml",
-     "test/db/migrate/001_create_utilisateurs.rb",
-     "test/db/migrate/002_create_rubriques.rb",
-     "test/db/migrate/003_create_categories.rb",
-     "test/extend_lib_path.rb",
-     "test/fast_gettext_helper.rb",
-     "test/gettext_column_mapping_test.rb",
-     "test/gettext_helper.rb",
-     "test/helper.rb",
-     "test/log/.gitkeep",
-     "test/mapper_test.rb",
-     "test/models/categorie.rb",
-     "test/models/rubrique.rb",
-     "test/models/utilisateur.rb",
-     "test/po/fr/gettext_column_mapping.po",
-     "test/po/gettext_column_mapping.pot",
-     "test/static/data.rb",
-     "test/static/pluralization.rb",
-     "test/test_helper.rb",
-     "uninstall.rb"
-  ]
-  s.homepage = %q{http://github.com/hallelujah/gettext_column_mapping}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  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/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"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-