localeapp 0.9.1 → 0.9.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGIyOGI1YTRjMGJmMWE1ODRiMDgwNGNlZThkZWQ0MmE0ZjQ3Njk1Yw==
+    YmRiNmFlOWYwMjMxZTNlMzExOTBhYTNhZTE5NzUzOTU1ZGRhNTBhYQ==
   data.tar.gz: !binary |-
-    MmRjMTRkMzI5MGFiMDA1NDBkY2I2ODk1MjRlZTc5MjBkNWRkMzE4OA==
+    MjM5YmZmYjdkMjIzOGQ1NDZhYjFjNTQ5NGI5OTk4YWZkNTI5NzYwOQ==
 SHA512:
   metadata.gz: !binary |-
-    Nzg5ODJhNjUzYTFkOTU0ZGNiMTA1Mjk1YzI3MzBkYjUzZGVmZDM1YWVlZTBi
-    NmFhNjNkYjc1ZGQ1YzliNDQxZGU2YjVjZTBiNzc3YTNiMTAwNjVkMDQ4YjZl
-    MWYyOWJmYzVhYjBkYzVhZmUxODY0NjVjYmM1OTBlNmI0OTNiNjU=
+    YmZmMTZiYmE4YTZhODgxOGIzNjkxZjAxNjU5ZDgwOGY0ZTdjMTE1ODg1NmIw
+    MGZhMjQ4M2VlYjIwZjM3YmFhMDQ5OGM5MzM0OTZlODI5NTcwZTNiNjg2Y2I4
+    NDkzMTFkODUwZTg3MTU4NTBjMGE5NmU0YjJhYmJiODJjMTVmYjc=
   data.tar.gz: !binary |-
-    N2NlMDQzZjhmMDVhNjc0YzJiNDhkY2Q4MjJlYWU0ZDIwMWE4ZTA0NWMzM2Rk
-    ZjcxMTVmNjhjNTUyODFiNGY3MTUxMTU3MGE3MzljZDYyYTBhYTBhY2ZkNjcz
-    YTY2MWJjNzllMWVlMzBkZTQ1YjBlMjQ5MmM0MTg2NWNlNzMxZmU=
+    ZmJmYTkxYTEwZGRkNDQyYjUzZmViYTg3YjIyYzdkMDg5OGNiOTBlNTAwM2Qx
+    NGYzODljYzE0ODY3Yzc2MWJjMjQ1ZTM3MzkzYTViMWU3MTlkOGFhYjk1MDcw
+    NDRkNzczZmRkNDNhODFjYTVhMTVlZDNkZTE4NGNkMjExMmI3Yjg=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # master
 
+# Version 0.9.2
+
+* Refactor which monkeypatch/backported-bugfix is loaded for which Rails version
+* Hotfix a regression where calling `I18n.t(nil)` would end up in a an error in MimicRailsMissingTranslationDisplay
+
 # Version 0.9.1
 
 * Fix Rails 4.1 TranslationHelper regression

data/lib/localeapp/rails/{4_1_translation_helper_monkeypatch.rb → backport_translation_helper_fix_to_honor_raise_option.rb}

@@ -1,6 +1,6 @@
 # We're replacing the original method with one that doesn't always override the :raise option.
-# This bug was introduced in Rails here (4.1.0.rc1): https://github.com/rails/rails/pull/13832
-# and fixed here: https://github.com/rails/rails/pull/17676
+# This bug was introduced in Rails here (4.0.10.rc1, 4.1.0.rc1 and 4.2.0.beta1): https://github.com/rails/rails/pull/13832
+# and fixed here (4.1.10.rc1 and 4.2.1.rc1): https://github.com/rails/rails/pull/17676 (thus, this is simply a backport of the bugfix)
 
 module Localeapp::TranslationHelperRails41MonkeyPatch
   # Delegates to <tt>I18n#translate</tt> but also performs three additional functions.

data/lib/localeapp/rails/mimic_rails_missing_translation_display.rb

@@ -12,7 +12,8 @@ module Localeapp
         alias :old_rails_call :call
         def call(exception, locale, key, options)
           locale, key = old_rails_call(exception, locale, key, options).split(', ')
-          "<span class=\"translation_missing\" title=\"translation missing: #{locale}.#{key}\">#{key.titleize}</span>".html_safe
+          keys = I18n.normalize_keys(locale, key, options[:scope])
+          "<span class=\"translation_missing localeapp\" title=\"translation missing: #{keys.join('.')}\">#{keys.last.to_s.titleize}</span>".html_safe
         end
 
       end

data/lib/localeapp/rails.rb

@@ -10,11 +10,15 @@ module Localeapp
         require 'localeapp/rails/2_3_translation_helper_monkeypatch'
       end
 
-      if rails_version_matches_any? '~> 4.1.0.rc1', '~> 4.2.0.beta1' # i.e. between https://github.com/rails/rails/commit/d57ce232a885b21e1d6d1f9fbf60bc5908ad880d and https://github.com/rails/rails/commit/4dbce79e95e3f56a9b48992dea4531493a5008cc
-        require 'localeapp/rails/4_1_translation_helper_monkeypatch'
+      # match all versions between https://github.com/rails/rails/commit/d57ce232a885b21e1d6d1f9fbf60bc5908ad880d and https://github.com/rails/rails/commit/4dbce79e95e3f56a9b48992dea4531493a5008cc on all branches
+      if rails_version_matches_all?('~> 4.0.10.rc1') |
+         rails_version_matches_all?('~> 4.1.0.rc1', '< 4.1.10.rc1') |
+         rails_version_matches_all?('~> 4.2.0.beta1', '< 4.2.1.rc1')
+        require 'localeapp/rails/backport_translation_helper_fix_to_honor_raise_option'
       end
 
-      if rails_version_matches_any? '~> 3.2.16', '>= 4.0.2' # ie: after CVE-2013-4491 patch (https://github.com/rails/rails/commit/78790e4bceedc632cb40f9597792d7e27234138a)
+      # match all versions after CVE-2013-4491 patch (https://github.com/rails/rails/commit/78790e4bceedc632cb40f9597792d7e27234138a)
+      if rails_version_matches_any? '~> 3.2.16', '>= 4.0.2'
         require 'localeapp/rails/mimic_rails_missing_translation_display'
         require 'localeapp/rails/force_exception_handler_in_translation_helper'
       end
@@ -72,6 +76,10 @@ module Localeapp
       requirements.map{ |r| rails_version_matches?(r) }.reduce(:|)
     end
 
+    def self.rails_version_matches_all?(*requirements)
+      requirements.map{ |r| rails_version_matches?(r) }.reduce(:&)
+    end
+
   end
 end
 

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Christopher Dell
@@ -253,7 +253,7 @@ files:
 - lib/localeapp/poller.rb
 - lib/localeapp/rails.rb
 - lib/localeapp/rails/2_3_translation_helper_monkeypatch.rb
-- lib/localeapp/rails/4_1_translation_helper_monkeypatch.rb
+- lib/localeapp/rails/backport_translation_helper_fix_to_honor_raise_option.rb
 - lib/localeapp/rails/controller.rb
 - lib/localeapp/rails/flatten.rb
 - lib/localeapp/rails/force_exception_handler_in_translation_helper.rb