has_localization_table 0.1.0 → 0.1.1

data/lib/has_localization_table/active_record.rb

@@ -3,16 +3,13 @@ module HasLocalizationTable
     def has_localization_table(*args)
       options = args.extract_options!
       options[:association_name] = args.first || HasLocalizationTable.default_association_name
+      options[:class_name] = options[:class_name].name if options[:class_name].respond_to?(:name)
       
       class_attribute :localization_table_options
-      self.localization_table_options = { dependent: :delete_all, class_name: localization_class.name }.merge(options)
+      self.localization_table_options = { dependent: :delete_all, class_name: self.name + HasLocalizationTable.class_suffix }.merge(options)
       
       extend(ClassMethods)
       include(InstanceMethods)
     end
-    
-    def localization_class
-      (self.name + HasLocalizationTable.class_suffix).constantize
-    end
   end
 end

data/lib/has_localization_table/class_methods.rb

@@ -42,6 +42,10 @@ module HasLocalizationTable
       alias_method :"with_#{klass.localization_association_name}", :with_localizations
     end
     
+    def localization_class
+      localization_table_options[:class_name].constantize
+    end
+    
     def localization_association_name
       localization_table_options[:association_name]
     end
@@ -96,11 +100,13 @@ module HasLocalizationTable
     end
     
     def with_localizations
-      scoped.joins((<<-eoq % HasLocalizationTable.current_locale.id).gsub(/\s+/, " "))
-        LEFT OUTER JOIN #{localization_class.table_name}
-          ON #{localization_class.table_name}.#{self.name.underscore}_id = #{self.table_name}.#{self.primary_key}
-          AND #{localization_class.table_name}.#{HasLocalizationTable.locale_foreign_key} = %d
-      eoq
+      lcat = localization_class.arel_table
+      
+      scoped.joins(
+        arel_table.join(lcat, Arel::Nodes::OuterJoin).
+          on(lcat[:"#{self.name.underscore}_id"].eq(arel_table[self.primary_key]).and(lcat[HasLocalizationTable.locale_foreign_key].eq(HasLocalizationTable.current_locale.id))).
+          join_sql
+      )
     end
     
   private

data/lib/has_localization_table/version.rb

@@ -1,3 +1,3 @@
 module HasLocalizationTable
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_localization_table
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &11803100 !ruby/object:Gem::Requirement
+  requirement: &11607560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11803100
+  version_requirements: *11607560
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &11802200 !ruby/object:Gem::Requirement
+  requirement: &11606680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11802200
+  version_requirements: *11606680
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &11800680 !ruby/object:Gem::Requirement
+  requirement: &11606080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11800680
+  version_requirements: *11606080
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &11866300 !ruby/object:Gem::Requirement
+  requirement: &11605360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11866300
+  version_requirements: *11605360
 description: Automatically sets up usage of a relational table to contain user-created
   multi-locale string attributes
 email: