Work around new incarnation of Penlight №307 and (commented) test for new fail

Author: alerque

fluent/init.lua

@@ -14,10 +14,16 @@ function FluentBundle:_init (locale)
   self:set_locale(locale)
   -- Work around Penlight #307
   -- self:catch(self.get_message)
-  self:catch(function(_, identifier) return self:get_message(identifier) end)
+  self:_patch_init()
   return self
 end
 
+function FluentBundle:_patch_init ()
+  if not type(rawget(getmetatable(self), "__index")) ~= "function" then
+    self:catch(function(_, identifier) return self:get_message(identifier) end)
+  end
+end
+
 function FluentBundle:set_locale (locale)
   self.locale = CLDR.locales[locale] and locale or "und"
   if not self.locales[self.locale] then
@@ -32,7 +38,9 @@ end
 
 function FluentBundle:get_resource (locale)
   local locales = self.locales
-  return locales[locale or self:get_locale()]
+  local resource = locales[locale or self:get_locale()]
+  resource._patch_init(resource)
+  return resource
 end
 
 function FluentBundle:get_message (identifier)
@@ -42,6 +50,8 @@ function FluentBundle:get_message (identifier)
 end
 
 function FluentBundle:add_messages (input, locale)
+  -- Work around Penlight #307
+  -- self:_patch_init()
   locale = locale or self:get_locale()
   local syntax = FluentSyntax()
   local messages =

fluent/resource.lua

@@ -44,14 +44,19 @@ function FluentResource:_init (ast)
   flush()
   -- Work around Penlight #307
   -- self:catch(self.get_message)
+  self:_patch_init()
   return self
 end
 
-function FluentResource:load_node (node)
-  -- Work around Penlight #307
+-- Work around Penlight #307
+function FluentResource:_patch_init ()
   if not type(rawget(getmetatable(self), "__index")) ~= "function" then
     self:catch(function(_, identifier) return self:get_message(identifier) end)
   end
+end
+
+function FluentResource:load_node (node)
+  self:_patch_init()
   local body = self.body
   local k = #body + 1
   body[k] = node

spec/fluent_spec.lua

@@ -229,17 +229,17 @@ foo =
     bundle:add_messages("hi = hello")
     assert.same("hello", bundle:format("hi"))
     bundle:set_locale("tr")
-    bundle:add_messages("hi = merhaba")
-    assert.same("merhaba", bundle:format("hi"))
+    bundle:add_messages("hi = merhaba2")
+    assert.same("merhaba2", bundle:format("hi"))
     bundle:set_locale("en")
-    bundle:add_messages("hi = hello")
+    bundle:add_messages("hi = hello2")
     local en = bundle:get_resource("en")
     local tr = bundle:get_resource("tr")
-    assert.same("merhaba", tr:format("hi"))
-    assert.same("hello", en:format("hi"))
+    assert.same("merhaba2", tr:format("hi"))
+    assert.same("hello2", en:format("hi"))
     -- TODO Penlight hack doesn't work around this?
-    -- assert.same("merhaba", tr.hi())
-    -- assert.same("hello", en.hi())
+    assert.same("merhaba2", tr.hi())
+    -- assert.same("hello2", en.hi())
   end)
 
 end)