tracklib 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51bc0c50cee5c08e2a0ab5a48e5a9d4cd00f4db1
-  data.tar.gz: 496ec85199832aa9cd953d0ef621a5508d03bef0
+  metadata.gz: 544377b466a27f1adc1885db2ae638e9c94e14f3
+  data.tar.gz: f4e80d1783f605692d0045da784e27a011e432ea
 SHA512:
-  metadata.gz: 9ebff64b608756ac55476fc9661249419e746539753e5bcde585f546b08e9a665bb492118b1b2d882670769456b23d80b719952f67b3efcf591b7c49950bcf81
-  data.tar.gz: e0cdf446ca0fc4f386f186bb4655509a58a4d43e5e41ca9e43f2c8183afdd1d962eeb457bbb5f88dcfa9dcab7165bed896b85e67ed22fb0de7489890bc9da173
+  metadata.gz: dd7a4ea44fadb9b2a961fef9ae4c0b811dd1328af6f801074c7440ba1318b0c8a184d0f2e4b9e262cd8e80e11e22b3513a2c4685a4dd2f0f012c878e8270ee42
+  data.tar.gz: 4cbaa1f2ee37375cb050acfb4ee38ebd06becc3c37b52e54e4ba3789ee7ef668f205c88e6fdd7d1546f598fdba4bc91066ba5b09aa051c6c2b0b9cfb0d1852ad

data/Cargo.lock

@@ -120,8 +120,8 @@ version = "0.1.0"
 dependencies = [
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rutie 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rutie-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rutie 0.7.0 (git+https://github.com/danlarkin/rutie)",
+ "rutie-serde 0.1.1 (git+https://github.com/danlarkin/rutie-serde)",
  "tracklib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -132,8 +132,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rutie"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+version = "0.7.0"
+source = "git+https://github.com/danlarkin/rutie#6db74585735ca82894d6163357ee4defdc2cdc61"
 dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -142,10 +142,10 @@ dependencies = [
 [[package]]
 name = "rutie-serde"
 version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/danlarkin/rutie-serde#de14caea6c73cc479438c0c2b27b528d498e77fc"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rutie 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rutie 0.7.0 (git+https://github.com/danlarkin/rutie)",
  "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -241,8 +241,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
-"checksum rutie 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5386200cd74705d2f0f6f5076d833ed26070240dea32b778807af38159900284"
-"checksum rutie-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d43d8aea0107683e12860daed2e0fa7c36702927c181ecd270552c39dcc94b27"
+"checksum rutie 0.7.0 (git+https://github.com/danlarkin/rutie)" = "<none>"
+"checksum rutie-serde 0.1.1 (git+https://github.com/danlarkin/rutie-serde)" = "<none>"
 "checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
 "checksum serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5626ac617da2f2d9c48af5515a21d5a480dbd151e01bb1c355e26a3e68113"
 "checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"

data/Cargo.toml

@@ -5,16 +5,13 @@ authors = ["Dan Larkin <dan@danlarkin.org>"]
 license = "Apache-2.0 OR MIT"
 edition = "2018"
 
-[profile.release]
-lto = false # LTO broke the ruby module in my testing
-
 [lib]
 name = "tracklib"
 crate-type = ["cdylib"]
 
 [dependencies]
 tracklib = "*"
-rutie = "0.5"
-rutie-serde = "0.1"
+rutie = {git="https://github.com/danlarkin/rutie", features=["no-link"]}
+rutie-serde = {git="https://github.com/danlarkin/rutie-serde"}
 lazy_static = "1.3"
 base64 = "0.10"

data/lib/tracklib/version.rb

@@ -1,3 +1,3 @@
 module Tracklib
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/src/lib.rs

@@ -22,10 +22,10 @@ fn any_to_float(o: AnyObject) -> f64 {
 
 fn any_to_int(o: AnyObject) -> i64 {
     match o.try_convert_to::<Integer>() {
-        Ok(f) => f.to_i64(),
-        Err(float_e) => o
+        Ok(i) => i.to_i64(),
+        Err(int_e) => o
             .try_convert_to::<Float>()
-            .map_err(|_| VM::raise_ex(float_e))
+            .map_err(|_| VM::raise_ex(int_e))
             .unwrap()
             .to_f64() as i64,
     }
@@ -59,7 +59,54 @@ fn any_to_ids(o: AnyObject) -> Vec<u64> {
         .collect()
 }
 
-fn convert_config(config: Hash) -> HashMap<String, String> {
+#[derive(Debug, Copy, Clone)]
+enum ColumnType {
+    Numbers,
+    LongFloat,
+    ShortFloat,
+    Base64,
+    String,
+    Bool,
+    IDs,
+}
+
+impl ColumnType {
+    fn from_str(name: &str) -> Option<Self> {
+        match name {
+            "Number"     => Some(ColumnType::Numbers),
+            "LongFloat"  => Some(ColumnType::LongFloat),
+            "ShortFloat" => Some(ColumnType::ShortFloat),
+            "Base64"     => Some(ColumnType::Base64),
+            "String"     => Some(ColumnType::String),
+            "Bool"       => Some(ColumnType::Bool),
+            "IDs"        => Some(ColumnType::IDs),
+            _ => None
+        }
+    }
+
+    fn exponent(&self) -> u8 {
+        match self {
+            ColumnType::Numbers => 48,
+            ColumnType::LongFloat => 24,
+            ColumnType::ShortFloat => 38,
+            _ => {
+                VM::raise(Class::from_existing("Exception"),
+                          &format!("can't handle numeric value for non-numeric field"));
+                unreachable!();
+            }
+        }
+    }
+
+    fn max_integer(&self) -> i64 {
+        2i64.pow(u32::from(self.exponent()))
+    }
+
+    fn max_float(&self) -> f64 {
+        2f64.powi(i32::from(self.exponent()))
+    }
+}
+
+fn convert_config(config: Hash) -> HashMap<String, ColumnType> {
     let mut hm = HashMap::new();
 
     config.each(|rwtf_type_name, array_of_field_names| {
@@ -67,18 +114,26 @@ fn convert_config(config: Hash) -> HashMap<String, String> {
             .try_convert_to::<RString>()
             .map_err(|e| VM::raise_ex(e))
             .unwrap();
-        let array_obj = array_of_field_names
-            .try_convert_to::<Array>()
-            .map_err(|e| VM::raise_ex(e))
-            .unwrap();
+        let type_name_str = type_name_obj.to_str();
 
-        for field_name in array_obj.into_iter() {
-            let field_name_obj = field_name
-                .try_convert_to::<RString>()
+        if let Some(column_type) = ColumnType::from_str(type_name_str) {
+            let array_obj = array_of_field_names
+                .try_convert_to::<Array>()
                 .map_err(|e| VM::raise_ex(e))
                 .unwrap();
 
-            hm.insert(field_name_obj.to_string(), type_name_obj.to_string());
+            for field_name in array_obj.into_iter() {
+                let field_name_obj = field_name
+                    .try_convert_to::<RString>()
+                    .map_err(|e| VM::raise_ex(e))
+                    .unwrap();
+
+                hm.insert(field_name_obj.to_string(), column_type);
+            }
+        } else {
+            VM::raise(Class::from_existing("Exception"),
+                      &format!("unknown rwtf_field_config type: {}", type_name_str));
+            unreachable!();
         }
     });
 
@@ -99,39 +154,98 @@ fn is_empty_array(v: &AnyObject) -> bool {
     }
 }
 
-fn is_number_too_large(v: &AnyObject) -> bool {
-    match v.try_convert_to::<Integer>() {
-        Ok(i) => i.to_i64().abs() > 2i64.pow(48),
-        Err(_) => match v.try_convert_to::<Float>() {
-            Ok(f) => f.to_f64().abs() > 2f64.powi(48),
-            Err(_) => false
+fn is_number_and_too_large(v: &AnyObject, field_type: ColumnType) -> bool {
+    // First we have to try to cast `v` to a numeric type (Integer or Float)
+    // and then call to_i64/f64(). This will raise an exception if the number
+    // is too large to turn into a primitive.
+    let is_number_result = VM::protect(|| {
+        match v.try_convert_to::<Integer>() {
+            Ok(i) => {
+                let _ = i.to_i64(); // force a conversion
+                Boolean::new(true)
+            }
+            Err(_) => match v.try_convert_to::<Float>() {
+                Ok(f) => {
+                    let _ = f.to_f64(); // force a conversion
+                    Boolean::new(true)
+                }
+                Err(_) => Boolean::new(false)
+            }
+        }.to_any_object()
+    });
+
+    match is_number_result {
+        Ok(is_number) => {
+            // Here we know that no exception was raised during the attempted primitive conversion.
+            // We also know that `is_number` is a Boolean, so this unsafe cast is fine.
+            if unsafe { is_number.to::<Boolean>().to_bool() } {
+                match v.try_convert_to::<Integer>() {
+                    Ok(i) => i.to_i64().abs() > field_type.max_integer(),
+                    Err(_) => match v.try_convert_to::<Float>() {
+                        Ok(f) => f.to_f64().abs() > field_type.max_float(),
+                        Err(_) => false
+                    }
+                }
+            } else {
+                false
+            }
+        }
+        Err(_) => {
+            VM::clear_error_info(); // clear ruby VM error register
+            true // this IS a number and it IS too large
         }
     }
 }
 
-fn add_points(points: Array, mut callback: impl FnMut(usize, &str, AnyObject)) {
-    for (i, maybe_point) in points.into_iter().enumerate() {
-        let point = maybe_point
-            .try_convert_to::<Hash>()
-            .map_err(|e| VM::raise_ex(e))
-            .unwrap();
-
-        point.each(|k, v| {
-            let field_name_obj = k
-                .try_convert_to::<RString>()
+fn add_points(source: &Hash,
+              section_points_config: &HashMap<String, ColumnType>,
+              section_type: &str,
+              mut callback: impl FnMut(usize, &str, DataField)) {
+    let maybe_section_points = source
+        .at(&RString::new_utf8(section_type))
+        .try_convert_to::<Array>();
+
+    if let Ok(section_points) = maybe_section_points {
+        for (i, maybe_point) in section_points.into_iter().enumerate() {
+            let point = maybe_point
+                .try_convert_to::<Hash>()
                 .map_err(|e| VM::raise_ex(e))
                 .unwrap();
-            let name = field_name_obj.to_str();
-
-            if !v.is_nil()
-                && !name.is_empty()
-                && !is_empty_string(&v)
-                && !is_empty_array(&v)
-                && !is_number_too_large(&v)
-            {
-                callback(i, name, v);
-            }
-        });
+
+            point.each(|k: AnyObject, v: AnyObject| {
+                let field_name_obj = k
+                    .try_convert_to::<RString>()
+                    .map_err(|e| VM::raise_ex(e))
+                    .unwrap();
+                let name = field_name_obj.to_str();
+
+                if !name.is_empty() {
+                    if let Some(field_type) = section_points_config.get(name) {
+                        if !v.is_nil()
+                            && !is_empty_string(&v)
+                            && !is_empty_array(&v)
+                            && !is_number_and_too_large(&v, *field_type)
+                        {
+                            let data = match field_type {
+                                ColumnType::LongFloat  => DataField::LongFloat(any_to_float(v)),
+                                ColumnType::ShortFloat => DataField::ShortFloat(any_to_float(v)),
+                                ColumnType::Numbers    => DataField::Number(any_to_int(v)),
+                                ColumnType::Base64     => DataField::Base64(any_to_str(v).replace("\n", "")),
+                                ColumnType::String     => DataField::String(any_to_str(v)),
+                                ColumnType::Bool       => DataField::Bool(any_to_bool(v)),
+                                ColumnType::IDs        => DataField::IDs(any_to_ids(v)),
+                            };
+
+                            callback(i, name, data);
+                        }
+                    } else {
+                        VM::raise(Module::from_existing("Tracklib").get_nested_class("UnknownFieldError"),
+                                  &format!("unknown {} field: {}", section_type, name));
+                        unreachable!();
+                    }
+                }
+            });
+        }
     }
 }
 
@@ -223,79 +337,21 @@ methods!(
             RWTFile::new()
         };
 
-        let maybe_track_points = source
-            .at(&RString::new_utf8("track_points"))
-            .try_convert_to::<Array>();
-
-        if let Ok(track_points) = maybe_track_points {
-            add_points(track_points, |i, k, v| {
-                let data = if let Some(field_type) = track_points_config.get(k) {
-                    match field_type.as_str() {
-                        "LongFloat"  => DataField::LongFloat(any_to_float(v)),
-                        "ShortFloat" => DataField::ShortFloat(any_to_float(v)),
-                        "Number"     => DataField::Number(any_to_int(v)),
-                        "Base64"     => DataField::Base64(any_to_str(v).replace("\n", "")),
-                        "String"     => DataField::String(any_to_str(v)),
-                        "Bool"       => DataField::Bool(any_to_bool(v)),
-                        "IDs"        => DataField::IDs(any_to_ids(v)),
-                        _ => {
-                            VM::raise(
-                                Class::from_existing("Exception"),
-                                &format!("unknown track_points type: {}", field_type),
-                            );
-                            unreachable!();
-                        }
-                    }
-                } else {
-                    VM::raise(Module::from_existing("Tracklib").get_nested_class("UnknownFieldError"),
-                              &format!("unknown track_points field: {}", k));
-                    unreachable!();
-                };
-
-                rwtf.add_track_point(i, k, data)
-                    .map_err(|e| {
-                        VM::raise(Class::from_existing("Exception"), &format!("{}", e))
-                    })
-                    .unwrap();
-            });
-        }
-
-        let maybe_course_points = source
-            .at(&RString::new_utf8("course_points"))
-            .try_convert_to::<Array>();
-
-        if let Ok(course_points) = maybe_course_points {
-            add_points(course_points, |i, k, v| {
-                let data = if let Some(field_type) = course_points_config.get(k) {
-                    match field_type.as_str() {
-                        "LongFloat"  => DataField::LongFloat(any_to_float(v)),
-                        "ShortFloat" => DataField::ShortFloat(any_to_float(v)),
-                        "Number"     => DataField::Number(any_to_int(v)),
-                        "Base64"     => DataField::Base64(any_to_str(v).replace("\n", "")),
-                        "String"     => DataField::String(any_to_str(v)),
-                        "Bool"       => DataField::Bool(any_to_bool(v)),
-                        "IDs"        => DataField::IDs(any_to_ids(v)),
-                        _ => {
-                            VM::raise(
-                                Class::from_existing("Exception"),
-                                &format!("unknown course_points type: {}", field_type),
-                            );
-                            unreachable!();
-                        }
-                    }
-                } else {
-                    VM::raise(Module::from_existing("Tracklib").get_nested_class("UnknownFieldError"),
-                              &format!("unknown course_points field: {}", k));
-                    unreachable!();
-                };
+        add_points(&source, &track_points_config, "track_points",  |i, name, data| {
+            rwtf.add_track_point(i, name, data)
+                .map_err(|e| {
+                    VM::raise(Class::from_existing("Exception"), &format!("{}", e))
+                })
+                .unwrap();
+        });
 
-                rwtf.add_course_point(i, k, data)
-                    .map_err(|e| {
-                        VM::raise(Class::from_existing("Exception"), &format!("{}", e))
-                    })
-                    .unwrap();
-            });
-        }
+        add_points(&source, &course_points_config, "course_points",  |i, name, data| {
+            rwtf.add_course_point(i, name, data)
+                .map_err(|e| {
+                    VM::raise(Class::from_existing("Exception"), &format!("{}", e))
+                })
+                .unwrap();
+        });
 
         let inner = Inner { inner: rwtf };
         Class::from_existing("RWTFile").wrap_data(inner, &*INNER_WRAPPER)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracklib
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Dan Larkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec