has_localization_table 0.3.7 → 0.3.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzc3NzlkNWU5NWExNjhhZWM1YmVmOWM5YTI2YmQxYjk4ZDk2M2JlYQ==
+    NTI1M2E1MmY0ODY5NGE5YzU4Y2JiZGEzNGVmZmU1YjA0NDUzYWFiNg==
   data.tar.gz: !binary |-
-    MjY5YzZlZGRlYWQ1ZGYyYmUwYTI1MDJlYzI5ZGQwZDM1NDVkODkxYQ==
+    ZDQwNGY1ZTVmN2NlM2M0MjEyYjk5N2YzMzY0NjYxMzVlMTllOWMxNg==
 SHA512:
   metadata.gz: !binary |-
-    ZmRlZDE3OGI2MDA3ZDllZjk0MDcwNzhjYjkwYjk3NGE4NDdlMTkzYjBjYzE2
-    ZGQyZDZhZmZmOGMxMDRkZjNjN2Q5YTUxODAxOTAxN2Q4ODQ4NTQ3ODIyOTgy
-    ZDM1MmViN2U2NzkzNjgyYWQ1YzViN2MxYzJkMTRmOGIwMzk0Nzk=
+    MzMyOTAwZmFlYjk3MmQ0YWE5Y2Q4NDZkMzA1NzIyM2U3YjJiMTNhOGI2Yzlj
+    NWUwMzc4YTRjNGY0ODU5ZGI2ZDYxMTRjOWYzYzY5ZDIzOWI0YTdlOGViMGFl
+    ZmIxZGIxMjhlMmZhOWY3MDUwNWQzOWI5MTI0N2ZiNjE1MWVkYjI=
   data.tar.gz: !binary |-
-    Mzk3ZjRkNTIzMWU5MTA1OTg5ZjYyMjM4MTBlNzI0MmZmZWRhNGEzMzA0N2I0
-    NWEwODYzOTAwNmVlYjE0YWFhZmE1NTg4MmQyMzBmYjBhNzc1YmNiZDlhM2U3
-    OTY4MmY5OGM2ZGM2YjYwZmZkYzMwMmMyMTZlMWZlNWViMDdjMmY=
+    NWFkYmJlMzM1MTE5YWRjNDBjMzQ4NmU2OTVlMzBkNDk0MDU3MzY3NzdhMTA3
+    MmYzNmMzM2E1MDg4YWExNTY4MGVhNGQ0YmYzNzdlZDgzOTMzMGQ5YTFkMWZi
+    NzZkZmM4ZWM4ZmNmYWI0ODYxMmE0ZDUwNzg4NjE5ZGY4M2E4MDA=

data/lib/has_localization_table/active_record/attributes.rb

@@ -1,8 +1,17 @@
 module HasLocalizationTable
   module ActiveRecord
     module Attributes
-      def read_localized_attribute(attribute, locale = HasLocalizationTable.current_locale)
-        attribute_cache[attribute.to_sym][locale.id] ||= localization_association.detect{ |a| a.send(HasLocalizationTable.locale_foreign_key) == locale.id }.send(attribute) rescue nil
+      def read_localized_attribute(attribute, locale = HasLocalizationTable.current_locale, options = {})
+        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[:fallback] && !attr
+            fallback = options[:fallback].respond_to?(:call) ? options[:fallback].call(self) : options[:fallback]
+            attr = read_localized_attribute(attribute, fallback)
+          end
+          attr
+        end
       end
       
       def write_localized_attribute(attribute, value, locale = HasLocalizationTable.current_locale)
@@ -22,7 +31,8 @@ module HasLocalizationTable
               # Try to load a string for the given locale
               # If that fails, try for the primary locale
               raise ArgumentError, "wrong number of arguments (#{args.size} for 0 or 1)" unless args.size.between?(0, 1)
-              return read_localized_attribute($1, *args) || read_localized_attribute($1, HasLocalizationTable.primary_locale)
+              options = args.extract_options!
+              return read_localized_attribute($1, args.first, options) || read_localized_attribute($1, HasLocalizationTable.primary_locale, options)
             else
               raise ArgumentError, "wrong number of arguments (#{args.size} for 1)" unless args.size == 1
               return write_localized_attribute($1, args.first)

data/lib/has_localization_table/version.rb

@@ -1,3 +1,3 @@
 module HasLocalizationTable
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/spec/active_record/attributes_spec.rb

@@ -135,4 +135,26 @@ describe HasLocalizationTable do
     aa.name.must_equal "French Name"
     aa.description.must_equal "French Description"
   end
+
+  describe 'when a fallback is provided' do
+    let(:es) { Locale.create!(name: 'Spanish') }
+
+    before do
+      HasLocalizationTable.config.current_locale = es
+      a.save!
+      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'
+    end
+
+    it "should evaluate a proc" do
+      a.name(fallback: -> * { Locale.find(3) }).must_equal 'Test'
+    end
+
+    it 'should return a given locale when specified' do
+      a.name(Locale.find(3)).must_equal 'Test'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_localization_table
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime