Merge pull request #31 from alerque/property-access

Author: alerque

fluent/_nodes.lua

@@ -32,6 +32,7 @@ function FluentNode:_init (ast, resource)
       local node = leaf_to_node(leaf, resource)
       self:inject(node)
     end)
+  return self
 end
 
 function FluentNode:set_parent (resource)
@@ -99,6 +100,7 @@ function FTL.blank_block:_init (ast, resource)
   self:super(ast, resource)
   local _, count = string.gsub(ast[1], "\n", "")
   getmetatable(self).discardable = count == 0
+  return self
 end
 
 FTL.Entry = function (ast, resource)
@@ -114,7 +116,16 @@ 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)
@@ -169,6 +180,7 @@ function FTL.Pattern:_init (ast, resource)
   self.elements = {}
   self:super(ast, resource)
   self:dedent()
+  return self
 end
 
 function FTL.Pattern:dedent ()
@@ -223,7 +235,7 @@ FTL.TextElement._name ="TextElement"
 function FTL.TextElement:_init (ast, resource)
   getmetatable(self).appendable = true
   ast.id = "TextElement"
-  self:super(ast, resource)
+  return self:super(ast, resource)
 end
 
 function FTL.TextElement:__add (node)
@@ -244,7 +256,7 @@ function FTL.Placeable:_init (ast, resource)
   getmetatable(self).appendable = true
   ast.id = "Placeable"
   ast.expression = leaf_to_node(ast.expression, resource)
-  self:super(ast, resource)
+  return self:super(ast, resource)
 end
 
 function FTL.Placeable:__mod (node)
@@ -315,7 +327,7 @@ FTL.TermReference._name = "TermReference"
 
 function FTL.TermReference:_init (ast, resource)
   ast.id = "TermReference"
-  self:super(ast, resource)
+  return self:super(ast, resource)
 end
 
 function FTL.TermReference:__mul (node)
@@ -350,7 +362,7 @@ function FTL.SelectExpression:_init (ast, resource)
   ast.id = "SelectExpression"
   self.selector = {}
   self.variants = {}
-  self:super(ast, resource)
+  return self:super(ast, resource)
 end
 
 function FTL.SelectExpression:format (parameters)
@@ -385,7 +397,7 @@ FTL.variant_list._name = "variant_list"
 
 function FTL.variant_list:_init (ast, resource)
   self.elements = {}
-  self:super(ast, resource)
+  return self:super(ast, resource)
 end
 
 function FTL.variant_list:__mod (node)
@@ -401,7 +413,7 @@ FTL.Variant._name = "Variant"
 function FTL.Variant:_init (ast, resource)
   ast.id = "Variant"
   ast.default = ast.default or false
-  self:super(ast, resource)
+  return self:super(ast, resource)
 end
 
 FTL.VariantKey = class(FluentNode)
@@ -425,7 +437,7 @@ FTL.CallArguments._name = "CallArguments"
 function FTL.CallArguments:_init (ast, resource)
   self.named = {}
   self.positional = {}
-  self:super(ast, resource)
+  return self:super(ast, resource)
 end
 
 function FTL.CallArguments:__mul (node)
@@ -443,7 +455,7 @@ FTL.Comment._name = "Comment"
 
 function FTL.Comment:_init (ast, resource)
   getmetatable(self).appendable = true
-  self:super(ast, resource)
+  return self:super(ast, resource)
 end
 
 function FTL.Comment:__add (node)

fluent/init.lua

@@ -8,44 +8,64 @@ local FluentSyntax = require("fluent.syntax")
 local FluentResource = require("fluent.resource")
 
 local FluentBundle = class()
-FluentBundle.locales = {}
-FluentBundle.locale = "und"
 
 function FluentBundle:_init (locale)
+  self.locales = {}
   self:set_locale(locale)
+  -- Work around Penlight #307
   -- self:catch(self.get_message)
+  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
     self.locales[self.locale] = FluentResource()
   end
+  return self:get_locale()
 end
 
-function FluentBundle:get_message (identifier)
+function FluentBundle:get_locale ()
+  return self.locale
+end
+
+function FluentBundle:get_resource (locale)
   local locales = self.locales
-  local locale = self.locale
-  local resource = locales[locale]
+  local resource = locales[locale or self:get_locale()]
+  resource._patch_init(resource)
+  return resource
+end
+
+function FluentBundle:get_message (identifier)
+  local resource = self:get_resource()
   -- TODO iterate over fallback locales if not found in current one
-  return resource:get_message(identifier) or nil
+  return resource:get_message(identifier)
 end
 
 function FluentBundle:add_messages (input, locale)
-  if locale then self:set_locale(locale) end
+  -- Work around Penlight #307
+  -- self:_patch_init()
+  locale = locale or self:get_locale()
   local syntax = FluentSyntax()
   local messages =
     type(input) == "string"
     and syntax:parsestring(input)
     or tablex.reduce('+', tablex.imap(function (v)
         return syntax:parsestring(v)
       end, input))
-  self.locales[self.locale]:__add(messages)
-  return self
+  local resource = self:get_resource(locale)
+  return resource + messages
 end
 
 function FluentBundle:format (identifier, parameters)
-  local resource = self.locales[self.locale]
+  local resource = self:get_resource()
   local message = resource:get_message(identifier)
   return message:format(parameters)
 end

fluent/resource.lua

@@ -42,10 +42,21 @@ function FluentResource:_init (ast)
     end
   end
   flush()
+  -- Work around Penlight #307
   -- self:catch(self.get_message)
+  self:_patch_init()
+  return self
+end
+
+-- 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
@@ -79,6 +90,11 @@ function FluentResource:get_message (identifier, isterm)
   return attribute and entry:get_attribute(attribute) or entry
 end
 
+function FluentResource:format (identifier, parameters)
+  local message = self:get_message(identifier)
+  return message:format(parameters)
+end
+
 function FluentResource:get_term (identifier)
   return self:get_message(identifier, true)
 end

fluent/syntax.lua

@@ -11,6 +11,7 @@ local FluentSyntax = class()
 -- luacheck: ignore 212
 function FluentSyntax:_init (input)
   -- TODO: handle file pointers, filnames, tables of pointers?
+  return self
 end
 
 function FluentSyntax:parsestring (input)