Add more aggressive workaround for Penlight №307

Author: alerque

fluent/resource.lua

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

spec/fluent_spec.lua

@@ -164,14 +164,12 @@ foo =
       -- assert.same("qux", bundle["bar.bax"]())
       -- assert.same("qux", bundle.bar:get_attribute("bax")())
       assert.same("baz", bundle.bar())
-      -- TODO fix property accessor on resource
-      -- assert.same("baz", en.bar())
+      assert.same("baz", en.bar())
       assert.same("baz", bundle:format("bar"))
       assert.same("qux", bundle:get_message("bar"):get_attribute("bax")())
       bundle:add_messages("bar = rebar")
       assert.same("rebar", bundle.bar())
-      -- TODO fix property accessor on resource
-      -- assert.same("rebar", en.bar())
+      assert.same("rebar", en.bar())
       assert.same("rebar", bundle:format("bar"))
       assert.error(function() return bundle:get_message("bar"):get_attribute("bax")() end)
       -- assert.same("qux", bundle.bar.bax())
@@ -239,6 +237,9 @@ foo =
     local tr = bundle:get_resource("tr")
     assert.same("merhaba", tr:format("hi"))
     assert.same("hello", en:format("hi"))
+    -- TODO Penlight hack doesn't work around this?
+    -- assert.same("merhaba", tr.hi())
+    -- assert.same("hello", en.hi())
   end)
 
 end)