has_localization_table 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODMwMzhkMGY3Mjg1MzZiZjBkMDJjNDk1ZjFkNjk2Y2Y2N2MxODg1Nw==
+    YjhlMTY0MTFjZWMyZDc0ZWU1MmJlNTQ3OTJhZDNjYjdmNDFhY2E2Mw==
   data.tar.gz: !binary |-
-    N2VmZWRhMmQyMjIxNDVhMTVlZTc4ZDk0YWQzNmMzZjcyYzVlNjA5Mw==
+    Nzk0MDY0MDlmNTBiYTYzOTdlOGM1Y2YwNTYxYWFmNzQxYWNkM2RlYg==
 SHA512:
   metadata.gz: !binary |-
-    NzFhMjg3NmE1OTcwMzZhNmI2ZDgzNDRhNzk0Njg0MmZlNzVjMTQ0Nzg0YTNj
-    NTdjZTI2OGNkYjU1MzI0NmE4YjI4Y2JiNjhmYjk3MjkxM2EwNTMxZmM4MDli
-    MmIxNjk5ODE0MzI4ZGY5MzJlOTkyZTk5NmIzMDlmYTg4NzQzZDg=
+    ODRlOGQ2NTA1MTg0MzM4ZjI4NWU5MTcxZjBlOTM4OWNjM2EyNzJkYTE2MDI0
+    MjNkMDM4OWQzYjM5ZjNkOGRhYjg5OGRkODg5ZTZkZDliNDIyMDgzZGU3Yzg1
+    MmMyMGI5ODQzMWM4ODFlNTRmZDRhYzE3ZjQ2MDc4NTAzNzM3ZjA=
   data.tar.gz: !binary |-
-    ODgyYzU3Y2U3MTExMjg5MjQ5N2NiNDMwMzdhNjMwOGRjMzhjMGRmY2E2N2E0
-    OWE5MGIzYzczZjIzODkzNTA4ZTFmMGY4YWVmYWUzNDBjZDk5YWFiYjllNjhh
-    OTRlMzA1YzA1YjliZDQwOTIyM2U5MDEwZjUyZmJiY2Y0M2RmYzM=
+    MTgxODEzNjQ3MzYwNmU3OTE3ZmM3ZGJiMTJmMjM0NTQxYzc2MWZkNzk0MjFj
+    YjI3ODcxNDA5Y2VjYTA1OWQyN2ZlNDgwOWZkNzY2ZTFjNTk3YzIyODc5NzYw
+    M2NmNzdmMTFkYzZiMzQwMWE5YTdiYmMzY2FiMGQ0ZDZlMzllNjE=

data/lib/has_localization_table/active_record/attributes/cache.rb

@@ -27,7 +27,10 @@ module HasLocalizationTable
         end
 
         def changed?(attr, locale)
-          klass.localization_for(locale).send(attr) != self[attr.to_sym][locale.id]
+          localization = klass.localization_for(locale)
+          return false unless localization
+
+          localization.send(attr) != self[attr.to_sym][locale.id]
         end
       end
     end

data/lib/has_localization_table/active_record/relation.rb

@@ -29,7 +29,7 @@ module HasLocalizationTable
         # 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
+        create_has_one_association if localization_table_options[:has_one] || HasLocalizationTable.create_has_one_by_default
       end
 
       # Collect the localization for the current locale
@@ -40,7 +40,7 @@ module HasLocalizationTable
         association_name = :localization if localized_attributes.include?(association_name)
 
         has_one_options = localization_table_options.except(*RESERVED_KEYS).
-          merge(conditions: -> { "#{table_name}.#{foreign_key} = #{HasLocalizationTable.current_locale.id}" })
+          merge(conditions: -> * { "#{table_name}.#{foreign_key} = #{HasLocalizationTable.current_locale.id}" })
 
         self.has_one association_name, has_one_options
         self.has_one(:localization, has_one_options) unless association_name == :localization
@@ -93,7 +93,7 @@ module HasLocalizationTable
 
         # Remove localization objects that are not filled in
         def reject_empty_localizations!
-          localization_association.reject! { |l| !l.persisted? and localized_attributes.all?{ |attr| l.send(attr).blank? } }
+          localization_association.reject! { |l| !l.persisted? && localized_attributes.all?{ |attr| l.send(attr).blank? } }
         end
       end
     end

data/lib/has_localization_table/version.rb

@@ -1,3 +1,3 @@
 module HasLocalizationTable
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/active_record/attributes_spec.rb

@@ -266,6 +266,20 @@ describe HasLocalizationTable do
     a.localizations(true).wont_be_empty
   end
 
+  it 'should return nil when getting a attribute that has not been initialized' do
+    Article.has_localization_table
+
+    a = nil
+
+    HasLocalizationTable.with_options(all_locales: [Locale.first]) do
+      a = Article.new(name: 'Name')
+
+      HasLocalizationTable.with_options(current_locale: Locale.last) do
+        a.name(Locale.first).must_equal 'Name'
+      end
+    end
+  end
+
   it 'should update the main model when the string is directly updated' do
     Article.has_localization_table
     a = Article.new

data/spec/active_record/relation_spec.rb

@@ -11,106 +11,120 @@ describe HasLocalizationTable do
     end
 
     Object.send(:remove_const, :Article) rescue nil
-    Article = Class.new(ActiveRecord::Base) 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
+    Article = Class.new(ActiveRecord::Base)
   end
 
-  subject do
-    Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
-    Article
-  end
+  describe 'reflections' do
+    before do
+      Article.class_eval 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
 
-  it "should alias with_localizations with the actual association name" do
-    assert subject.respond_to? :with_strings
-  end
+    subject do
+      Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
+      Article
+    end
 
-  it "should create a has_many association" do
-    reflection = subject.reflect_on_association(:strings)
-    refute_nil reflection
-    reflection.macro.must_equal :has_many
-  end
+    it "should alias with_localizations with the actual association name" do
+      assert subject.respond_to? :with_strings
+    end
 
-  it "should create a has_one association" do
-    reflection = subject.reflect_on_association(:string)
-    refute_nil reflection
-    reflection.macro.must_equal :has_one
-  end
+    it "should create a has_many association" do
+      reflection = subject.reflect_on_association(:strings)
+      refute_nil reflection
+      reflection.macro.must_equal :has_many
+    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 create a has_one association" do
+      reflection = subject.reflect_on_association(:string)
+      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)
+    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
-  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)
+    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
-  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
+    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
-  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)
+    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
-  end
 
-  it "should use the current locale for the has_one association" do
-    locale = MiniTest::Mock.new
-    locale.expect :id, 2
+    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
 
-    conditions = subject.reflect_on_association(:string).options[:conditions]
+    it "should use the current locale for the has_one association" do
+      locale = MiniTest::Mock.new
+      locale.expect :id, 2
 
-    HasLocalizationTable.stub :current_locale, locale do
-      conditions.call.must_equal "article_localizations.locale_id = 2"
-    end
+      conditions = subject.reflect_on_association(:string).options[:conditions]
 
-    locale.expect :id, 3
+      HasLocalizationTable.stub :current_locale, locale do
+        conditions.call.must_equal "article_localizations.locale_id = 2"
+      end
+
+      locale.expect :id, 3
 
-    HasLocalizationTable.stub :current_locale, locale do
-      conditions.call.must_equal "article_localizations.locale_id = 3"
+      HasLocalizationTable.stub :current_locale, locale do
+        conditions.call.must_equal "article_localizations.locale_id = 3"
+      end
     end
-  end
 
-  it 'should add a default scope if include: true is given' do
-    Article.stub :localization_table_options, { include: true } do
-      Article.default_scopes.must_be_empty
-      Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
-      Article.default_scopes.size.must_equal(1)
+    it 'should add a default scope if include: true is given' do
+      Article.stub :localization_table_options, { include: true } do
+        Article.default_scopes.must_be_empty
+        Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
+        Article.default_scopes.size.must_equal(1)
+      end
     end
-  end
 
-  it 'should not add a default scope if include: false is given' do
-    Article.stub :localization_table_options, { include: false } do
-      Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
-      Article.default_scopes.must_be_empty
+    it 'should not add a default scope if include: false is given' do
+      Article.stub :localization_table_options, { include: false } do
+        Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
+        Article.default_scopes.must_be_empty
+      end
+    end
+
+    it 'should not add a default scope if include: is not given' do
+      Article.stub :localization_table_options, { } do
+        Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
+        Article.default_scopes.must_be_empty
+      end
     end
   end
 
-  it 'should not add a default scope if include: is not given' do
-    Article.stub :localization_table_options, { } do
-      Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
-      Article.default_scopes.must_be_empty
+  describe 'real' do
+    it 'should create a has_one association if requested' do
+      Article.has_localization_table has_one: true
+      a = Article.create!(name: 'Name')
+      a.localization.must_equal a.current_localization
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_localization_table
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Daniel Vandersluis