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.8] - 2025-04-14
+## [0.1.9] - 2025-05-12
 
 ### 🚀 Features
 
@@ -14,12 +14,14 @@ All notable changes to this project will be documented in this file.
 - 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.
+- NaicsIndustry enum added to represent the full six-digit NAICS codes.
 
 ### 🐛 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.
+- Typo corrections in the reference file for NAICS codes.
 
 ### 🚜 Refactor
 
@@ -47,6 +49,8 @@ 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.
+- Check_naics_industry added to check_naics test suite.
+- Check_naics_industry added to check_naics test suite.
 
 ### ⚙️ Miscellaneous Tasks
 
@@ -58,6 +62,10 @@ All notable changes to this project will be documented in this file.
 - Rust fmt changes.
 - Naics types added to mod and lib files.
 - Clippy corrected `manual implementation of ok` corrected to use the ok method.
+- Version incremented to 0.1.9.
+- NaicsIndustry enum added to public visibility in lib.rs and mod.rs.
+- Minor update to tokio and patch updates to clap and jiff dependencies.
+- Locked flag added to cargo-dist and cargo-release installs.
 
 ## [0.1.6] - 2025-03-31
 
@@ -135,52 +143,32 @@ 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.
@@ -191,6 +179,43 @@ 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.8"
+version = "0.1.9"
 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.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" }
+bears_ecology = { version = "0.1.9", path = "./bears_ecology" }
+bears_health = { version = "0.1.9", path = "./bears_health" }
+bears = { version = "0.1.9", path = "./bears" }
+bears_species = { version = "0.1.9", path = "./bears_species" }
 assert-json-diff = "2.0.2"
 bytesize = { version = "2.0.1", features = ["serde"] }
-clap = { version = "4.5.36", features = ["derive"] }
+clap = { version = "4.5.38", features = ["derive"] }
 console = "0.15.11"
 convert_case = "0.8.0"
 csv = "1.3.1"
@@ -30,15 +30,15 @@ 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.8", features = ["serde"] }
+jiff = { version = "0.2.13", features = ["serde"] }
 nom = "8.0.0"
 rayon = "1.10.0"
 reqwest = { version = "0.12.15", features = ["json"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 similar = { version = "2.7.0", features = ["serde"] }
 strum = { version = "0.27.1", features = ["derive", "strum_macros"] }
-tokio = { version = "1.44.2", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.45.0", features = ["macros", "rt-multi-thread"] }
 tracing = "0.1.41"
 tracing-log = "0.2.0"
 tracing-serde = "0.2.0"

Cargo.toml

@@ -181,7 +181,6 @@ naics_code,naics_title,name
 312230,Tobacco Manufacturing ,TobaccoManufacturing
 313110,"Fiber, Yarn, and Thread Mills ",FiberYarnAndThreadMills
 313210,Broadwoven Fabric Mills,BroadwovenFabricMills
-313220,Narrow Fabric Mills and Schiffli,
 313220,Narrow Fabric Mills and Schiffli Machine Embroidery,NarrowFabricMillsAndSchiffliMachineEmbroidery
 313230,Nonwoven Fabric Mills,NonwovenFabricMills
 313240,Knit Fabric Mills,KnitFabricMills
@@ -748,7 +747,7 @@ naics_code,naics_title,name
 532210,Consumer Electronics and Appliances Rental,ConsumerElectronicsAndAppliancesRental
 532220,Formal Wear and Costume Rental,FormalWearAndCostumeRental
 532230,Video Tape and Disc Rental,VideoTapeAndDiscRental
-532281,Recreational Goods Rental,RecreationalGoodsRental
+532281,Recreational Goods Rental Parent,RecreationalGoodsRentalParent
 532282,Medical Equipment and Supplies Rental,MedicalEquipmentAndSuppliesRental
 532283,Home Health Equipment and Supplies Rental,HomeHealthEquipmentAndSuppliesRental
 532284,Recreational Goods Rental,RecreationalGoodsRental
@@ -810,7 +809,7 @@ naics_code,naics_title,name
 541990,"All Other Professional, Scientific, and Technical Services",AllOtherProfessionalScientificAndTechnicalServices
 551111,Offices of Bank Holding Companies,OfficesOfBankHoldingCompanies
 551112,Offices of Other Holding Companies,OfficesOfOtherHoldingCompanies
-551113,"Corporate, Subsidiary, and Regional Managing Offices",CorporateSubsidiaryAndRegionalManagingOffices
+551113,"Corporate, Subsidiary, and Regional Managing Offices Parent",CorporateSubsidiaryAndRegionalManagingOfficesParent
 551114,"Corporate, Subsidiary, and Regional Managing Offices",CorporateSubsidiaryAndRegionalManagingOffices
 561110,Office Administrative Services,OfficeAdministrativeServices
 561210,Facilities Support Services,FacilitiesSupportServices
@@ -974,7 +973,6 @@ naics_code,naics_title,name
 812111,Barber Shops,BarberShops
 812112,Beauty Salons,BeautySalons
 812113,Nail Salons,NailSalons
-812113,Nail Salons,NailSalons
 812191,Diet and Weight Reducing Centers,DietAndWeightReducingCenters
 812199,Other Personal Care Services,OtherPersonalCareServices
 812210,Funeral Homes and Funeral Services,FuneralHomesAndFuneralServices

bears_health/cave/naics_industry.csv

@@ -189,7 +189,8 @@ pub use datasets::{check_datasets, datasets_from_file, datasets_to_json};
 pub use histories::download_summary;
 pub use indicators::check_indicators;
 pub use naics::{
-    check_naics_category, check_naics_sectors, check_naics_subcategory, check_naics_subsectors,
+    check_naics_category, check_naics_industry, check_naics_sectors, check_naics_subcategory,
+    check_naics_subsectors,
 };
 pub use parameter_values::{
     parameter_value_filtered, parameter_value_from_json, parameter_values_from_file,