Commite9d4dbf

committed

Add flags for covnerting count to word numerals

1 parentb58cf98 commite9d4dbfCopy full SHA for e9d4dbf

File tree

+43

-8

lines changed

+43

-8

lines changed

Lines changed: 23 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,17 +65,32 @@ def parse_verb`
`65`	`65`	`# @api private`
`66`	`66`	`defparse_count`
`67`	`67`	`if@scanner.scan(/\{\{#([^\}]*?):([^\}]+?)\}\}/)`
	`68`	`+require"strings-numeral"`
`68`	`69`	`option=@scanner[1].to_s.tr(" ","").downcase`
`69`		`-ifoption =~/[^f]/`
	`70`	`+ifoption =~/[^fwo\d]/`
`70`	`71`	`raise"Unknown option '#{option}' in {{#:...}} tag"`
`71`	`72`	`end`
`72`		`-amount=caseoption`
`73`		`-when"f"`
`74`		`-fuzzy_count(@count)`
`75`		`-else`
`76`		`-@count`
`77`		`-end`
`78`		`-@value <<amount`
	`73`	`+@value <<parse_count_flags(option)`
	`74`	`+end`
	`75`	`+end`
	`76`	`+`
	`77`	`+# @api private`
	`78`	`+defparse_count_flags(option)`
	`79`	`+caseoption`
	`80`	`+when->(opt){opt =~/w/ &&opt =~/o/}`
	`81`	`+Strings::Numeral.ordinalize(@count)`
	`82`	`+when/w(\d*)/`
	`83`	`+if $1.empty? \|\|@count <= $1.to_i`
	`84`	`+Strings::Numeral.cardinalize(@count)`
	`85`	`+else`
	`86`	`+@count`
	`87`	`+end`
	`88`	`+when"o"`
	`89`	`+Strings::Numeral.ordinalize(@count,short:true)`
	`90`	`+when"f"`
	`91`	`+fuzzy_count(@count)`
	`92`	`+else`
	`93`	`+@count`
`79`	`94`	`end`
`80`	`95`	`end`
`81`	`96`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,33 @@`
`57`	`57`	`Strings::Inflection::Parser.parse(template,2)`
`58`	`58`	`}.toraise_error("Unknown option 'u' in {{#:...}} tag")`
`59`	`59`	`end`
	`60`	`+`
	`61`	`+it"counts with number as cardinal words"do`
	`62`	`+expect(Strings::Inflection::Parser.parse("{{#w: count}}",12)).toeq("twelve")`
	`63`	`+end`
	`64`	`+`
	`65`	`+it"counts with number as cardinal words up to the limit"do`
	`66`	`+expect(Strings::Inflection::Parser.parse("{{#w10: count}}",12)).toeq("12")`
	`67`	`+end`
	`68`	`+`
	`69`	`+it"counts with a short ordinal"do`
	`70`	`+expect(Strings::Inflection::Parser.parse("{{#o: count}}",12)).toeq("12th")`
	`71`	`+end`
	`72`	`+`
	`73`	`+it"counts with an ordinal"do`
	`74`	`+expect(Strings::Inflection::Parser.parse("{{# o w : count}}",12)).toeq("twelfth")`
	`75`	`+end`
`60`	`76`	`end`
`61`	`77`
`62`	`78`	`context"count fuzzy"do`
`63`	`79`	`it"allows for space between separator"do`
`64`	`80`	`expect(Strings::Inflection::Parser.parse("{{# f : count }}",0)).toeq("no")`
`65`	`81`	`end`
`66`	`82`
	`83`	`+it"allows for capital letter"do`
	`84`	`+expect(Strings::Inflection::Parser.parse("{{#F:count}}",0)).toeq("no")`
	`85`	`+end`
	`86`	`+`
`67`	`87`	`it"changes 0 count to no "do`
`68`	`88`	`expect(Strings::Inflection::Parser.parse("{{#f:count}}",0)).toeq("no")`
`69`	`89`	`end`

Comments

(0)