Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: patch/cldr-list-pm6
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: raku-community-modules/CLDR-List
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 14 files changed
  • 1 contributor

Commits on Dec 16, 2024

  1. Copy the full SHA
    0fa565a View commit details
  2. 0.2

    lizmat committed Dec 16, 2024
    Copy the full SHA
    75dac68 View commit details
Showing with 454 additions and 75 deletions.
  1. +26 −0 .github/workflows/linux.yml
  2. +26 −0 .github/workflows/macos.yml
  3. +26 −0 .github/workflows/windows.yml
  4. +2 −0 .gitignore
  5. +0 −8 .travis.yml
  6. +6 −0 Changes
  7. +201 −0 LICENSE
  8. +23 −8 META6.json
  9. +40 −30 README.md
  10. +11 −0 dist.ini
  11. +19 −25 lib/CLDR/{List.pm → List.rakumod}
  12. +66 −0 run-tests
  13. +4 −2 t/{01-load.t → 01-load.rakutest}
  14. +4 −2 t/{format.t → format.rakutest}
26 changes: 26 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Linux

on:
push:
branches:
- '*'
tags-ignore:
- '*'
pull_request:

jobs:
raku:
strategy:
matrix:
os:
- ubuntu-latest
raku-version:
- 'latest'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: Raku/setup-raku@v1
with:
raku-version: ${{ matrix.raku-version }}
- name: Run Special Tests
run: raku run-tests -i
26 changes: 26 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: MacOS

on:
push:
branches:
- '*'
tags-ignore:
- '*'
pull_request:

jobs:
raku:
strategy:
matrix:
os:
- macos-latest
raku-version:
- 'latest'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: Raku/setup-raku@v1
with:
raku-version: ${{ matrix.raku-version }}
- name: Run Special Tests
run: raku run-tests -i
26 changes: 26 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Windows

on:
push:
branches:
- '*'
tags-ignore:
- '*'
pull_request:

jobs:
raku:
strategy:
matrix:
os:
- windows-latest
raku-version:
- 'latest'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: Raku/setup-raku@v1
with:
raku-version: ${{ matrix.raku-version }}
- name: Run Special Tests
run: raku run-tests -i
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.precomp/
/CLDR-List-*
8 changes: 0 additions & 8 deletions .travis.yml

This file was deleted.

6 changes: 6 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Revision history for CLDR::List

{{$NEXT}}

0.2 2024-12-16T20:00:32+01:00
- Initial version as a Raku Community module
201 changes: 201 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
The Artistic License 2.0

Copyright (c) 2000-2006, The Perl Foundation.

Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Preamble

This license establishes the terms under which a given free software
Package may be copied, modified, distributed, and/or redistributed.
The intent is that the Copyright Holder maintains some artistic
control over the development of that Package while still keeping the
Package available as open source and free software.

You are always permitted to make arrangements wholly outside of this
license directly with the Copyright Holder of a given Package. If the
terms of this license do not permit the full use that you propose to
make of the Package, you should contact the Copyright Holder and seek
a different licensing arrangement.

Definitions

"Copyright Holder" means the individual(s) or organization(s)
named in the copyright notice for the entire Package.

"Contributor" means any party that has contributed code or other
material to the Package, in accordance with the Copyright Holder's
procedures.

"You" and "your" means any person who would like to copy,
distribute, or modify the Package.

"Package" means the collection of files distributed by the
Copyright Holder, and derivatives of that collection and/or of
those files. A given Package may consist of either the Standard
Version, or a Modified Version.

"Distribute" means providing a copy of the Package or making it
accessible to anyone else, or in the case of a company or
organization, to others outside of your company or organization.

"Distributor Fee" means any fee that you charge for Distributing
this Package or providing support for this Package to another
party. It does not mean licensing fees.

"Standard Version" refers to the Package if it has not been
modified, or has been modified only in ways explicitly requested
by the Copyright Holder.

"Modified Version" means the Package, if it has been changed, and
such changes were not explicitly requested by the Copyright
Holder.

"Original License" means this Artistic License as Distributed with
the Standard Version of the Package, in its current version or as
it may be modified by The Perl Foundation in the future.

"Source" form means the source code, documentation source, and
configuration files for the Package.

"Compiled" form means the compiled bytecode, object code, binary,
or any other form resulting from mechanical transformation or
translation of the Source form.


Permission for Use and Modification Without Distribution

(1) You are permitted to use the Standard Version and create and use
Modified Versions for any purpose without restriction, provided that
you do not Distribute the Modified Version.


Permissions for Redistribution of the Standard Version

(2) You may Distribute verbatim copies of the Source form of the
Standard Version of this Package in any medium without restriction,
either gratis or for a Distributor Fee, provided that you duplicate
all of the original copyright notices and associated disclaimers. At
your discretion, such verbatim copies may or may not include a
Compiled form of the Package.

(3) You may apply any bug fixes, portability changes, and other
modifications made available from the Copyright Holder. The resulting
Package will still be considered the Standard Version, and as such
will be subject to the Original License.


Distribution of Modified Versions of the Package as Source

(4) You may Distribute your Modified Version as Source (either gratis
or for a Distributor Fee, and with or without a Compiled form of the
Modified Version) provided that you clearly document how it differs
from the Standard Version, including, but not limited to, documenting
any non-standard features, executables, or modules, and provided that
you do at least ONE of the following:

(a) make the Modified Version available to the Copyright Holder
of the Standard Version, under the Original License, so that the
Copyright Holder may include your modifications in the Standard
Version.

(b) ensure that installation of your Modified Version does not
prevent the user installing or running the Standard Version. In
addition, the Modified Version must bear a name that is different
from the name of the Standard Version.

(c) allow anyone who receives a copy of the Modified Version to
make the Source form of the Modified Version available to others
under

(i) the Original License or

(ii) a license that permits the licensee to freely copy,
modify and redistribute the Modified Version using the same
licensing terms that apply to the copy that the licensee
received, and requires that the Source form of the Modified
Version, and of any works derived from it, be made freely
available in that license fees are prohibited but Distributor
Fees are allowed.


Distribution of Compiled Forms of the Standard Version
or Modified Versions without the Source

(5) You may Distribute Compiled forms of the Standard Version without
the Source, provided that you include complete instructions on how to
get the Source of the Standard Version. Such instructions must be
valid at the time of your distribution. If these instructions, at any
time while you are carrying out such distribution, become invalid, you
must provide new instructions on demand or cease further distribution.
If you provide valid instructions or cease distribution within thirty
days after you become aware that the instructions are invalid, then
you do not forfeit any of your rights under this license.

(6) You may Distribute a Modified Version in Compiled form without
the Source, provided that you comply with Section 4 with respect to
the Source of the Modified Version.


Aggregating or Linking the Package

(7) You may aggregate the Package (either the Standard Version or
Modified Version) with other packages and Distribute the resulting
aggregation provided that you do not charge a licensing fee for the
Package. Distributor Fees are permitted, and licensing fees for other
components in the aggregation are permitted. The terms of this license
apply to the use and Distribution of the Standard or Modified Versions
as included in the aggregation.

(8) You are permitted to link Modified and Standard Versions with
other works, to embed the Package in a larger work of your own, or to
build stand-alone binary or bytecode versions of applications that
include the Package, and Distribute the result without restriction,
provided the result does not expose a direct interface to the Package.


Items That are Not Considered Part of a Modified Version

(9) Works (including, but not limited to, modules and scripts) that
merely extend or make use of the Package, do not, by themselves, cause
the Package to be a Modified Version. In addition, such works are not
considered parts of the Package itself, and are not subject to the
terms of this license.


General Provisions

(10) Any use, modification, and distribution of the Standard or
Modified Versions is governed by this Artistic License. By using,
modifying or distributing the Package, you accept this license. Do not
use, modify, or distribute the Package, if you do not accept this
license.

(11) If your Modified Version has been derived from a Modified
Version made by someone other than you, you are nevertheless required
to ensure that your Modified Version complies with the requirements of
this license.

(12) This license does not grant you the right to use any trademark,
service mark, tradename, or logo of the Copyright Holder.

(13) This license includes the non-exclusive, worldwide,
free-of-charge patent license to make, have made, use, offer to sell,
sell, import and otherwise transfer the Package with respect to any
patent claims licensable by the Copyright Holder that are necessarily
infringed by the Package. If you institute patent litigation
(including a cross-claim or counterclaim) against any party alleging
that the Package constitutes direct or contributory patent
infringement, then this Artistic License to you shall terminate on the
date that such litigation is filed.

(14) Disclaimer of Warranty:
THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL
LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 changes: 23 additions & 8 deletions META6.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
{
"perl" : "6.*",
"name" : "CLDR::List",
"version" : "*",
"author" : "Nova Patch",
"description" : "Localized list formatters using the Unicode CLDR",
"depends" : [],
"provides" : { "CLDR::List" : "lib/CLDR/List.pm" },
"source-url" : "git://github.com/patch/cldr-list-pm6.git"
"auth": "zef:raku-community-modules",
"author": "Nova Patch",
"build-depends": [
],
"depends": [
],
"description": "Localized list formatters using the Unicode CLDR",
"license": "Artistic-2.0",
"name": "CLDR::List",
"perl": "6.*",
"provides": {
"CLDR::List": "lib/CLDR/List.rakumod"
},
"resources": [
],
"source-url": "https://github.com/raku-community-modules/CLDR-List.git",
"tags": [
"CLDR",
"LOCALE"
],
"test-depends": [
],
"version": "0.2"
}
70 changes: 40 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,63 @@
![Perl CLDR](https://www.gravatar.com/avatar/656f15a25eff4437f5a82e7c929f41dd?s=96)
[![Actions Status](https://github.com/raku-community-modules/CLDR-List/actions/workflows/linux.yml/badge.svg)](https://github.com/raku-community-modules/CLDR-List/actions) [![Actions Status](https://github.com/raku-community-modules/CLDR-List/actions/workflows/macos.yml/badge.svg)](https://github.com/raku-community-modules/CLDR-List/actions) [![Actions Status](https://github.com/raku-community-modules/CLDR-List/actions/workflows/windows.yml/badge.svg)](https://github.com/raku-community-modules/CLDR-List/actions)

# NAME
NAME
====

CLDR::List - Localized list formatters using the Unicode CLDR

# SYNOPSIS
SYNOPSIS
========

use CLDR::List;
```raku
use CLDR::List;

my $list = CLDR::List.new(locale => 'en');
my @fruit = <apples oranges bananas>;
my $list = CLDR::List.new(locale => 'en');
my @fruit = <apples oranges bananas>;

say $list.format(@fruit); # apples, oranges, and bananas
say $list.format(@fruit); # apples, oranges, and bananas

$list.locale = 'en-GB'; # British English
say $list.format(@fruit); # apples, oranges and bananas
$list.locale = 'en-GB'; # British English
say $list.format(@fruit); # apples, oranges and bananas

$list.locale = 'zh-Hant'; # Traditional Chinese
say $list.format('1'..'4'); # 1、2、3和4
$list.locale = 'zh-Hant'; # Traditional Chinese
say $list.format(''..''); # 1、2、3和4
```

# DESCRIPTION
DESCRIPTION
===========

Localized list formatters using the Unicode CLDR.

## Attributes
Attributes
----------

- locale
* locale

## Methods
Methods
-------

- format
* format

# SEE ALSO
SEE ALSO
========

- [List Patterns in UTS \#35: Unicode
LDML](http://www.unicode.org/reports/tr35/tr35-general.html\#ListPatterns)
- [Perl Advent Calendar:
CLDR TL;DR](http://perladvent.org/2014/2014-12-23.html)
- [Unicode beyond just characters: Localization with the
CLDR](http://patch.codes/talks/localization-with-the-unicode-cldr/) (video and
slides)
* * [List Patterns in UTS #35: Unicode LDML](http://www.unicode.org/reports/tr35/tr35-general.html#ListPatterns)

# AUTHOR
* * [Perl Advent Calendar: CLDR TL;DR](http://perladvent.org/2014/2014-12-23.html)

Nova Patch <patch@cpan.org>
* * [Unicode beyond just characters: Localization with the CLDR](http://patch.codes/talks/localization-with-the-unicode-cldr/) (video and slides)

# COPYRIGHT AND LICENSE
AUTHOR
======

© 2013–2015 Nova Patch
Nova Patch

COPYRIGHT AND LICENSE
=====================

Copyright 2013 – 2017 Nova Patch

Copyright 2024 Raku Community

This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself.

This library is free software; you can redistribute it and/or modify it under
the same terms as Perl itself.
11 changes: 11 additions & 0 deletions dist.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name = CLDR::List

[ReadmeFromPod]
filename = lib/CLDR/List.rakumod

[UploadToZef]

[Badges]
provider = github-actions/linux.yml
provider = github-actions/macos.yml
provider = github-actions/windows.yml
44 changes: 19 additions & 25 deletions lib/CLDR/List.pm → lib/CLDR/List.rakumod
Original file line number Diff line number Diff line change
@@ -50,10 +50,10 @@ has $.locale = 'root';
has $!previous-locale;
has %!pattern;

method format (*@list) {
method format(*@list) {
self!update-pattern;

return do given @list {
do given @list {
when 0 { '' }
when 1 { ~@list[0] }
when 2 { %!pattern<2>.trans(@placeholders => @list) }
@@ -78,7 +78,7 @@ method format (*@list) {
}

# TODO: does Perl 6 have attribute triggers like Moose?
method !update-pattern {
method !update-pattern(-->Nil) {
return if $!previous-locale && $!previous-locale eq $!locale;

# TODO: robust locale tag handling with fallbacks
@@ -97,43 +97,37 @@ CLDR::List - Localized list formatters using the Unicode CLDR
=head1 SYNOPSIS
use CLDR::List;
=begin code :lang<raku>
my $list = CLDR::List.new(locale => 'en');
my @fruit = <apples oranges bananas>;
use CLDR::List;
say $list.format(@fruit); # apples, oranges, and bananas
my $list = CLDR::List.new(locale => 'en');
my @fruit = <apples oranges bananas>;
$list.locale = 'en-GB'; # British English
say $list.format(@fruit); # apples, oranges and bananas
say $list.format(@fruit); # apples, oranges, and bananas
$list.locale = 'zh-Hant'; # Traditional Chinese
say $list.format('1'..'4'); # 1、2、3和4
$list.locale = 'en-GB'; # British English
say $list.format(@fruit); # apples, oranges and bananas
$list.locale = 'zh-Hant'; # Traditional Chinese
say $list.format('1'..'4'); # 1、2、3和4
=end code
=head1 DESCRIPTION
Localized list formatters using the Unicode CLDR.
=head2 Attributes
=over
=item locale
=back
=head2 Methods
=over
=item format
=back
=head1 SEE ALSO
=over
=item * L<List Patterns in UTS #35: Unicode
LDML|http://www.unicode.org/reports/tr35/tr35-general.html#ListPatterns>
@@ -144,15 +138,15 @@ CLDR TL;DR|http://perladvent.org/2014/2014-12-23.html>
CLDR|http://patch.codes/talks/localization-with-the-unicode-cldr/> (video and
slides)
=back
=head1 AUTHOR
Nova Patch <patch@cpan.org>
Nova Patch
=head1 COPYRIGHT AND LICENSE
© 2013–2015 Nova Patch
Copyright 2013 – 2017 Nova Patch
Copyright 2024 Raku Community
This library is free software; you can redistribute it and/or modify it under
the same terms as Perl itself.
66 changes: 66 additions & 0 deletions run-tests
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
unit sub MAIN(:a($author), :i($install));

say run(<raku --version>, :out).out.slurp.chomp;
say "Running on $*DISTRO.gist().\n";

say "Testing {
"dist.ini".IO.lines.head.substr(7)
}{
" including author tests" if $author
}";

my @failed;
my $done = 0;

sub process($proc, $filename) {
if $proc {
$proc.out.slurp;
}
else {
@failed.push($filename);
if $proc.out.slurp -> $stdout {
my @lines = $stdout.lines;
with @lines.first(
*.starts-with(" from gen/moar/stage2"),:k)
-> $index {
say @lines[^$index].join("\n");
}
else {
say $stdout;
}
}
else {
say "No output received, exit-code $proc.exitcode() ($proc.signal()):\n$proc.os-error()";
}
}
}

sub install() {
my $zef := $*DISTRO.is-win ?? 'zef.bat' !! 'zef';
my $proc := run $zef, "install", ".", "--verbose", "--/test", :out,:err,:merge;
process($proc, "*installation*");
}

sub test-dir($dir) {
for $dir.IO.dir(:test(*.ends-with: '.t' | '.rakutest')).map(*.Str).sort {
say "=== $_";
my $proc := run "raku", "--ll-exception", "-I.", $_, :out,:err,:merge;
process($proc, $_);
$done++;
}
}

test-dir("t");
test-dir($_) for dir("t", :test({ !.starts-with(".") && "t/$_".IO.d})).map(*.Str).sort;
test-dir("xt") if $author && "xt".IO.e;
install if $install;

if @failed {
say "\nFAILED: {+@failed} of $done:";
say " $_" for @failed;
exit +@failed;
}

say "\nALL {"$done " if $done > 1}OK";

# vim: expandtab shiftwidth=4
6 changes: 4 additions & 2 deletions t/01-load.t → t/01-load.rakutest
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
use v6;
use Test;
plan 4;

use CLDR::List;

plan 4;

my $list = CLDR::List.new;

ok $list ~~ CLDR::List, 'instantiate object';
ok $list.can('locale'), 'has locale method';
ok $list.can('format'), 'has format method';
is $list.locale, 'root', 'default locale';

# vim: expandtab shiftwidth=4
6 changes: 4 additions & 2 deletions t/format.t → t/format.rakutest
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use v6;
use Test;
plan 16;

use CLDR::List;

plan 16;

my $list = CLDR::List.new;

is $list.format(), '', 'root: 0 elements';
@@ -32,3 +32,5 @@ is $list.format(<一 丁 丈>), '一、丁和丈', 'zh-Hant: 3 elements';

$list.locale = 'ar';
is $list.format(<ﺍ ﺏ ﺕ>), 'ﺍ، ﺏ، و ﺕ', 'ar: 3 elements';

# vim: expandtab shiftwidth=4