table_format

Author: waralex

src/components_utils/table_format.jl

@@ -1,4 +1,5 @@
 module TableFormat
+    using JSON3
     export Format, Align, Group, Padding, Prefix, Scheme, Sign, DSymbol, Trim
 
     struct NamedValue{Name, T}
@@ -113,7 +114,7 @@ module TableFormat
                 group_delimiter = nothing,
                 groups = nothing,
 
-                nully = nothing,
+                nully = "",
 
                 si_prefix = Prefix.none
             )
@@ -310,321 +311,26 @@ module TableFormat
             f.specifier[:type]
         )
         return JSON3.write(
-            locale = deepcopy(f.locale),
-            nully = f.nully,
-            prefix = f.prefix,
-            specifier = String(take!(spec_io))
-        )
-    end
-
-
-    #=struct Format
-        align ::Union{typeof(Align), Nothing}
-        fill ::Union{Char, Nothing}
-        group ::Union{typeof(Group), Bool, Nothing}
-        padding ::Union{typeof(Padding), Bool, Nothing}
-        padding_width ::Union{Integer, Nothing}
-        precision ::Union{Integer, Nothing}
-        scheme ::Union{typeof(Scheme), }
-        sign,
-        symbol,
-        trim,
-
-        #locale
-        symbol_prefix,
-        symbol_suffix,
-        decimal_delimiter,
-        group_delimiter,
-        groups,
-
-        #Nully
-        nully,
-        #Prefix
-        si_prefix
-        function Format(;
-                locale = (),
-                nully = "",
-                prefix = Prefix.none,
-                align = Align.default,
-                fill = "",
-                group = Group.no,
-                width = "",
-                padding = Padding.no,
-                precision = "",
-                sign = Sign.default,
-                symbol = Symbol.no,
-                trim = Trim.no,
-                type = Scheme.default
-            )
-            return new(
-                locale,
-                nully,
-                prefix,
-                (
-                    align = align,
-                    fill = fill,
-                    group = group,
-                    width = width,
-                    padding = padding,
-                    precision = precision,
-                    sign = sign,
-                    symbol = symbol,
-                    trim = trim,
-                    type = type
-                )
+            (
+                locale = deepcopy(f.locale),
+                nully = f.nully,
+                prefix = f.prefix,
+                specifier = String(take!(spec_io))
             )
-        end
+        )
     end
 
-    function format(;
-        align,
-        fill,
-        group,
-        padding,
-        padding_width,
-        precision,
-        scheme,
-        sign,
-        symbol,
-        trim,
-
-        #locale
-        symbol_prefix,
-        symbol_suffix,
-        decimal_delimiter,
-        group_delimiter,
-        groups,
-
-        #Nully
-        nully,
-        #Prefix
-        si_prefix
+    money(decimals, sign = Sign.default) = Format(
+        group=Group.yes,
+        precision=decimals,
+        scheme=Scheme.fixed,
+        sign=sign,
+        symbol=Symbol.yes
     )
-    end=#
-end
-#=
-import collections
-
-
-
-
-Trim = get_named_tuple("trim", {"no": "", "yes": "~"})
-
-
-class Format:
-    def __init__(self, **kwargs):
-        self._locale = {}
-        self._nully = ""
-        self._prefix = Prefix.none
-        self._specifier = {
-            "align": Align.default,
-            "fill": "",
-            "group": Group.no,
-            "width": "",
-            "padding": Padding.no,
-            "precision": "",
-            "sign": Sign.default,
-            "symbol": Symbol.no,
-            "trim": Trim.no,
-            "type": Scheme.default,
-        }
-
-        valid_methods = [
-            m for m in dir(self.__class__) if m[0] != "_" and m != "to_plotly_json"
-        ]
-
-        for kw, val in kwargs.items():
-            if kw not in valid_methods:
-                raise TypeError(
-                    "{0} is not a format method. Expected one of".format(kw),
-                    str(list(valid_methods)),
-                )
-
-            getattr(self, kw)(val)
-
-    def _validate_char(self, value):
-        self._validate_string(value)
-
-        if len(value) != 1:
-            raise ValueError("expected value to a string of length one")
-
-    def _validate_non_negative_integer_or_none(self, value):
-        if value is None:
-            return
-
-        if not isinstance(value, int):
-            raise TypeError("expected value to be an integer")
-
-        if value < 0:
-            raise ValueError("expected value to be non-negative", str(value))
-
-    def _validate_named(self, value, named_values):
-        if value not in named_values:
-            raise TypeError("expected value to be one of", str(list(named_values)))
-
-    def _validate_string(self, value):
-        if not isinstance(value, (str, u"".__class__)):
-            raise TypeError("expected value to be a string")
-
-    # Specifier
-    def align(self, value):
-        self._validate_named(value, Align)
-
-        self._specifier["align"] = value
-        return self
-
-    def fill(self, value):
-        self._validate_char(value)
-
-        self._specifier["fill"] = value
-        return self
-
-    def group(self, value):
-        if isinstance(value, bool):
-            value = Group.yes if value else Group.no
-
-        self._validate_named(value, Group)
-
-        self._specifier["group"] = value
-        return self
-
-    def padding(self, value):
-        if isinstance(value, bool):
-            value = Padding.yes if value else Padding.no
 
-        self._validate_named(value, Padding)
 
-        self._specifier["padding"] = value
-        return self
-
-    def padding_width(self, value):
-        self._validate_non_negative_integer_or_none(value)
-
-        self._specifier["width"] = value if value is not None else ""
-        return self
-
-    def precision(self, value):
-        self._validate_non_negative_integer_or_none(value)
-
-        self._specifier["precision"] = ".{0}".format(value) if value is not None else ""
-        return self
-
-    def scheme(self, value):
-        self._validate_named(value, Scheme)
-
-        self._specifier["type"] = value
-        return self
-
-    def sign(self, value):
-        self._validate_named(value, Sign)
-
-        self._specifier["sign"] = value
-        return self
-
-    def symbol(self, value):
-        self._validate_named(value, Symbol)
-
-        self._specifier["symbol"] = value
-        return self
-
-    def trim(self, value):
-        if isinstance(value, bool):
-            value = Trim.yes if value else Trim.no
-
-        self._validate_named(value, Trim)
-
-        self._specifier["trim"] = value
-        return self
-
-    # Locale
-    def symbol_prefix(self, value):
-        self._validate_string(value)
-
-        if "symbol" not in self._locale:
-            self._locale["symbol"] = [value, ""]
-        else:
-            self._locale["symbol"][0] = value
-
-        return self
-
-    def symbol_suffix(self, value):
-        self._validate_string(value)
-
-        if "symbol" not in self._locale:
-            self._locale["symbol"] = ["", value]
-        else:
-            self._locale["symbol"][1] = value
-
-        return self
-
-    def decimal_delimiter(self, value):
-        self._validate_char(value)
-
-        self._locale["decimal"] = value
-        return self
-
-    def group_delimiter(self, value):
-        self._validate_char(value)
-
-        self._locale["group"] = value
-        return self
-
-    def groups(self, groups):
-        groups = (
-            groups
-            if isinstance(groups, list)
-            else [groups]
-            if isinstance(groups, int)
-            else None
-        )
-
-        if not isinstance(groups, list):
-            raise TypeError("expected groups to be an integer or a list of integers")
-        if len(groups) == 0:
-            raise ValueError(
-                "expected groups to be an integer or a list of " "one or more integers"
-            )
-
-        for group in groups:
-            if not isinstance(group, int):
-                raise TypeError("expected entry to be an integer")
-
-            if group <= 0:
-                raise ValueError("expected entry to be a non-negative integer")
-
-        self._locale["grouping"] = groups
-        return self
-
-    # Nully
-    def nully(self, value):
-        self._nully = value
-        return self
-
-    # Prefix
-    def si_prefix(self, value):
-        self._validate_named(value, Prefix)
-        self._prefix = value
-        return self
-
-    def to_plotly_json(self):
-        f = {}
-        f["locale"] = self._locale.copy()
-        f["nully"] = self._nully
-        f["prefix"] = self._prefix
-        aligned = self._specifier["align"] != Align.default
-        f["specifier"] = "{}{}{}{}{}{}{}{}{}{}".format(
-            self._specifier["fill"] if aligned else "",
-            self._specifier["align"],
-            self._specifier["sign"],
-            self._specifier["symbol"],
-            self._specifier["padding"],
-            self._specifier["width"],
-            self._specifier["group"],
-            self._specifier["precision"],
-            self._specifier["trim"],
-            self._specifier["type"],
-        )
-
-        return f
-
-=#
+    function percentage(decimals, rounded::Bool=false)
+        scheme = rounded ? Scheme.percentage_rounded : Scheme.percentage
+        return Format(scheme = scheme, precision = decimals)
+    end
+end

test/runtests.jl

@@ -1,4 +1,4 @@
-#=include("env.jl")
+include("env.jl")
 include("resources.jl")
 include("devtools.jl")
 include("dash_creation.jl")
@@ -9,6 +9,6 @@ include("context.jl")
 include("core.jl")
 include("misc.jl")
 include("callbacks.jl")
-include("components_utils.jl")=#
+include("components_utils.jl")
 include("table_format.jl")
 #include("dev.jl")

test/table_format.jl

@@ -1,6 +1,7 @@
 using Test
 using Dash
 using Dash.TableFormat
+import JSON3
 @testset "named values" begin
    @test TableFormat.Align.left.value == "<"
    a = TableFormat.Align.default
@@ -172,4 +173,5 @@ end
     @test f.locale[:decimal] == ";"
     @test f.locale[:group] == ","
     @test f.locale[:grouping] == [2,2]
+
 end