Drop Penlight workarounds not needed with different class layout

Author: alerque

fluent/_nodes.lua

@@ -112,25 +112,22 @@ FTL.Message = class(FluentNode)
 FTL.Message._name = "Message"
 
 function FTL.Message:_init (ast, resource)
-  self.attributes = setmetatable({}, {
-      map = {}
-    })
+  self.attributes = setmetatable({}, { map = {} })
   self:super(ast, resource)
-  -- Penlight bug #307, should be — self:catch(self.get_attribute)
-  self:catch(function (_, attribute) return self:get_attribute(attribute) end)
+  self:catch(self.get_attribute)
 end
 
 function FTL.Message:set_attribute (attribute)
+  local attributes = rawget(self, "attributes")
   local id = attribute.id.name
-  local attributes = self.attributes
   local map = getmetatable(attributes).map
   local k = #attributes + 1
   attributes[k] = attribute
   map[id] = k
 end
 
 function FTL.Message:get_attribute (attribute)
-  local attributes = self.attributes
+  local attributes = rawget(self, "attributes") or error ("No attributes")
   local map = getmetatable(attributes).map
   local k = map[attribute]
   return attributes[k]

fluent/init.lua

@@ -9,11 +9,11 @@ local FluentResource = require("fluent.resource")
 
 local FluentBundle = class()
 FluentBundle.locales = {}
+FluentBundle.locale = "und"
 
 function FluentBundle:_init (locale)
   self:set_locale(locale)
-  -- Penlight bug #307, should be — self:catch(self.get_message)
-  self:catch(function(_, identifier) return self:get_message(identifier) end)
+  self:catch(self.get_message)
 end
 
 function FluentBundle:set_locale (locale)
@@ -24,9 +24,10 @@ function FluentBundle:set_locale (locale)
 end
 
 function FluentBundle:get_message (identifier)
-  local locales = rawget(self, "locales")
+  local locales = self.locales
+  local locale = self.locale
+  local resource = locales[locale]
   -- TODO iterate over fallback locales if not found in current one
-  local resource = rawget(locales, self.locale)
   return resource:get_message(identifier) or nil
 end
 

fluent/resource.lua

@@ -42,8 +42,7 @@ function FluentResource:_init (ast)
     end
   end
   flush()
-  -- Penlight bug #307, should be — self:catch(self.get_message)
-  self:catch(function (_, identifier) return self:get_message(identifier) end)
+  self:catch(self.get_message)
 end
 
 function FluentResource:load_node (node)