Sync fork with iancanderson/ingreedy #11

liamnichols · 2024-03-26T07:25:11Z

I noticed that our fork was a little behind the original gem (iancanderson/ingreedy) so I figured that it would be worth syncing the changes so that we don't stray too far away from the original library.

The changes in this sync

Change	Note
Add the MIT license
Change the dependency constraints on `parslet`	Not a lot to be concerned with in v2 - https://github.com/kschiess/parslet/blob/master/HISTORY.txt
Improve British English support in the dictionary	I'll apply this to our dictionary too
Fix a bug with parsing of `ninety` in the English dictionary	We had already patched this in our apps
Update CI	We had already updated this, i'm going to add 3.3 checks in a new PR
Bump Version to 0.1.0	We can also bump it to 0.1.1 in #10

Allow these to be entered in a variety of ways, but for consistency and simplicity keep using the US spelling when outputting them. https://en.wikipedia.org/wiki/Litre https://en.wikipedia.org/wiki/Kilogram https://en.wikipedia.org/wiki/Gram

…rnational-spellings Allow British and international spellings

Fixed ninety in dictionary

Provide option for preserving amounts

Could you add this (or any other) license? :)

Use Github Actions for CI

This uses GitHub actions now

…ch-1 Delete .travis.yml

Add support for parslet 2.x

sota-horiuchi

We can also bump it to 0.1.1 in #10

OK

andyw8 and others added 17 commits January 28, 2016 16:37

Allow British and international spellings

e8844f3

Allow these to be entered in a variety of ways, but for consistency and simplicity keep using the US spelling when outputting them. https://en.wikipedia.org/wiki/Litre https://en.wikipedia.org/wiki/Kilogram https://en.wikipedia.org/wiki/Gram

Fixed ninety in dictionary

c50e8d2

Merge pull request iancanderson#27 from andyw8/allow-british-and-inte…

1855c70

…rnational-spellings Allow British and international spellings

Merge pull request iancanderson#29 from herkyl/master

effe7b2

Fixed ninety in dictionary

Merge pull request iancanderson#28 from balvig/fractions

246a7e3

Provide option for preserving amounts

Allow failure for jruby, ruby-head (iancanderson#30)

55e0226

Update Rubies and cache bundler (iancanderson#31)

63bbf50

Version 0.1.0

d0c054e

Create LICENSE (iancanderson#44)

f45fee6

Could you add this (or any other) license? :)

Add support for parslet 2.x

e6bd8e4

Use Github Actions for CI

9f784f4

Update test gems and relax version constraints

6e1514b

Merge pull request iancanderson#46 from mlarraz/master

bb29e8b

Use Github Actions for CI

Delete .travis.yml

6d0cced

This uses GitHub actions now

Merge pull request iancanderson#47 from iancanderson/iancanderson-pat…

89badc7

…ch-1 Delete .travis.yml

Merge pull request iancanderson#45 from mlarraz/parslet_2

b50640e

Add support for parslet 2.x

Merge remote-tracking branch 'upstream/master' into ln/sync-fork

5bdb9b5

liamnichols requested a review from sota-horiuchi March 26, 2024 07:26

liamnichols marked this pull request as ready for review March 26, 2024 07:26

liamnichols self-assigned this Mar 26, 2024

sota-horiuchi approved these changes Mar 26, 2024

View reviewed changes

liamnichols merged commit 778139f into master Mar 26, 2024
5 checks passed

liamnichols deleted the ln/sync-fork branch March 26, 2024 09:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync fork with iancanderson/ingreedy #11

Sync fork with iancanderson/ingreedy #11

liamnichols commented Mar 26, 2024 •

edited

Loading

sota-horiuchi left a comment

Sync fork with iancanderson/ingreedy #11

Sync fork with iancanderson/ingreedy #11

Conversation

liamnichols commented Mar 26, 2024 • edited Loading

sota-horiuchi left a comment

Choose a reason for hiding this comment

liamnichols commented Mar 26, 2024 •

edited

Loading