gettext_column_mapping 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/gettext_column_mapping.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gettext_column_mapping}
-  s.version = "0.2.5"
+  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-07-07}
+  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 = [

data/lib/gettext_column_mapping/initializer.rb

@@ -45,8 +45,12 @@ module GettextColumnMapping
       end
 
       def extend_active_record
-        ActiveRecord::Base.send(:include,GettextColumnMapping::Backends::Base)
-        ActiveRecord::Base.send(:include, config.backend_class.constantize)
+        unless ActiveRecord::Base.included_modules.include?(GettextColumnMapping::Backends::Base)
+          ActiveRecord::Base.send(:include,GettextColumnMapping::Backends::Base)
+        end
+        unless ActiveRecord::Base.included_modules.include?(config.backend_class.constantize)
+          ActiveRecord::Base.send(:include, config.backend_class.constantize)
+        end
         if config.use_parent_level
           require 'gettext_column_mapping/parent_level'
           GettextColumnMapping::ParentLevel.load_config

data/test/gettext_column_mapping_test.rb

@@ -2,6 +2,10 @@
 require 'test_helper'
 class GettextColumnMappingTest < ActiveSupport::TestCase
 
+  def setup
+    @config_file = File.join($gettext_column_mapping_root, 'config/column_mapping.yml')
+  end
+
   def test_config
     assert_instance_of ActiveSupport::OrderedOptions, GettextColumnMapping.config
     assert_instance_of GettextColumnMapping::Mapper, GettextColumnMapping.mapper
@@ -15,10 +19,30 @@ class GettextColumnMappingTest < ActiveSupport::TestCase
     assert_equal "Model", GettextColumnMapping.config.model_prefix
     assert_equal "Data", GettextColumnMapping.config.data_prefix
 
-    GettextColumnMapping.config.config_file = File.join($gettext_column_mapping_root, 'config/column_mapping.yml')
+    GettextColumnMapping.config.config_file = @config_file 
     assert_not_nil GettextColumnMapping.config.config_file
 
     GettextColumnMapping::Initializer.run
   end
 
+
+  def test_rerun
+    GettextColumnMapping.config.config_gile = @config_file
+
+    GettextColumnMapping::Initializer.run
+    assert_nothing_raised do
+      Utilisateur.last
+    end
+
+    # Emulating Rails unload / reload
+    # Todo use ActiveSupport::Dependencies .... but i am too lazy doing that :)
+    Object.send(:remove_const, :Utilisateur)
+    load File.join($gettext_column_mapping_root,'models/utilisateur.rb')
+    GettextColumnMapping::Initializer.run
+    assert_nothing_raised do
+      Utilisateur.last
+    end
+
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - hallelujah
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 +02:00
+date: 2010-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: []