simonmenke-globalize2 0.0.1 → 0.0.4

data/lib/globalize/model/active_record/translated.rb

@@ -30,7 +30,7 @@ module Globalize
                 :class_name   => globalize_proxy.name,
                 :extend       => Extensions,
                 :dependent    => :delete_all,
-                :foreign_key  => class_name.foreign_key
+                :foreign_key  => self.name.gsub(/.+::/, '').foreign_key
               )
 
               after_save :update_globalize_record              
@@ -90,9 +90,9 @@ module Globalize
                 raise BadMigrationFieldType, "Bad field type for #{name}, should be :string or :text"
               end 
             end
-            translation_table_name = self.name.underscore + '_translations'
+            translation_table_name = self.name.underscore.gsub('/', '_') + '_translations'
             self.connection.create_table(translation_table_name) do |t|
-              t.references self.table_name.singularize
+              t.integer self.name.gsub(/.+::/, '').foreign_key
               t.string :locale
               fields.each do |name, type|
                 t.column name, type
@@ -102,14 +102,14 @@ module Globalize
           end
 
           def drop_translation_table!
-            translation_table_name = self.name.underscore + '_translations'
+            translation_table_name = self.name.underscore.gsub('/', '_') + '_translations'
             self.connection.drop_table translation_table_name
           end
           
           private
           
           def i18n_attr(attribute_name)
-            self.base_class.name.underscore + "_translations.#{attribute_name}"
+            self.base_class.name.underscore.gsub('/', '_') + "_translations.#{attribute_name}"
           end          
         end
         

data/lib/globalize/model/active_record.rb

@@ -6,10 +6,12 @@ require 'globalize/model/active_record/translated'
 module Globalize
   module Model
     module ActiveRecord
-      class << self                
+      class << self
         def create_proxy_class(klass)
-          Object.const_set "#{klass.name}Translation", Class.new(::ActiveRecord::Base){
-            belongs_to "#{klass.name.underscore}".intern
+          short_name = klass.name.gsub(/.+::/, '')
+          klass.parent.const_set "#{short_name}Translation", Class.new(::ActiveRecord::Base){
+            set_table_name "#{klass.name}Translation".pluralize.underscore.gsub('/', '_')
+            belongs_to "#{short_name.underscore}".intern, :class_name => klass.name, :foreign_key => "#{short_name.underscore}_id"
             
             def locale
               read_attribute(:locale).to_sym

data/lib/globalize.rb

@@ -0,0 +1,3 @@
+
+module Globalize
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-globalize2
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors: 
 - Josh Harvey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-26 00:00:00 -07:00
+date: 2009-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - lib/globalize/model/active_record/translated.rb
 - lib/globalize/model/active_record.rb
 - lib/globalize/translation.rb
+- lib/globalize.rb
 - lib/rails_edge_load_path_patch.rb
 - rails/init.rb
 - test/backends/chained_test.rb