has_localization_table 0.3.12 → 0.3.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzFkNDcyZjc2NTQ0ODU3ZDFjODk1MDYwMTg3Yjk5ZGVkYmMyYWUyMg==
+    N2ZlMDQ3ZWRiY2EwYzhmZWU1YmVjYjcwNzk1ZDNlY2VkZDYwNDhjYg==
   data.tar.gz: !binary |-
-    NDRkNDMxYTU1NTJkNzgyMTU2OTI0Y2IxNDY0N2QwYzRmZjlmYmJiOA==
+    OGFhMjlkZWU0ZTdiMzA3OGEwNTMzYzAxYjkzYTgxNmFkODVmM2RlNg==
 SHA512:
   metadata.gz: !binary |-
-    ZTc0YTRjZmU4MDQ4ZWY5MTEwNzEwMDFmMzRlZjIyNWY3ZTQ3ZmM4ZDYzYzli
-    NDcwZTU0NTAyNDY3NWMxOTZhZjJmOTdlZTIwNTA4NmJmOTgwODBhZTc3N2Qy
-    NTdiZTc5YjVhNWU4ZWQxNGFhNGFjZmFkMmE3NDg4NDJkMDg1YzE=
+    ODQyMTUzOGY0YjRjNGY0YTY0YzVlMTZhZTQyN2EzMDhiNzZlMmZhZDZmYmE5
+    NmMwOTAyNTMzNWY4NDRkMmZhOGMwMGVlMWJjOWMzZDEyY2ZiNzllOWU1N2Y3
+    NWJhZWJiNGNhMGIzNGRjNmQ2MWE5ZDI1M2ZiZWZlNTBjYTU5NmM=
   data.tar.gz: !binary |-
-    NDY1YzI2MDQ3YjgzNmQzYjlhM2JmMjA5ODYxODM4YzcxNzg3OTVlNmI3Njcw
-    MjhmMmUxOTc3MzFlZTA0NjRjYjk5NTM5YTM4OTNlNTZiNDI3YjYxOGU5ZjM5
-    NTExZWJmZmU4MThlNmZiNDE3Yzg2MDRjYjc4YTE0M2YyNjJmZGY=
+    ODQ4MGU3OWE4ZjM5Mjk3OGE5YTJlNDU3NWYyYTg1M2Y0YTIyZmQ5M2NmYjNm
+    MjE3ZmQyMGViMDRkMmFkMWExOWJiNGM2YTBkZDc5NDE1ZDJhYWM2MDg2ZTc1
+    MWU4ZDFkMDhiZmJjYjIyNzI4MGQyMWE4N2EyZDllOWM5NmVmZmQ=

data/lib/has_localization_table/active_record/attributes.rb

@@ -5,12 +5,17 @@ module HasLocalizationTable
         locale ||= HasLocalizationTable.current_locale
 
         attribute_cache[attribute.to_sym][locale.id] ||= begin
-          attr = localization_association.detect{ |a| a.send(HasLocalizationTable.locale_foreign_key) == locale.id }.send(attribute) rescue nil
-          if options.fetch(:fallback, HasLocalizationTable.config.fallback_locale) && !attr
-            fallback = options.fetch(:fallback, HasLocalizationTable.config.fallback_locale)
+          attr = localization_association.detect{ |a| a.send(HasLocalizationTable.locale_foreign_key) == locale.id }.send(attribute) rescue ''
+          attr ||= '' # if the attribute somehow is nil, change it to a blank string so we're always dealing with strings
+
+          fallback = options.fetch(:fallback, HasLocalizationTable.config.fallback_locale)
+
+          if fallback && attr.blank?
             fallback = fallback.call(self) if fallback.respond_to?(:call)
-            attr = read_localized_attribute(attribute, fallback)
+
+            return read_localized_attribute(attribute, fallback) unless fallback == locale
           end
+
           attr
         end
       end
@@ -50,6 +55,7 @@ module HasLocalizationTable
       end
     
     private
+
       def attribute_cache
         @localization_attribute_cache ||= localized_attributes.inject({}) { |memo, attr| memo[attr] = {}; memo }
       end

data/lib/has_localization_table/config.rb

@@ -41,6 +41,6 @@ module HasLocalizationTable
     config.current_locale = ->{ config.locale_class.constantize.first }
     config.all_locales = ->{ config.locale_class.constantize.all }
     config.create_has_one_by_default = true
-    config.fallback_locale = nil
+    config.fallback_locale = -> * { HasLocalizationTable.primary_locale }
   end
 end

data/lib/has_localization_table/version.rb

@@ -1,3 +1,3 @@
 module HasLocalizationTable
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

data/spec/active_record/attributes_spec.rb

@@ -6,7 +6,7 @@ describe HasLocalizationTable do
     HasLocalizationTable.configure do |c|
       c.primary_locale = Locale.first 
       c.current_locale = Locale.first
-      c.all_locales = Locale.all
+      c.all_locales = -> { Locale.all }
     end
 
     Object.send(:remove_const, :Article) rescue nil
@@ -50,7 +50,7 @@ describe HasLocalizationTable do
   
   it "should use the current locale when setting" do
     a
-    
+
     HasLocalizationTable.configure do |c|
       c.current_locale = Locale.last
     end
@@ -145,16 +145,26 @@ describe HasLocalizationTable do
       HasLocalizationTable.config.current_locale = Locale.first
     end
 
-    it "should return the fallback locale's string" do
-      a.name(fallback: Locale.find(3)).must_equal 'Test'
+    it "should return the fallback locale's string when there isn't a string for the current locale" do
+      a.name(fallback: es).must_equal 'Test'
+    end
+
+    it "should return the fallback locale's string when the string for the current locale is blank" do
+      a.update_attributes!(name: '', description: 'Description')
+      a.name(fallback: es).must_equal 'Test'
+    end
+
+    it 'should return a blank string if neither locale has a string' do
+      HasLocalizationTable.with_options(current_locale: es) { a.update_attributes!(name: '') }
+      a.name(fallback: es).must_be_empty
     end
 
     it "should evaluate a proc" do
-      a.name(fallback: -> * { Locale.find(3) }).must_equal 'Test'
+      a.name(fallback: -> * { es }).must_equal 'Test'
     end
 
     it 'should return a given locale when specified' do
-      a.name(Locale.find(3)).must_equal 'Test'
+      a.name(es).must_equal 'Test'
     end
 
     it 'should not evaluate a proc if the fallback is not required' do
@@ -163,9 +173,50 @@ describe HasLocalizationTable do
     end
 
     it 'should use the fallback specified in configuration' do
-      HasLocalizationTable.with_options(fallback_locale: -> * { Locale.find(3) }) do
+      HasLocalizationTable.with_options(fallback_locale: -> * { es }) do
         a.name.must_equal 'Test'
       end
     end
   end
+
+  describe 'when a fallback is not provided' do
+    describe 'when the primary locale is the current locale' do
+      it 'should return a blank string when the localization is nil' do
+        a = Article.new(name: nil)
+        a.name.must_be_empty
+      end
+
+      it 'should return a blank string if there is no localization' do
+        a = Article.create!
+        a.name.must_be_empty
+      end
+
+      it 'should return a blank string if the localization is blank' do
+        a.update_attributes!(name: '')
+        a.name.must_be_empty
+      end
+    end
+
+    describe 'when the primary locale is different than the current locale' do
+      let(:es) { Locale.create!(name: 'Spanish') }
+
+      before do
+        HasLocalizationTable.config.primary_locale = HasLocalizationTable.config.current_locale = es
+
+        a.save!
+
+        HasLocalizationTable.config.current_locale = Locale.first
+        a.update_attributes!(name: '', description: 'Description')
+      end
+
+      it 'should return the primary locale string if the current locale string is blank' do
+        a.name.must_equal 'Test'
+      end
+
+      it 'should return a blank string if neither locale has a string' do
+        HasLocalizationTable.with_options(current_locale: HasLocalizationTable.primary_locale) { a.update_attributes!(name: '') }
+        a.name.must_be_empty
+      end
+    end
+  end
 end

data/spec/has_localization_table_spec.rb

@@ -21,7 +21,7 @@ describe HasLocalizationTable do
 
     it 'should revert nil values' do
       HasLocalizationTable.with_options(fallback_locale: -> { }) { }
-      HasLocalizationTable.fallback_locale.must_be_nil
+      HasLocalizationTable.fallback_locale.must_equal HasLocalizationTable.primary_locale
     end
 
     it 'should revert values if an exception was raised in the block' do
@@ -33,7 +33,7 @@ describe HasLocalizationTable do
       rescue => e
       end
 
-      HasLocalizationTable.config.fallback_locale.must_be_nil
+      HasLocalizationTable.fallback_locale.must_equal HasLocalizationTable.primary_locale
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_localization_table
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime