uddf 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2940685ef35816892c65ed029b230a73674018fa36801b53b4923d36da744c61
-  data.tar.gz: b750a7bd240203df8aa939d73405c6fa003cc4f857612074edf0b6e84d5b1e63
+  metadata.gz: d301729953487eba28cdbcf41f808000cdb8f4faae5b801bd6a6e35f48bac273
+  data.tar.gz: 2d87719ebd57aee09bb79d17810412de4a7c57a8f27379943cd6cf0aace53bac
 SHA512:
-  metadata.gz: b9afdce2237a0fb1c4ac923b6ef881a936f7d352f2f18f8d603b32b76a112fadfcf0a7ba8ce33023ea1d4144bc78446fdee4e1ba4a02fa9b3c39bb9bbe20138e
-  data.tar.gz: cfc3637fdb8cb46dba294f36328c3952494ddf26c21558ada177accc57239f5b630424c4e1d6352bb3b91f086e468de11f26d9990f6bdf41763b647101d7b001
+  metadata.gz: 6858549aa6fbfdeb6c14159a7249e83c4a946adfee3e2002679ae18b01b35c5acd053757a90ce0beb02e3e213ea0d6889af69d02b5e34971a8f5aa4c5205d7b5
+  data.tar.gz: 23cfb82b484f50b174dfc5c8e294999edfb0616faf059ff6a918ccf441a6951407df47db2456387c30c49a297b2ae6adf17b6a2f5dffe970d3188ff198f99ce0

data/.rubocop.yml

@@ -1,4 +1,8 @@
-plugins: rubocop-rake
+inherit_from: .rubocop_todo.yml
+
+plugins:
+  - rubocop-rake
+  - rubocop-rspec
 
 AllCops:
   NewCops: enable
@@ -25,4 +29,4 @@ Style/Documentation:
   Exclude:
     - "spec/**/*"
     - "test/**/*"
-    - "lib/uddf/v323/models.rb"
+    - "lib/uddf/**/*"

data/.rubocop_todo.yml

@@ -0,0 +1,57 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2025-08-24 15:31:53 UTC using RuboCop version 1.80.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 4
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 35
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 2
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+Metrics/MethodLength:
+  Max: 21
+
+# Offense count: 1
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
+  Exclude:
+    - '**/spec/features/**/*'
+    - '**/spec/requests/**/*'
+    - '**/spec/routing/**/*'
+    - '**/spec/system/**/*'
+    - '**/spec/views/**/*'
+    - 'spec/uddf_parser_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Max: 7
+
+# Offense count: 5
+RSpec/MultipleExpectations:
+  Max: 4
+
+# Offense count: 5
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
+RSpec/NoExpectationExample:
+  Exclude:
+    - 'spec/uddf_parser_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - 'spec/uddf_parser_spec.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uddf (0.2.0)
+    uddf (0.4.0)
       nokogiri (~> 1.18)
       nokogiri-happymapper
 
@@ -11,6 +11,8 @@ GEM
     ast (2.4.3)
     cgi (0.5.0)
     date (3.4.1)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
     erb (4.0.4)
       cgi (>= 0.3.3)
     io-console (0.8.1)
@@ -47,6 +49,20 @@ GEM
     regexp_parser (2.11.2)
     reline (0.6.2)
       io-console (~> 0.5)
+    rexml (3.4.1)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.5)
     rubocop (1.80.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -64,7 +80,19 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (3.0.0)
+      rexml
+      simplecov (~> 0.19)
+    simplecov-html (0.13.2)
+    simplecov_json_formatter (0.1.4)
     stringio (3.1.7)
     unicode-display_width (3.1.5)
       unicode-emoji (~> 4.0, >= 4.0.4)
@@ -77,8 +105,12 @@ PLATFORMS
 DEPENDENCIES
   irb
   rake (~> 13.0)
+  rspec (~> 3.13)
   rubocop (~> 1.7)
   rubocop-rake (~> 0.7)
+  rubocop-rspec (~> 3.6)
+  simplecov (~> 0.21)
+  simplecov-cobertura (~> 3)
   uddf!
 
 BUNDLED WITH

data/README.md

@@ -16,15 +16,15 @@ Ruby parser and validator for Universal Dive Data Format (UDDF) files. Supports
 
 | UDDF Version | Parser | Validator |
 |--------------|--------|-----------|
-| 3.0.0        | ✗      | ✓         |
-| 3.0.1        | ✗      | ✓         |
-| 3.1.0        | ✗      | ✓         |
-| 3.2.0        | ✗      | ✓         |
-| 3.2.1        | ✗      | ✓         |
-| 3.2.2        | ✗      | ✓         |
+| 3.0.0        | ✓      | ✓         |
+| 3.0.1        | ✓      | ✓         |
+| 3.1.0        | ✓      | ✓         |
+| 3.2.0        | ✓      | ✓         |
+| 3.2.1        | ✓      | ✓         |
+| 3.2.2        | ✓      | ✓         |
 | 3.2.3        | ✓      | ✓         |
-| 3.3.0        | ✗      | ✓         |
-| 3.3.1        | ✗      | ✓         |
+| 3.3.0        | ✓      | ✓         |
+| 3.3.1        | ✓      | ✓         |
 
 > **Note**: The UDDF 3.3.0 and 3.3.1 schema files included in this gem have been locally modified to fix XML Schema validation errors that prevented them from loading with Nokogiri. These fixes address syntax issues in the original schemas but may not represent the upstream maintainers' intentions. The modifications ensure compatibility with standard XML Schema validators while preserving the core schema structure and validation rules.
 
@@ -62,6 +62,36 @@ end
 gem 'uddf'
 ```
 
+## Date Format Support
+
+The UDDF parser supports multiple date/time formats in `<datetime>` elements:
+
+| Format | Example | Description |
+|--------|---------|-------------|
+| **Full ISO 8601** | `2024-03-21T14:30:00Z` | Complete date and time with timezone |
+| **Date only** | `2024-03-21` | ISO 8601 date format |
+| **Year-Month** | `2024-03` | Year and month only (defaults to 1st day) |
+| **Year only** | `2024` | Year only (defaults to January 1st) |
+| **RFC 3339** | `2024-03-21T14:30:00+02:00` | RFC 3339 compliant timestamps |
+
+### Date Parsing Behavior
+
+- **Year-only format** (`YYYY`): Parsed as January 1st of that year
+- **Year-month format** (`YYYY-MM`): Parsed as the 1st day of that month
+- **Empty dates**: Gracefully handled without throwing errors
+- **Fallback parsing**: If ISO 8601 parsing fails, falls back to RFC 3339, then general date parsing
+
+Example usage in UDDF files:
+```xml
+<nextservicedate>
+    <datetime>2025-06</datetime>  <!-- June 1st, 2025 -->
+</nextservicedate>
+
+<birthdate>
+    <datetime>1985</datetime>     <!-- January 1st, 1985 -->
+</birthdate>
+```
+
 ## Architecture
 
 The gem uses a modular architecture with version-specific models:

data/lib/uddf/base/models/deco.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module UDDF
+  module Base
+    module Models
+      class Tissue
+        include HappyMapper
+
+        tag "tissue"
+
+        attribute :gas, String
+        attribute :half_life, Float, tag: "halflife"
+        attribute :number, Integer
+        attribute :a, Float
+        attribute :b, Float
+      end
+
+      class Hargikas
+        include HappyMapper
+
+        tag "hargikas"
+
+        has_one :ambient, Float
+        has_many :tissues, Tissue, tag: "tissue"
+        has_one :arterial_micro_bubble_level, Integer, tag: "arterialmicrobubbleLevel"
+        has_one :intrapulmonary_right_left_shunt, Float, tag: "intrapulmonaryrightleftshunt"
+        has_one :estimated_skin_cool_level, Integer, tag: "estimatedskincoolLevel"
+      end
+
+      class VPM
+        include HappyMapper
+
+        tag "vpm"
+
+        attribute :id, String
+        has_one :conservatism, Float
+        has_one :gamma, Float
+        has_one :gc, Float
+        has_one :lambda, Float
+        has_one :r0, Float
+        has_many :tissues, Tissue, tag: "tissue"
+      end
+
+      class RGBM
+        include HappyMapper
+
+        tag "rgbm"
+
+        attribute :id, String
+        has_many :tissues, Tissue, tag: "tissue"
+      end
+
+      class Buehlmann
+        include HappyMapper
+
+        tag "buehlmann"
+
+        attribute :id, String
+        has_many :tissues, Tissue, tag: "tissue"
+      end
+
+      class BuehlmannV320
+        include HappyMapper
+
+        tag "buehlmann"
+
+        attribute :id, String
+        has_one :gradient_factor_high, Float, tag: "gradientfactorhigh"
+        has_one :gradient_factor_low, Float, tag: "gradientfactorlow"
+        has_many :tissues, Tissue, tag: "tissue"
+      end
+
+      class DecoModel
+        include HappyMapper
+
+        tag "decomodel"
+
+        content :value, String
+      end
+
+      class DecoModelV310
+        include HappyMapper
+
+        tag "decomodel"
+
+        has_many :buehlmanns, Buehlmann, tag: "buehlmann"
+        has_many :rgbms, RGBM, tag: "rbgm"
+        has_many :vpms, VPM, tag: "vpm"
+      end
+
+      class DecoModelV320
+        include HappyMapper
+
+        tag "decomodel"
+
+        has_many :buehlmanns, BuehlmannV320, tag: "buehlmann"
+        has_many :rgbms, RGBM, tag: "rbgm"
+        has_many :vpms, VPM, tag: "vpm"
+      end
+    end
+  end
+end

data/lib/uddf/base/models/dive_computer.rb

@@ -0,0 +1,193 @@
+# frozen_string_literal: true
+
+module UDDF
+  module Base
+    module Models
+      class DCAlarm
+        include HappyMapper
+
+        tag "dcalarm"
+
+        has_one :acknowledge, String
+        has_one :alarm_type, Integer, tag: "alarmtype"
+        has_one :period, Float
+      end
+
+      class SetDCDiveDepthAlarm
+        include HappyMapper
+
+        tag "setdcdivedethalarm"
+
+        has_one :dc_alarm, DCAlarm, tag: "dcalarm"
+        has_one :dc_alarm_depth, Float, tag: "dcalarmdepth"
+      end
+
+      class SetDCDivePo2Alarm
+        include HappyMapper
+
+        tag "setdcdivepo2alarm"
+
+        has_one :dc_alarm, DCAlarm, tag: "dcalarm"
+        has_one :maximum_po2, Float, tag: "maximumpo2"
+      end
+
+      class SetDCDiveSiteData
+        include HappyMapper
+
+        tag "setdcdivesitedata"
+
+        attribute :dive_site, String, tag: "divesite"
+      end
+
+      class SetDCDiveTimeAlarm
+        include HappyMapper
+
+        tag "setdcdivetimealarm"
+
+        has_one :dc_alarm, DCAlarm, tag: "dcalarm"
+        has_one :timespan, Float
+      end
+
+      class SetDCEndNDTAlarm
+        include HappyMapper
+
+        tag "setdcendndtalarm"
+
+        has_one :dc_alarm, DCAlarm, tag: "dcalarm"
+      end
+
+      class ApplicationDataV300
+        include HappyMapper
+
+        tag "applicationdata"
+
+        has_one :hargikas, Hargikas
+      end
+
+      class ApplicationDataV310 < ApplicationDataV300
+        include HappyMapper
+
+        tag "applicationdata"
+
+        has_one :deco_trainer, String, tag: "decotrainer"
+      end
+
+      class ApplicationDataV330 < ApplicationDataV310
+        include HappyMapper
+
+        has_one :apdiving, String
+        has_one :ratio, String
+      end
+
+      class SetDCDecoModelV300
+        include HappyMapper
+
+        tag "setdcdecomodel"
+
+        has_many :alias_names, String, tag: "aliasname"
+        has_one :application_data, ApplicationDataV300, tag: "applicationdata"
+        has_one :name, String
+      end
+
+      class SetDCDecoModelV310 < SetDCDecoModelV300
+        include HappyMapper
+
+        has_one :application_data, ApplicationDataV310, tag: "applicationdata"
+      end
+
+      class SetDCDecoModelV330 < SetDCDecoModelV310
+        include HappyMapper
+
+        has_one :application_data, ApplicationDataV330, tag: "applicationdata"
+      end
+
+      class SetDCBuddyData
+        include HappyMapper
+
+        tag "setdcbuddydata"
+
+        attribute :buddy, String
+      end
+
+      class SetDCDataV300
+        include HappyMapper
+
+        tag "setdcdata"
+
+        has_one :set_dc_alarm_time, DateTime, tag: "setdcalarmtime"
+        has_one :set_dc_altitude, Float, tag: "setdcaltitude"
+        has_one :set_dc_buddy_data, SetDCBuddyData, tag: "setdcbuddydata"
+        has_one :set_dc_date_time, DateTime, tag: "setdcdatetime"
+        has_one :set_dc_deco_model, SetDCDecoModelV300, tag: "setdcdecomodel"
+        has_one :set_dc_dive_depth_alarm, SetDCDiveDepthAlarm, tag: "setdcdivedethalarm"
+        has_one :set_dc_dive_po2_alarm, SetDCDivePo2Alarm, tag: "setdcdivepo2alarm"
+        has_many :set_dc_dive_site_data, SetDCDiveSiteData, tag: "setdcdivesitedata"
+        has_one :set_dc_dive_time_alarm, SetDCDiveTimeAlarm, tag: "setdcdivetimealarm"
+        has_one :set_dc_end_ndt_alarm, SetDCEndNDTAlarm, tag: "setdcendndtalarm"
+        has_one :set_dc_gas_definitions_data, String, tag: "setdcgasdefinitionsdata"
+        has_one :set_dc_owner_data, String, tag: "setdcownerdata"
+        has_one :set_dc_password, String, tag: "setdcpassword"
+        has_one :set_dc_generator_data, String, tag: "setdcgeneratordata"
+      end
+
+      class SetDCDataV310 < SetDCDataV300
+        include HappyMapper
+
+        has_one :set_dc_deco_model, SetDCDecoModelV310, tag: "setdcdecomodel"
+      end
+
+      class SetDCDataV330 < SetDCDataV310
+        include HappyMapper
+
+        has_one :set_dc_deco_model, SetDCDecoModelV330, tag: "setdcdecomodel"
+      end
+
+      class GetDCData
+        include HappyMapper
+
+        tag "getdcdata"
+
+        has_one :get_dc_all_data, String, tag: "getdcalldata"
+        has_one :get_dc_generator_data, String, tag: "getdcgeneratordata"
+        has_one :get_dc_owner_data, String, tag: "getdcownerdata"
+        has_one :get_dc_buddy_data, String, tag: "getdcbuddydata"
+        has_one :get_dc_gas_definitions_data, String, tag: "getdcgasdefinitionsdata"
+        has_one :get_dc_dive_site_data, String, tag: "getdcdivesitedata"
+        has_one :get_dc_dive_trip_data, String, tag: "getdcdivetripdata"
+        has_one :get_dc_profile_data, String, tag: "getdcprofiledata"
+      end
+
+      class DiveComputerDump
+        include HappyMapper
+
+        tag "divecomputerdump"
+
+        has_one :datetime, DateTime
+        has_one :dc_dump, String, tag: "dcdump"
+        has_one :link, Link
+      end
+
+      class DiveComputerControlV300
+        include HappyMapper
+
+        tag "divecomputercontrol"
+
+        has_many :dive_computer_dumps, DiveComputerDump, tag: "divecomputerdump"
+        has_one :get_dc_data, GetDCData, tag: "getdcdata"
+        has_one :set_dc_data, SetDCDataV300, tag: "setdcdata"
+      end
+
+      class DiveComputerControlV310 < DiveComputerControlV300
+        include HappyMapper
+
+        has_one :set_dc_data, SetDCDataV310, tag: "setdcdata"
+      end
+
+      class DiveComputerControlV330 < DiveComputerControlV310
+        include HappyMapper
+
+        has_one :set_dc_data, SetDCDataV330, tag: "setdcdata"
+      end
+    end
+  end
+end