Enable attribute access via message selectors again

Author: alerque

fluent/_nodes.lua

@@ -116,10 +116,18 @@ FTL.Message._name = "Message"
 function FTL.Message:_init (ast, resource)
   self.attributes = setmetatable({}, { map = {} })
   self:super(ast, resource)
+  -- Work around Penlight #307
   -- self:catch(self.get_attribute)
+  self:_patch_init()
   return self
 end
 
+function FTL.Message:_patch_init ()
+  if not type(rawget(getmetatable(self), "__index")) ~= "function" then
+    self:catch(function(_, attribute) return self:get_attribute(attribute) end)
+  end
+end
+
 function FTL.Message:set_attribute (attribute)
   local attributes = rawget(self, "attributes")
   local id = attribute.id.name

spec/fluent_spec.lua

@@ -127,10 +127,13 @@ foo =
       assert.error(function () return bundle["apple"]:format() end)
     end)
 
-    pending('attributes can be accessed as properties', function ()
+    it('attributes can be accessed as properties', function ()
       assert.same("qux", bundle["bar.bax"]())
+      assert.same("qux", en["bar.bax"]())
       assert.same("qux", bundle.bar["bax"]())
+      assert.same("qux", en.bar["bax"]())
       assert.same("qux", bundle.bar.bax())
+      assert.same("qux", en.bar.bax())
     end)
 
     it('preserves messages when messages are added', function ()
@@ -157,22 +160,34 @@ foo =
       assert.same("baz", bundle.bar())
       assert.same("baz", en.bar())
       assert.same("baz", bundle:format("bar"))
+      assert.same("baz", en:format("bar"))
       assert.same("qux", bundle:get_message("bar"):get_attribute("bax")())
-      -- assert.same("qux", bundle["bar.bax"]())
-      -- assert.same("qux", bundle.bar.bax())
+      assert.same("qux", en:get_message("bar"):get_attribute("bax")())
+      assert.same("qux", bundle["bar.bax"]())
+      assert.same("qux", en["bar.bax"]())
+      assert.same("qux", bundle.bar.bax())
+      assert.same("qux", en.bar.bax())
       bundle:add_messages("aa = bb")
-      -- assert.same("qux", bundle["bar.bax"]())
-      -- assert.same("qux", bundle.bar:get_attribute("bax")())
       assert.same("baz", bundle.bar())
       assert.same("baz", en.bar())
       assert.same("baz", bundle:format("bar"))
+      assert.same("baz", en:format("bar"))
       assert.same("qux", bundle:get_message("bar"):get_attribute("bax")())
+      assert.same("qux", en:get_message("bar"):get_attribute("bax")())
+      assert.same("qux", bundle["bar.bax"]())
+      assert.same("qux", en["bar.bax"]())
+      -- TODO Penlight hack doesn't work around this?
+      -- assert.same("qux", bundle.bar.bax())
+      -- assert.same("qux", en.bar.bax())
       bundle:add_messages("bar = rebar")
       assert.same("rebar", bundle.bar())
       assert.same("rebar", en.bar())
       assert.same("rebar", bundle:format("bar"))
+      assert.same("rebar", en:format("bar"))
       assert.error(function() return bundle:get_message("bar"):get_attribute("bax")() end)
-      -- assert.same("qux", bundle.bar.bax())
+      assert.error(function() return en:get_message("bar"):get_attribute("bax")() end)
+      assert.error(function() return bundle.bar.bax() end)
+      assert.error(function() return en.bar.bax() end)
     end)
 
     it('can be called', function ()