en14960 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dbb1531dc763837d2f9ddef55c5ae97ae4763b62bea5671d28a230b208c0fa1
-  data.tar.gz: c471b3628a2dc6cf1b4157c04ddf03724aa1ade11f354367bb8c1f31b4d0e522
+  metadata.gz: 80115ea696b28cdfdda43a16f3e7fc049db7a65ad15bfddef771706b92edbe73
+  data.tar.gz: afffd6182e680c35b983f88a5bf74324e3da7196a2d7f64e93f427a5e06bacf7
 SHA512:
-  metadata.gz: c035f45431a922e9b96260be0bd4bc9146adaa9aaf915554e63efa9bbf58889c1fee6a7793101ad9bd410d3483a40a28b771b29d24ffc913270153612204fccb
-  data.tar.gz: 16f3ce2f5a590a0e6668c98c5207f2fba589307d31ae90fee8602fcce7994105efdc5ec60022c774b4ee8a41fb1aff93bbb98232cd232ccba87a705c2d21021e
+  metadata.gz: 1f50738aa5c9b3038c1b374bdedbe271b4541646d72db69c00c2f6535118241b4499687f5c775618c67a12bd25cbb92fe1573fdc9d3bc36144760bf80ed2f886
+  data.tar.gz: 07d08e86c3f7f95fc3e0047b0b0371c7445f8ad88057692dc0742fbe734a81e4abb74e9fe784452e7252df2e70b5c2f701b616492e08db21c9254fe06ba1174c

data/lib/en14960/validators/play_area_validator.rb

@@ -5,32 +5,40 @@ module EN14960
     module PlayAreaValidator
       extend self
 
-      def validate(unit_length:, unit_height:, play_area_length:, play_area_width:, negative_adjustment_area:)
+      def validate(
+        unit_length:,
+        unit_width:,
+        play_area_length:,
+        play_area_width:,
+        negative_adjustment_area:
+      )
         errors = []
 
-        # Check for nil values
-        if [unit_length, unit_height, play_area_length, play_area_width, negative_adjustment_area].any?(&:nil?)
-          errors << "All measurements must be provided (non-nil)"
+        if [
+          unit_length,
+          unit_width,
+          play_area_length,
+          play_area_width,
+          negative_adjustment_area
+        ].any?(&:nil?)
+          errors << "All measurements must be provided"
         end
 
-        # Return early if we have nil values
         return build_response(false, errors) unless errors.empty?
 
-        # Convert all to floats for comparison
         unit_length = unit_length.to_f
-        unit_height = unit_height.to_f
+        unit_width = unit_width.to_f
         play_area_length = play_area_length.to_f
         play_area_width = play_area_width.to_f
         negative_adjustment_area = negative_adjustment_area.to_f
 
-        # Check play area length is less than unit height
-        if play_area_length >= unit_height
-          errors << "Play area length (#{play_area_length}) must be less than unit height (#{unit_height})"
+        if play_area_length > unit_length
+          errors << "Play area length (#{play_area_length}) must be less than or equal to unit length (#{unit_length})"
         end
 
-        # Check play area width is less than unit length
-        if play_area_width >= unit_length
-          errors << "Play area width (#{play_area_width}) must be less than unit length (#{unit_length})"
+        # Check play area width is less than unit width
+        if play_area_width > unit_width
+          errors << "Play area width (#{play_area_width}) must be less than or equal to unit width (#{unit_width})"
         end
 
         # Calculate total play area
@@ -43,7 +51,7 @@ module EN14960
 
         build_response(errors.empty?, errors, {
           unit_length: unit_length,
-          unit_height: unit_height,
+          unit_width: unit_width,
           play_area_length: play_area_length,
           play_area_width: play_area_width,
           total_play_area: total_play_area,

data/lib/en14960/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EN14960
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: en14960
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chobble.com