tracklib 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68676def9094079585d07e179b44341858d12436
-  data.tar.gz: 877b9c338a1a866823d6349af0a76e08c7a93fde
+  metadata.gz: 51bc0c50cee5c08e2a0ab5a48e5a9d4cd00f4db1
+  data.tar.gz: 496ec85199832aa9cd953d0ef621a5508d03bef0
 SHA512:
-  metadata.gz: f42ff219e7fe4684925c87564e1537d75b079a651a5efb4c3bc1db4f7194853abcd58e4177d16324799eff1470451cc3b5b9082712199bd7ad6a22da05d8ddf5
-  data.tar.gz: 0a2e7d5eb20ab58ffdb7939bf711186100b492d478142e496d98ade5408f7b5344adad55c34862ef89119a529eb0cd4c717f9c4a8e842213d7baa623d054cc81
+  metadata.gz: 9ebff64b608756ac55476fc9661249419e746539753e5bcde585f546b08e9a665bb492118b1b2d882670769456b23d80b719952f67b3efcf591b7c49950bcf81
+  data.tar.gz: e0cdf446ca0fc4f386f186bb4655509a58a4d43e5e41ca9e43f2c8183afdd1d962eeb457bbb5f88dcfa9dcab7165bed896b85e67ed22fb0de7489890bc9da173

data/Rakefile

@@ -1,29 +1,16 @@
+# coding: utf-8
 require "rbconfig"
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "thermite/tasks"
+require 'rspec/core/rake_task'
 
 thermite = Thermite::Tasks.new
+RSpec::Core::RakeTask.new(:spec)
 
-desc 'Build Rust extension'
-task :build_lib do
-  case RbConfig::CONFIG['host_os']
-  when /darwin|mac os/
-    sh 'NO_LINK_RUTIE=y cargo rustc --release -- -C link-args=-Wl,-undefined,dynamic_lookup'
-  else
-    sh 'NO_LINK_RUTIE=y cargo build --release'
-  end
-end
-
-desc 'bundle install'
-task :bundle_install do
-  sh 'bundle install'
-end
+desc 'Run Rust & Ruby testsuites'
+task test: ['thermite:build', 'thermite:test', 'spec'] do
 
-Rake::TestTask.new(test: [:bundle_install, :build_lib]) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task :default => :test

data/lib/tracklib/version.rb

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

data/src/lib.rs

@@ -85,6 +85,30 @@ fn convert_config(config: Hash) -> HashMap<String, String> {
     hm
 }
 
+fn is_empty_string(v: &AnyObject) -> bool {
+    match v.try_convert_to::<RString>() {
+        Ok(s) => s.to_str().is_empty(),
+        Err(_) => false
+    }
+}
+
+fn is_empty_array(v: &AnyObject) -> bool {
+    match v.try_convert_to::<Array>() {
+        Ok(a) => a.length() == 0,
+        Err(_) => false
+    }
+}
+
+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 add_points(points: Array, mut callback: impl FnMut(usize, &str, AnyObject)) {
     for (i, maybe_point) in points.into_iter().enumerate() {
         let point = maybe_point
@@ -98,43 +122,13 @@ fn add_points(points: Array, mut callback: impl FnMut(usize, &str, AnyObject)) {
                 .map_err(|e| VM::raise_ex(e))
                 .unwrap();
             let name = field_name_obj.to_str();
-            let mut store_field = true;
-
-            if v.is_nil() {
-                store_field = false;
-            }
-
-            if name.is_empty() {
-                store_field = false;
-            }
-
-            match v.try_convert_to::<RString>() {
-                Ok(s) => if s.to_str().is_empty() {
-                    store_field = false;
-                }
-                Err(_) => {}
-            }
-
-            match v.try_convert_to::<Array>() {
-                Ok(a) => if a.length() == 0 {
-                    store_field = false;
-                }
-                Err(_) => {}
-            }
-
-            match v.try_convert_to::<Integer>() {
-                Ok(i) => if i.to_i64().abs() > 2i64.pow(48) {
-                    store_field = false;
-                }
-                Err(_) => match v.try_convert_to::<Float>() {
-                    Ok(f) => if f.to_f64().abs() > 2f64.powi(48) {
-                        store_field = false;
-                    }
-                    Err(_) => {}
-                }
-            }
 
-            if store_field {
+            if !v.is_nil()
+                && !name.is_empty()
+                && !is_empty_string(&v)
+                && !is_empty_array(&v)
+                && !is_number_too_large(&v)
+            {
                 callback(i, name, v);
             }
         });

data/tracklib.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/Rakefile"]
 
-  spec.add_development_dependency "minitest", "~> 5.11"
+  spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency "rake", "~> 12.3"
   spec.add_runtime_dependency 'thermite', '~> 0.13'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tracklib
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Dan Larkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement