has_localization_table 0.3.3 → 0.3.4

data/lib/has_localization_table/active_record/meta_methods.rb

@@ -14,7 +14,7 @@ module HasLocalizationTable
       end
       
       def localized_attributes
-        # Determine which attributes of the association model should be accessable through the base class
+        # Determine which attributes of the association model should be accessible through the base class
         # ie. everything that's not a primary key, foreign key, or timestamp attribute
         association_name = self.localization_table_options[:association_name] || :strings
         association = reflect_on_association(association_name)

data/lib/has_localization_table/active_record/relation.rb

@@ -23,23 +23,30 @@ module HasLocalizationTable
 
       def create_localization_associations!
         create_has_many_association
-        create_has_one_association
+
+        # if caller explicitly asked not to create a has_one association, there's nothing more to do
+        return unless localization_table_options.fetch(:has_one, true)
+
+        create_has_one_association if localization_table_options[:has_one] or HasLocalizationTable.create_has_one_by_default
       end
 
       # Collect the localization for the current locale
       def create_has_one_association
         table_name = localization_class.table_name
         foreign_key = HasLocalizationTable.locale_foreign_key
+        association_name = localization_association_name.to_s.singularize.to_sym
+        association_name = :localization if localized_attributes.include?(association_name)
 
-        has_one_options = localization_table_options.except(:association_name, :required, :optional, :dependent).
+        has_one_options = localization_table_options.except(:association_name, :required, :optional, :dependent, :has_one).
           merge({ conditions: Proc.new { "#{table_name}.#{foreign_key} = #{HasLocalizationTable.current_locale.id}"} })
 
-        self.has_one localization_association_name.to_s.singularize.to_sym, has_one_options
+        self.has_one association_name, has_one_options
+        self.has_one(:localization, has_one_options) unless association_name == :localization
       end
 
       # Collect all localizations for the object
       def create_has_many_association
-        self.has_many localization_association_name, localization_table_options.except(:association_name, :required, :optional)
+        self.has_many localization_association_name, localization_table_options.except(:association_name, :required, :optional, :has_one)
       end
 
     public

data/lib/has_localization_table/config.rb

@@ -27,6 +27,7 @@ module HasLocalizationTable
     config_accessor :all_locales
     config_accessor :class_suffix
     config_accessor :default_association_name
+    config_accessor :create_has_one_by_default # Should a has_one association be automatically created?
   end
 
   # this is ugly. why can't we pass the default value to config_accessor...?
@@ -38,5 +39,6 @@ module HasLocalizationTable
     config.primary_locale = ->{ config.locale_class.constantize.first }
     config.current_locale = ->{ config.locale_class.constantize.first }
     config.all_locales = ->{ config.locale_class.constantize.all }
+    config.create_has_one_by_default = true
   end
 end

data/lib/has_localization_table/version.rb

@@ -1,3 +1,3 @@
 module HasLocalizationTable
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/active_record/relation_spec.rb

@@ -15,6 +15,7 @@ describe HasLocalizationTable do
       def self.localization_association_name; :strings; end
       def self.localization_table_options; {}; end
       def self.localization_class; ArticleLocalization; end
+      def self.localized_attributes; []; end
     end
   end
 
@@ -39,6 +40,41 @@ describe HasLocalizationTable do
     reflection.macro.must_equal :has_one
   end
 
+  it "should alias the has_one association as localization" do
+    reflection = subject.reflect_on_association(:localization)
+    refute_nil reflection
+    reflection.macro.must_equal :has_one
+  end
+
+  it "should not create a has_one association if disabled in configuration" do
+    HasLocalizationTable.stub :create_has_one_by_default, false do
+      assert_nil subject.reflect_on_association(:localization)
+    end
+  end
+
+  it "should not create a has_one association if disabled in table options" do
+    Article.stub :localization_table_options, { has_one: false } do
+      assert_nil subject.reflect_on_association(:localization)
+    end
+  end
+
+  it "should create a has_one association if asked for, even if disabled in configuration" do
+    HasLocalizationTable.stub :create_has_one_by_default, false do
+      Article.stub :localization_table_options, { has_one: true } do
+        reflection = subject.reflect_on_association(:localization)
+        refute_nil reflection
+        reflection.macro.must_equal :has_one
+      end
+    end
+  end
+
+  it "should not create an association that conflicts with an attribute name" do
+    Article.stub :localized_attributes, [:string] do
+      Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
+      assert_nil Article.reflect_on_association(:string)
+    end
+  end
+
   it "should use the current locale for the has_one association" do
     locale = MiniTest::Mock.new
     locale.expect :id, 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_localization_table
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport