Merge branch 'alpha'

Author: crumplecup

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.1.7] - 2025-04-07
+## [0.1.8] - 2025-04-14
 
 ### 🚀 Features
 
@@ -12,10 +12,14 @@ All notable changes to this project will be documented in this file.
 - Added the `Channel` enum to represent valid keys for the Channel parameter of the IntlServSTA dataset.
 - Added the `IipIndustry` enum to represent valid keys for the Industry parameter of the IntlServSTA dataset.
 - Added the `NaicsSector`, `NaicsSubsector` and `NaicsCategory` enums to represent different levels of NAICS code categories.
+- The NaicsSector::from_key method is now NaicsSector::from_code.
+- Added the `NaicsSubcategory` type to represent Naics industry codes with a length of five digits.
 
 ### 🐛 Bug Fixes
 
 - Explicit version numbers added to workspace members.
+- NaicsSubcategory variants and method values corrected in response to unit testing.
+- `NaicsCategory` variants and methods corrected in response to unit testing.
 
 ### 🚜 Refactor
 
@@ -29,6 +33,10 @@ All notable changes to this project will be documented in this file.
 - ApiMetada moved to the key_sets module of the bears_species crate.
 - InputOutput key set moved to the key_sets module of the bears_ecology crate.
 - `IntlServSta`, `IntlServTrade` and `Regional` key sets moved to the key_sets module of the bears_species crate.
+- Naics.rs and naics_codes.csv removed.
+- Naics codes by classification added to the `cave` directory of `bears_health`.
+- NaicsItem moved to the `keys` module of `bears_species`.
+- Data module updated to use the new name for NaicsItems.
 
 ### 📚 Documentation
 
@@ -38,13 +46,18 @@ All notable changes to this project will be documented in this file.
 
 - Unused tests for json removed.
 - Tests added for `Component` and `AocSta` types validating enum variants against the BEA response.
+- Verification testings for Naics types added validating variant names, description and codes against the .csv files in the cave.
 
 ### ⚙️ Miscellaneous Tasks
 
 - Version incremented to 0.1.7.
 - Patch update to the `clap` dependency.
 - Unused json and validate modules removed.
 - Patch update to the `tokio` dependency.
+- Increment version to 0.1.8.
+- Rust fmt changes.
+- Naics types added to mod and lib files.
+- Clippy corrected `manual implementation of ok` corrected to use the ok method.
 
 ## [0.1.6] - 2025-03-31
 
@@ -122,32 +135,52 @@ All notable changes to this project will be documented in this file.
 
 ### 🚀 Features
 
+- Methods `initial_load`, `initial_load_continued`, `retry_load` and `download_with_history` added to the `Dataset` type.
+- Method variants for `with_events` added to the Queue and History types to facilitate benchmarking.
+- GdpDatum type added to represent return values for the `Dataset::GDPbyIndustry` variant.
+- Download support added to GdpByIndustry via the GdpByIndustryIterator type.
 - 'Style' type added to facilitate progress bars drawn to the console.
 - Method `from_value` added to `Frequency` to provide a canonical means of interpreting BEA parameter values.
 - Added the `roman_numeral_quarter` function mapping Roman Numeral values in the `Quarter` field to the `jiff::civil::Date` type.
 - `GdpData` type added for the GDPbyIndustry dataset.  Companion variant `Data::GdpData` added.
 - Progress bar added to `Queue` file loading.
 - Progress bars added to `History` load and download methods.
 
+### 🐛 Bug Fixes
+
+- Note variant added to the Addendum type.
+- The MneError type now recognizes multiple error codes returned in an array.
+- The size limiting check no longer prevents users from requesting files larger than the 100MB limit.
+- Logical bug patched in the impl for `Chunks` from `History`.  The inner vector will now include the final `Chunk`.
+- Off-by-one logical error fixed for generating frequency parameters from a list.
+
 ### 🚜 Refactor
 
+- The Error cap has been raised to 29, and the Call cap to 89, since size tracking is now enabled.
+- The History::contains method has been removed in favor of calling `contains_key` directly on the inner BTreeMap.
+- Streamlined error handling for JsonParseError variants.
 - Various console logs lowered from Info to Trace, now that the functions of interest are more stable.
 - `MneDiData` and `FixedAssetsData` added to the root namespace following the library convention.
 
 ### 📚 Documentation
 
+- Method descriptions added to the `dataset` module.
+- Descriptions added for `History` methods.
 - Description added for the `roman_numeral_quarter` function.
 - Descriptions added to `Frequency` methods.
 - Module and function level descriptions added the `check` module.
 - Progress statistics updated in the root `README.md`.
 
 ### 🧪 Testing
 
+- Coverage added for the `History` methods `initial_load`, `initial_load_continued`, `retry_load` and `download_with_history`.
+- Benchmarking added to the `with_event` family of methods for the Queue and Chunks types.
 - Additional troubleshooting tests added for loading GDPbyIndustry files.
 - Duplicate test removed.
 
 ### ⚙️ Miscellaneous Tasks
 
+- Increment version to 0.1.3 in Cargo.toml.
 - Changelog updated for version 0.1.3.
 - Version incremented to 0.1.4 in Cargo.toml.
 - Changelog action added to justfile.
@@ -158,43 +191,6 @@ All notable changes to this project will be documented in this file.
 - Deletion of dead legacy code.
 - Changelog updated for version 0.1.4.
 
-## [0.1.3] - 2025-03-03
-
-### 🚀 Features
-
-- Methods `initial_load`, `initial_load_continued`, `retry_load` and `download_with_history` added to the `Dataset` type.
-- Method variants for `with_events` added to the Queue and History types to facilitate benchmarking.
-- GdpDatum type added to represent return values for the `Dataset::GDPbyIndustry` variant.
-- Download support added to GdpByIndustry via the GdpByIndustryIterator type.
-
-### 🐛 Bug Fixes
-
-- Note variant added to the Addendum type.
-- The MneError type now recognizes multiple error codes returned in an array.
-- The size limiting check no longer prevents users from requesting files larger than the 100MB limit.
-- Logical bug patched in the impl for `Chunks` from `History`.  The inner vector will now include the final `Chunk`.
-- Off-by-one logical error fixed for generating frequency parameters from a list.
-
-### 🚜 Refactor
-
-- The Error cap has been raised to 29, and the Call cap to 89, since size tracking is now enabled.
-- The History::contains method has been removed in favor of calling `contains_key` directly on the inner BTreeMap.
-- Streamlined error handling for JsonParseError variants.
-
-### 📚 Documentation
-
-- Method descriptions added to the `dataset` module.
-- Descriptions added for `History` methods.
-
-### 🧪 Testing
-
-- Coverage added for the `History` methods `initial_load`, `initial_load_continued`, `retry_load` and `download_with_history`.
-- Benchmarking added to the `with_event` family of methods for the Queue and Chunks types.
-
-### ⚙️ Miscellaneous Tasks
-
-- Increment version to 0.1.3 in Cargo.toml.
-
 ## [0.1.2] - 2025-02-23
 
 ### 🐛 Bug Fixes

Cargo.lock

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["bears_ecology", "bears_health", "bears", "bears_species"]
 
 [workspace.package]
-version = "0.1.7"
+version = "0.1.8"
 edition = "2024"
 authors = ["Erik Rose <erik.w.rose@gmail.com>"]
 description = "A Rust wrapper for the Bureau of Economic Analysis (BEA) REST API."
@@ -14,13 +14,13 @@ keywords = ["economics", "finance", "rest"]
 categories = ["asynchronous", "finance"]
 
 [workspace.dependencies]
-bears_ecology = { version = "0.1.7", path = "./bears_ecology" }
-bears_health = { version = "0.1.7", path = "./bears_health" }
-bears = { version = "0.1.7", path = "./bears" }
-bears_species = { version = "0.1.7", path = "./bears_species" }
+bears_ecology = { version = "0.1.8", path = "./bears_ecology" }
+bears_health = { version = "0.1.8", path = "./bears_health" }
+bears = { version = "0.1.8", path = "./bears" }
+bears_species = { version = "0.1.8", path = "./bears_species" }
 assert-json-diff = "2.0.2"
 bytesize = { version = "2.0.1", features = ["serde"] }
-clap = { version = "4.5.35", features = ["derive"] }
+clap = { version = "4.5.36", features = ["derive"] }
 console = "0.15.11"
 convert_case = "0.8.0"
 csv = "1.3.1"
@@ -30,7 +30,7 @@ derive_more = { version = "2.0.1", features = ["full"] }
 derive_setters = "0.1.6"
 dotenvy = "0.15.7"
 indicatif = { version = "0.17.11", features = ["rayon", "tokio"] }
-jiff = { version = "0.2.5", features = ["serde"] }
+jiff = { version = "0.2.8", features = ["serde"] }
 nom = "8.0.0"
 rayon = "1.10.0"
 reqwest = { version = "0.12.15", features = ["json"] }

Cargo.toml

@@ -1,5 +1,5 @@
-use nom::character::complete::alphanumeric1;
 use nom::IResult;
+use nom::character::complete::alphanumeric1;
 
 /// Variants of the `Action` enum encapsulate the different actions a user can select, exposing the
 /// different capabilities of the library.

bears/src/command.rs

@@ -1,4 +1,4 @@
-use crate::{bea_data, Options, ParameterKind};
+use crate::{Options, ParameterKind, bea_data};
 use bears_species::{
     BTreeKeyMissing, BeaErr, BeaResponse, Dataset, DeriveFromStr, IoError, JsonParseError,
     JsonParseErrorKind, KeyMissing, Method, MillionsOptions, ParameterName, RateLimit,

bears_ecology/src/app.rs

@@ -1,6 +1,6 @@
 use crate::{App, Options};
 use bears_species::{BeaErr, EnvError, IoError, UrlParseError};
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, Layer};
+use tracing_subscriber::{Layer, layer::SubscriberExt, util::SubscriberInitExt};
 
 pub fn bea_data() -> Result<std::path::PathBuf, EnvError> {
     let key = "BEA_DATA".to_string();

bears_ecology/src/free.rs

@@ -1,4 +1,4 @@
-use crate::{bea_data, App, Event, Mode, Queue, ResultStatus};
+use crate::{App, Event, Mode, Queue, ResultStatus, bea_data};
 use bears_species::{BeaErr, Data, Dataset, IoError, SerdeJson};
 use indicatif::{ParallelProgressIterator, ProgressIterator};
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};

bears_ecology/src/history.rs

@@ -14,8 +14,7 @@ pub use history::{Chunk, Chunks, History};
 pub use progress::Style;
 pub use queue::{Mode, Queue};
 pub use request::{
-    download_with_history, get_datasets, init_queue, initial_download, initial_load,
+    Request, download_with_history, get_datasets, init_queue, initial_download, initial_load,
     parameter_values, parameters, retry_load, values, values_gdp, values_subset, values_ugdp,
-    Request,
 };
 pub use tracker::{Event, SizeEvent, Tracker};

bears_ecology/src/lib.rs

@@ -1,4 +1,4 @@
-use crate::{file_size, App, Event, History, ResultStatus, SizeEvent, Tracker};
+use crate::{App, Event, History, ResultStatus, SizeEvent, Tracker, file_size};
 use bears_species::{BeaErr, Data};
 use indicatif::ProgressIterator;
 use rayon::prelude::{IntoParallelRefIterator, IntoParallelRefMutIterator, ParallelIterator};

bears_ecology/src/queue.rs

@@ -1,4 +1,4 @@
-use crate::{bea_data, init, App, History, Mode, Options, Queue};
+use crate::{App, History, Mode, Options, Queue, bea_data, init};
 use bears_species::{
     BeaErr, BeaResponse, Data, Dataset, DatasetMissing, FixedAssets, GdpByIndustry, IoError, Ita,
     Method, Mne, NiUnderlyingDetail, Nipa, ParameterName, ReqwestError, Results, SerdeJson,