Merge pull request #130 from snipsco/task/es-it-v0

Italian V0 + Spanish

Author: rosastern

Cargo.toml

@@ -6,7 +6,7 @@ build = "build.rs"
 
 [workspace]
 members=["values", "cli", "cli-debug", "moment", "json-utils",
-        "grammar", "grammar/de", "grammar/en", "grammar/es", "grammar/fr", "grammar/ko", "grammar/zh", "grammar/ja"]
+        "grammar", "grammar/de", "grammar/en", "grammar/es", "grammar/fr", "grammar/ko", "grammar/zh", "grammar/ja", "grammar/it"]
 
 [dependencies]
 rmp-serde = "0.13"

grammar/Cargo.toml

@@ -12,4 +12,5 @@ rustling-ontology-fr = { path="fr"}
 rustling-ontology-ko = { path="ko"}
 rustling-ontology-zh = { path="zh"}
 rustling-ontology-ja = { path="ja"}
+rustling-ontology-it = { path="it"}
 rustling-ontology-values = { path="../values"}

grammar/es/src/rules.rs

@@ -47,9 +47,17 @@ pub fn rules_finance(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
         |_| Ok(MoneyUnitValue { unit: Some("฿") })
     );
     b.rule_1_terminal("GBP",
-        b.reg(r#"gbp|libras? esterlina"#)?,
+        b.reg(r#"gbp|libras? esterlinas?"#)?,
         |_| Ok(MoneyUnitValue { unit: Some("GBP") })
     );
+    b.rule_1_terminal("JPY",
+                      b.reg(r#"jpy|yen(?:es)?"#)?,
+                      |_| Ok(MoneyUnitValue { unit: Some("JPY") })
+    );
+    b.rule_1_terminal("INR",
+                      b.reg(r#"rupias?"#)?,
+                      |_| Ok(MoneyUnitValue { unit: Some("INR") })
+    );
     b.rule_1_terminal("cent",
                       b.reg(r#"centavos?"#)?,
                       |_| Ok(MoneyUnitValue { unit: Some("cent") })
@@ -428,8 +436,8 @@ pub fn rules_time(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
              |_, integer| helpers::year(integer.value().value as i32)
     );
     b.rule_1_terminal("day of month (1st)",
-                      b.reg(r#"primero|uno|prem\.?|1o"#)?,
-                      |_| helpers::day_of_month(1)
+             b.reg(r#"el primero|uno|prem\.?|1o"#)?,
+             |_| helpers::day_of_month(1)
     );
     b.rule_2("el <day-of-month> (non ordinal)",
              b.reg(r#"el"#)?,
@@ -759,6 +767,11 @@ pub fn rules_time(b: &mut RuleSetBuilder<Dimension>) -> RustlingResult<()> {
              duration_check!(),
              |_, duration| helpers::cycle_nth(Grain::Second, 0)?.span_to(&duration.value().in_present()?, false)
     );
+    b.rule_2("during <duration>",
+             b.reg(r#"durante"#)?,
+             duration_check!(),
+             |_, duration| Ok(duration.value().clone().prefixed())
+    );
     Ok(())
 }
 

grammar/es/src/training.rs

@@ -21,8 +21,8 @@ pub fn examples_time(v: &mut Vec<::rustling::train::Example<Dimension>>) {
     example!(v, check_moment!(c, [2013, 2, 14]), "pasado mañana");
     example!(v, check_moment!(c, [2013, 2, 18]), "lunes", "lu", "lun.", "este lunes");
     example!(v, check_moment!(c, [2013, 2, 18]), "lunes, 18 de febrero");
-    example!(v, check_moment!(c, [2013, 2, 19]), "martes", "ma", "ma.");
     example!(v, check_moment!(c, [2013, 2, 13]), "miercoles", "miércoles", "mx", "mié.");
+    example!(v, check_moment!(c, [2013, 2, 19]), "martes", "ma", "ma.");
     example!(v, check_moment!(c, [2013, 2, 14]), "jueves");
     example!(v, check_moment!(c, [2013, 2, 15]), "viernes");
     example!(v, check_moment!(c, [2013, 2, 16]), "sabado");
@@ -33,7 +33,7 @@ pub fn examples_time(v: &mut Vec<::rustling::train::Example<Dimension>>) {
     example!(v, check_moment!(c, [2013, 7, 4]), "el 4 de julio", "el 4/7");
     example!(v, check_moment!(c, [2013, 3, 3]), "el 3 de marzo", "3 de marzo", "el 3-3");
     example!(v, check_moment!(c, [2013, 4, 5]), "el 5 de abril", "5 de abril");
-    example!(v, check_moment!(c, [2013, 3, 1]), "el 1 de marzo", "1 de marzo", "el primero de marzo", "el uno de marzo", "primero de marzo", "uno de marzo");
+    example!(v, check_moment!(c, [2013, 3, 1]), "el 1 de marzo", "1 de marzo", "el primero de marzo", "el uno de marzo", "uno de marzo");
     example!(v, check_moment!(c, [2013, 3, 1]), "1-3-2013", "1.3.2013", "1/3/2013");
     example!(v, check_moment!(c, [2013, 2, 16]), "el 16", "16 de febrero");
     example!(v, check_moment!(c, [2013, 2, 17]), "el 17", "17 de febrero", "17-2", "el 17/2");

grammar/it/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "rustling-ontology-it"
+version = "0.17.4"
+authors = ["hdlj <[email protected]>"]
+
+[dependencies]
+rustling = { git="https://github.com/snipsco/rustling", tag="0.9.0" }
+rustling-ontology-moment = { path="../../moment"}
+rustling-ontology-values = { path="../../values"}

grammar/it/src/lib.rs

@@ -0,0 +1,59 @@
+extern crate rustling;
+#[macro_use]
+extern crate rustling_ontology_values;
+extern crate rustling_ontology_moment;
+
+mod rules;
+mod training;
+
+use rustling_ontology_values::DimensionKind::*;
+
+pub fn rule_set() -> ::rustling::RustlingResult<::rustling::RuleSet<rustling_ontology_values::Dimension>> {
+    let mut b = ::rustling::RuleSetBuilder::new(
+                    ::rustling::BoundariesChecker::detailed(),
+                    ::rustling::BoundariesChecker::separated_alphanumeric_word());
+    rules::rules_numbers(&mut b)?;
+    rules::rules_time(&mut b)?;
+    rules::rules_cycle(&mut b)?;
+    rules::rules_duration(&mut b)?;
+    rules::rules_temperature(&mut b)?;
+    rules::rules_finance(&mut b)?;
+    rules::rules_percentage(&mut b)?;
+    Ok(b.build())
+}
+
+pub fn dims() -> Vec<rustling_ontology_values::DimensionKind> {
+    return vec![Number, Ordinal, Duration, Time, Temperature, AmountOfMoney, Percentage];
+}
+
+pub fn examples() -> Vec<::rustling::train::Example<rustling_ontology_values::Dimension>> {
+    let mut v = vec![];
+    training::examples_numbers(&mut v);
+    training::examples_time(&mut v);
+    training::examples_finance(&mut v);
+    v
+}
+
+#[cfg(test)]
+mod test {
+    use rustling::*;
+    use rustling_ontology_values::dimension::Dimension;
+    
+    use super::*;
+    fn assert_examples(rules: &RuleSet<Dimension>, examples: Vec<Example<Dimension>>) {
+        for ex in examples.iter() {
+            let stash = rules.apply_all(&ex.text.to_lowercase()).unwrap();
+            let correct_results = stash
+                        .into_iter()
+                        .filter(|candidate| candidate.root_node.byte_range == Range(0, ex.text.len()) && ex.predicate.check(&candidate))
+                        .collect::<Vec<_>>();
+            assert!(!correct_results.is_empty(), format!("No full match found for: {:?}", ex.text));
+        }
+    }
+    #[test]
+    fn test_examples() {
+        let rules = rule_set().unwrap();
+        let examples = examples();
+        assert_examples(&rules, examples);
+    }
+}