Compare commits

..

No commits in common. "main" and "czv-v0.0.2" have entirely different histories.

12 changed files with 18 additions and 66 deletions

1
.github/FUNDING.yml vendored Normal file
View file

@ -0,0 +1 @@
github: [rzmk]

View file

@ -5,7 +5,7 @@ czv includes libraries for Rust, Python, and WebAssembly (JavaScript and TypeScr
## Links
- czv GitHub repository: <https://github.com/rzmk/czv>
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv)) ([docs](https://docs.rs/czv))
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv))
- WebAssembly (JavaScript/TypeScript): [npmjs.com/package/czv-wasm](https://www.npmjs.com/package/czv-wasm) ([source code](https://github.com/rzmk/czv/tree/main/czv-wasm))
- Python: [pypi.org/project/czv](https://pypi.org/project/czv/) ([source code](https://github.com/rzmk/czv/tree/main/czv-python))
@ -29,11 +29,8 @@ apple,2.50
banana,3.00
strawberry,1.50
";
let output: usize = RowCount::new()
.file_data(data)
.include_header_row(true)
.execute()?;
println!("{output}"); // 4
let output: usize = RowCount::new().file_data(data).execute()?;
println!("{output}"); // 3
Ok(())
}
```

View file

@ -5,7 +5,7 @@ Python library for [czv](https://github.com/rzmk/czv). czv is a library of CSV-r
## Links
- czv GitHub repository: <https://github.com/rzmk/czv>
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv)) ([docs](https://docs.rs/czv))
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv))
- WebAssembly (JavaScript/TypeScript): [npmjs.com/package/czv-wasm](https://www.npmjs.com/package/czv-wasm) ([source code](https://github.com/rzmk/czv/tree/main/czv-wasm))
- Python: [pypi.org/project/czv](https://pypi.org/project/czv/) ([source code](https://github.com/rzmk/czv/tree/main/czv-python))

View file

@ -27,7 +27,7 @@ print(output) # 4
## Links
- czv GitHub repository: <https://github.com/rzmk/czv>
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv)) ([docs](https://docs.rs/czv))
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv))
- WebAssembly (JavaScript/TypeScript): [npmjs.com/package/czv-wasm](https://www.npmjs.com/package/czv-wasm) ([source code](https://github.com/rzmk/czv/tree/main/czv-wasm))
- Python: [pypi.org/project/czv](https://pypi.org/project/czv/) ([source code](https://github.com/rzmk/czv/tree/main/czv-python))

View file

@ -2,12 +2,12 @@ import czv
import pytest
from .test_data import test_data
class TestRowCount:
class TestCountFunc:
@pytest.mark.parametrize(
"file_name,expected",
[("fruits.csv", 3), ("constituents_altnames.csv", 33971)],
)
def test_row_count(self, file_name, expected):
def test_count(self, file_name, expected):
"""Count the total number of non-header rows."""
result = czv.row_count(file_path=test_data[file_name])
@ -17,19 +17,8 @@ class TestRowCount:
"file_name,expected",
[("fruits.csv", 4), ("constituents_altnames.csv", 33972)],
)
def test_row_count_include_header_row(self, file_name, expected):
def test_include_header_row(self, file_name, expected):
"""Count the total number of rows including the header row."""
result = czv.row_count(file_path=test_data[file_name], include_header_row=True)
assert result == expected
class TestColumnCount:
@pytest.mark.parametrize(
"file_name,expected",
[("fruits.csv", 2), ("constituents_altnames.csv", 6)],
)
def test_column_count(self, file_name, expected):
"""Count the total number of columns."""
result = czv.column_count(file_path=test_data[file_name])
assert result == expected

View file

@ -5,7 +5,7 @@ WebAssembly (JavaScript and TypeScript) library for [czv](https://github.com/rzm
## Links
- czv GitHub repository: <https://github.com/rzmk/czv>
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv)) ([docs](https://docs.rs/czv))
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv))
- WebAssembly (JavaScript/TypeScript): [npmjs.com/package/czv-wasm](https://www.npmjs.com/package/czv-wasm) ([source code](https://github.com/rzmk/czv/tree/main/czv-wasm))
- Python: [pypi.org/project/czv](https://pypi.org/project/czv/) ([source code](https://github.com/rzmk/czv/tree/main/czv-python))

View file

@ -1,5 +1,3 @@
// See the README.md file in this file's folder
// for how to run this example
import czv from "../../pkg/czv-ts";
const options: czv.RowCountOptions = {
@ -7,7 +5,6 @@ const options: czv.RowCountOptions = {
apple,2.50
banana,3.00
strawberry,1.50`,
include_header_row: true
};
const output: number = czv.rowCount(options);

View file

@ -29,7 +29,7 @@
//! # Links
//!
//! - czv GitHub repository: <https://github.com/rzmk/czv>
//! - Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv)) ([docs](https://docs.rs/czv))
//! - Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv))
//! - WebAssembly (JavaScript/TypeScript): [npmjs.com/package/czv-wasm](https://www.npmjs.com/package/czv-wasm) ([source code](https://github.com/rzmk/czv/tree/main/czv-wasm))
//! - Python: [pypi.org/project/czv](https://pypi.org/project/czv/) ([source code](https://github.com/rzmk/czv/tree/main/czv-python))

View file

@ -1,12 +1,12 @@
use czv_wasm;
use czv_wasm::count::{ColumnCountOptions, RowCountOptions};
use czv_wasm::count::RowCountOptions;
use czv_wasm::Result;
use wasm_bindgen_test::*;
wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
#[test]
#[wasm_bindgen_test]
fn row_count_nonheader() -> Result<()> {
fn basic() -> Result<()> {
let options = RowCountOptions {
file_data: "fruit,price
apple,2.00
@ -19,34 +19,3 @@ strawberry,3.00"
assert_eq!(result, 3);
Ok(())
}
#[test]
#[wasm_bindgen_test]
fn row_count_header() -> Result<()> {
let options = RowCountOptions {
file_data: "fruit,price
apple,2.00
banana,1.50
strawberry,3.00"
.to_string(),
include_header_row: Some(true),
};
let result = czv_wasm::count::row_count(options)?;
assert_eq!(result, 4);
Ok(())
}
#[test]
#[wasm_bindgen_test]
fn column_count() -> Result<()> {
let options = ColumnCountOptions {
file_data: "fruit,price
apple,2.00
banana,1.50
strawberry,3.00"
.to_string(),
};
let result = czv_wasm::count::column_count(options)?;
assert_eq!(result, 2);
Ok(())
}

View file

@ -5,7 +5,7 @@ Rust library for [czv](https://github.com/rzmk/czv). czv is a library of CSV-rel
## Links
- czv GitHub repository: <https://github.com/rzmk/czv>
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv)) ([docs](https://docs.rs/czv))
- Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv))
- WebAssembly (JavaScript/TypeScript): [npmjs.com/package/czv-wasm](https://www.npmjs.com/package/czv-wasm) ([source code](https://github.com/rzmk/czv/tree/main/czv-wasm))
- Python: [pypi.org/project/czv](https://pypi.org/project/czv/) ([source code](https://github.com/rzmk/czv/tree/main/czv-python))
@ -67,9 +67,9 @@ For benchmarks we use [criterion.rs](https://github.com/bheisler/criterion.rs).
Licensed under either of
- Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0)
([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- MIT license
(http://opensource.org/licenses/MIT)
([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
at your option.

View file

@ -207,7 +207,6 @@ impl<
__file_path: typed_builder::Optional<Option<PathBuf>>,
> ColumnCountBuilder<(__file_path, __file_data)>
{
/// Returns the column count.
pub fn execute(self) -> Result<usize> {
let builder = self.__build();
column_count(builder.file_path, builder.file_data)

View file

@ -33,7 +33,7 @@
//! # Links
//!
//! - czv GitHub repository: <https://github.com/rzmk/czv>
//! - Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv)) ([docs](https://docs.rs/czv))
//! - Rust: [crates.io/crates/czv](https://crates.io/crates/czv) ([source code](https://github.com/rzmk/czv/tree/main/czv))
//! - WebAssembly (JavaScript/TypeScript): [npmjs.com/package/czv-wasm](https://www.npmjs.com/package/czv-wasm) ([source code](https://github.com/rzmk/czv/tree/main/czv-wasm))
//! - Python: [pypi.org/project/czv](https://pypi.org/project/czv/) ([source code](https://github.com/rzmk/czv/tree/main/czv-python))
@ -41,7 +41,7 @@
pub mod count;
#[doc(inline)]
pub use count::{ColumnCount, RowCount};
// Extract a section of rows.
/// Extract a section of rows.
// pub mod slice;
// #[doc(inline)]
// pub use slice::Slice;