has_localization_table 0.3.8 → 0.3.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTI1M2E1MmY0ODY5NGE5YzU4Y2JiZGEzNGVmZmU1YjA0NDUzYWFiNg==
+    MmUyZDNjN2QwNTJmNDg0YWIzNjM3MjJmNzY4NWE5N2MxNTMyYWRhNg==
   data.tar.gz: !binary |-
-    ZDQwNGY1ZTVmN2NlM2M0MjEyYjk5N2YzMzY0NjYxMzVlMTllOWMxNg==
+    MDgxYThkMzM3NGVkM2ZkZWNkNWFiYzAyYjcyM2VhMzEzN2ZkNDBhYw==
 SHA512:
   metadata.gz: !binary |-
-    MzMyOTAwZmFlYjk3MmQ0YWE5Y2Q4NDZkMzA1NzIyM2U3YjJiMTNhOGI2Yzlj
-    NWUwMzc4YTRjNGY0ODU5ZGI2ZDYxMTRjOWYzYzY5ZDIzOWI0YTdlOGViMGFl
-    ZmIxZGIxMjhlMmZhOWY3MDUwNWQzOWI5MTI0N2ZiNjE1MWVkYjI=
+    MWE3ZjVhY2I1YTE2YWQyYTAyMzY2NWUyNGI0YTc3Yjc5ODA1OTRmMTcxODky
+    OGE3MGViOWZhZDEyZmFmZDIwODAyYTE2MDY3MWY4MTk3ZjgyMTU4OWIyNjlm
+    N2RjZjk5MmRlZWU2YTllMWNjN2NjZWVjZTI0M2UyNjkyNTNiODY=
   data.tar.gz: !binary |-
-    NWFkYmJlMzM1MTE5YWRjNDBjMzQ4NmU2OTVlMzBkNDk0MDU3MzY3NzdhMTA3
-    MmYzNmMzM2E1MDg4YWExNTY4MGVhNGQ0YmYzNzdlZDgzOTMzMGQ5YTFkMWZi
-    NzZkZmM4ZWM4ZmNmYWI0ODYxMmE0ZDUwNzg4NjE5ZGY4M2E4MDA=
+    NzNjZDg2ZDg5NzYxOTlkNjI5Y2QzNGYyNjIwYWQ0ZDNmNzE1M2EyNTc0M2Y5
+    YmI4YmMyYWVkMWUxY2RiYTVhNTllMmJlMjU3ZGM3YTI2ZGQ3OTk0NGI2NGQ5
+    NmU1MDM0OTQ0OGRiMmQ5ZjUzZjJjNmQ0YmVmMmEyODAxYzZlNDc=

data/lib/has_localization_table.rb

@@ -12,4 +12,16 @@ module HasLocalizationTable
       val
     end
   end
+
+  def self.with_options(options, &block)
+    # Ugly but we need to make sure we don't clobber the existing configuration
+    old_config = @config.dup
+    old_config.instance_variable_set('@_config', @config.config.dup)
+
+    @config.config.merge!(options.slice(*HasLocalizationTable.config.config.keys))
+
+    yield
+
+    @config = old_config
+  end
 end

data/lib/has_localization_table/active_record/attributes.rb

@@ -6,8 +6,9 @@ module HasLocalizationTable
 
         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]
+          if options.fetch(:fallback, HasLocalizationTable.config.fallback_locale) && !attr
+            fallback = options.fetch(:fallback, HasLocalizationTable.config.fallback_locale)
+            fallback = fallback.call(self) if fallback.respond_to?(:call)
             attr = read_localized_attribute(attribute, fallback)
           end
           attr

data/lib/has_localization_table/config.rb

@@ -28,6 +28,7 @@ module HasLocalizationTable
     config_accessor :class_suffix
     config_accessor :default_association_name
     config_accessor :create_has_one_by_default # Should a has_one association be automatically created?
+    config_accessor :fallback_locale
   end
 
   # this is ugly. why can't we pass the default value to config_accessor...?
@@ -40,5 +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
   end
 end

data/lib/has_localization_table/version.rb

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

data/spec/active_record/attributes_spec.rb

@@ -156,5 +156,16 @@ describe HasLocalizationTable do
     it 'should return a given locale when specified' do
       a.name(Locale.find(3)).must_equal 'Test'
     end
+
+    it 'should not evaluate a proc if the fallback is not required' do
+      HasLocalizationTable.config.current_locale = es
+      a.name(fallback: -> * { raise ArgumentError }).must_equal 'Test'
+    end
+
+    it 'should use the fallback specified in configuration' do
+      HasLocalizationTable.with_options(fallback_locale: -> * { Locale.find(3) }) do
+        a.name.must_equal 'Test'
+      end
+    end
   end
 end

data/spec/has_localization_table_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe HasLocalizationTable do
+  describe '.with_options' do
+    before do
+      HasLocalizationTable.configure do |c|
+        c.locale_class = 'Locale'
+      end
+    end
+
+    it 'should make the options available within the block' do
+      HasLocalizationTable.with_options(locale_class: 'Language') do
+        HasLocalizationTable.locale_class.must_equal 'Language'
+      end
+    end
+
+    it 'should revert to the original option values after the block' do
+      HasLocalizationTable.with_options(locale_class: 'Language') {}
+      HasLocalizationTable.locale_class.must_equal 'Locale'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_localization_table
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Daniel Vandersluis
@@ -111,6 +111,7 @@ files:
 - spec/active_record/relation_spec.rb
 - spec/active_record/validations_spec.rb
 - spec/active_record_spec.rb
+- spec/has_localization_table_spec.rb
 - spec/spec_helper.rb
 - spec/support/setup.rb
 homepage: https://github.com/dvandersluis/has_localization_table
@@ -144,6 +145,7 @@ test_files:
 - spec/active_record/relation_spec.rb
 - spec/active_record/validations_spec.rb
 - spec/active_record_spec.rb
+- spec/has_localization_table_spec.rb
 - spec/spec_helper.rb
 - spec/support/setup.rb
 has_rdoc: