fit_kit 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f5d819105551844f5a7e45a8399aa60b403cbc5b8b2adb278c0fb9a8a29631c
-  data.tar.gz: 1a55ae0af1a09860935dc3dee596a191c42133ae2a070c7c788514e4b4694248
+  metadata.gz: 3fb71b8237876ebc05273a7cb9c78306424ad04ba4c1505f8bc70781cf2c35c2
+  data.tar.gz: 5ac086bb3a7b95729c74ad69c6818495ef3111b0cbf062b3f0beca072bcd53ff
 SHA512:
-  metadata.gz: 46cd84be49270a1197f815f776cc51627ba58d7abf72d8f0f4b6d80cb9f485ceca1a73745eb62df2696fe2a0cd3b78e2311550bf3f711dfcaf133daeed3abf1e
-  data.tar.gz: 32993953f6611a2ad85a70426be7525bb558e3cdf201e994e6848d04ab29f8ebdee3e1d722ac432173f05e799196f47a8f38e3d73c6f151c7de83497cdfa3463
+  metadata.gz: f56f45e3911e4ba9cfab9bf1acb57b53f58e06cf3abae892dc3ad5f58d48c10ba8ec54a895056e0612295b32815db838ccb7f01428d9558aeac190fd6ca3ba6a
+  data.tar.gz: 4544ae74e7bc2510f4bcff6826ecc08850e9c01f6bdf0c6e7f95873c2e80753989bbc471855cfd72f6293946016d682223d33e64816310fe517b38ee1b4c7d4c

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## [Unreleased]
+## [0.3.0] - 2024-10-16
+
+- Simplify to return hash for the parsing
+
+## [0.2.0] - 2024-10-15
+
+- Simplify to return hash fileds for records
 
 ## [0.1.0] - 2024-10-14
 

data/Cargo.lock

@@ -41,7 +41,7 @@ dependencies = [
  "bitflags",
  "cexpr",
  "clang-sys",
- "itertools",
+ "itertools 0.12.1",
  "lazy_static",
  "lazycell",
  "proc-macro2",
@@ -131,6 +131,7 @@ name = "fit_kit"
 version = "0.1.0"
 dependencies = [
  "fitparser",
+ "itertools 0.13.0",
  "magnus",
 ]
 
@@ -183,6 +184,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.72"

data/README.md

@@ -17,7 +17,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ```ruby
 test_fit_file = File.join(Dir.pwd, "example.fit")
 fit_data_records = ::FitKit.parse_fit_file(test_fit_file)
-# [RFitDataRecord, RFitDataRecord, RFitDataRecord ...]
+# { record: [{...}, {...}], session: [{...}], lap: [..], activity: [...] }
 ```
 
 ## Performance

data/ext/fit_kit/Cargo.toml

@@ -11,4 +11,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 fitparser = "0.7.0"
+itertools = "0.13.0"
 magnus = { version = "0.6.2" }

data/ext/fit_kit/src/lib.rs

@@ -1,5 +1,6 @@
 use fitparser::{self, FitDataRecord, Value};
-use magnus::{function, method, prelude::*, Error, IntoValue, RArray, RHash, Ruby, Symbol};
+use itertools::Itertools;
+use magnus::{function, prelude::*, Error, IntoValue, RArray, RHash, Ruby, Symbol};
 use std::fs::File;
 
 // recursive method to turn Fit value into magnus::Value
@@ -33,43 +34,22 @@ fn value_to_rb_value(value: &Value) -> magnus::Value {
     }
 }
 
-///////////////////////// RFitDataRecord ///////////////////////////
-#[magnus::wrap(class = "RFitDataRecord")]
-struct RFitDataRecord(FitDataRecord);
-
-impl RFitDataRecord {
-    fn kind(&self) -> String {
-        self.0.kind().to_string()
-    }
-
-    fn fields_hash(&self) -> RHash {
-        let hash = RHash::new();
-        for field in self.0.fields() {
-            let value = value_to_rb_value(field.value());
-            let pair = RHash::new();
-            pair.aset(Symbol::new("units"), field.units()).unwrap();
-            pair.aset(Symbol::new("value"), value).unwrap();
-            // here we add the stuff to the hash
-            let field_name_symbol = Symbol::new(field.name());
-            hash.aset(field_name_symbol, pair).unwrap();
-        }
-
-        hash
+fn get_fields_hash(record: &FitDataRecord) -> RHash {
+    let hash = RHash::new();
+    for field in record.fields() {
+        let value = value_to_rb_value(field.value());
+        let pair = RHash::new();
+        pair.aset(Symbol::new("units"), field.units()).unwrap();
+        pair.aset(Symbol::new("value"), value).unwrap();
+        // here we add the stuff to the hash
+        let field_name_symbol = Symbol::new(field.name());
+        hash.aset(field_name_symbol, pair).unwrap();
     }
-}
-
-// Here we define two ruby classes
-// RFitDataRecord and RFitDataField
-fn define_ruby_classes(ruby: &Ruby) -> Result<(), magnus::Error> {
-    // definie the the other one here
-    let data_record_class = ruby.define_class("RFitDataRecord", ruby.class_object())?;
-    data_record_class.define_method("kind", method!(RFitDataRecord::kind, 0))?;
-    data_record_class.define_method("fields_hash", method!(RFitDataRecord::fields_hash, 0))?;
 
-    Ok(())
+    hash
 }
 
-fn parse_fit_file(file_path: String) -> Result<RArray, magnus::Error> {
+fn parse_fit_file(file_path: String) -> Result<RHash, magnus::Error> {
     let mut fp = File::open(file_path)
         .map_err(|e| Error::new(Ruby::get().unwrap().exception_io_error(), e.to_string()))?;
     let data = fitparser::from_reader(&mut fp).map_err(|e| {
@@ -79,19 +59,30 @@ fn parse_fit_file(file_path: String) -> Result<RArray, magnus::Error> {
         )
     })?;
 
-    // finally we have the result array of record
-    let array = RArray::new();
-    for record in data {
-        array.push(RFitDataRecord(record)).unwrap();
+    // now let's group by the record by kind
+    let result_hash = RHash::new();
+    for (kind, kind_records) in data
+        .iter()
+        .chunk_by(|record| record.kind().to_string())
+        .into_iter()
+    {
+        // turn records into rarray
+        let array = RArray::new();
+        for record in kind_records {
+            // TODO here do not pass RFitDataRecord
+            // turn it into fields_hash directly
+            array.push(get_fields_hash(record)).unwrap();
+        }
+
+        result_hash.aset(Symbol::new(kind), array).unwrap();
     }
 
-    Ok(array)
+    Ok(result_hash)
 }
 
 #[magnus::init]
 fn init(ruby: &Ruby) -> Result<(), Error> {
     let module = ruby.define_module("FitKit")?;
-    let _ = define_ruby_classes(&ruby);
 
     module.define_singleton_method("parse_fit_file", function!(parse_fit_file, 1))?;
 

data/lib/fit_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FitKit
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fit_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - 29decibel