en14960 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a499cbd58c45486a20fa936b0b24993b8b3a8725ddf887ba5cc6c60f1acde44
-  data.tar.gz: 0f43ff3d54951b01bbb9bf129886c5075e1ff89948b28daf7184b44eb319dc18
+  metadata.gz: 8dbb1531dc763837d2f9ddef55c5ae97ae4763b62bea5671d28a230b208c0fa1
+  data.tar.gz: c471b3628a2dc6cf1b4157c04ddf03724aa1ade11f354367bb8c1f31b4d0e522
 SHA512:
-  metadata.gz: ceabc28647ef710885f3782080b965d6ac84f8b2e2acccdd099a5b59f1c62945d23ddad5aa99ada254cf6cb973d9a0a235beba1adb8e502d5200eabf7fa56620
-  data.tar.gz: 30d7d252d232df2ecd9d878608a810d9568389781ffd00a24d5ed73449c585ad3213746de17dac741e1b37a72ada20d655e15aa34ecc7d53c026be9270ea8dc0
+  metadata.gz: c035f45431a922e9b96260be0bd4bc9146adaa9aaf915554e63efa9bbf58889c1fee6a7793101ad9bd410d3483a40a28b771b29d24ffc913270153612204fccb
+  data.tar.gz: 16f3ce2f5a590a0e6668c98c5207f2fba589307d31ae90fee8602fcce7994105efdc5ec60022c774b4ee8a41fb1aff93bbb98232cd232ccba87a705c2d21021e

data/lib/en14960/calculators/slide_calculator.rb

@@ -144,23 +144,33 @@ module EN14960
           }
         when (thresholds[:basic_walls]..thresholds[:enhanced_walls])
           required_height = (user_height * enhanced_multiplier).round(2)
-          breakdown = [
-            ["Height range", "3.0m - 6.0m"],
-            ["Calculation", "#{user_height}m × #{enhanced_multiplier} = #{required_height}m"],
-            ["Alternative requirement", "Permanent roof (can replace heightened walls)"]
-          ]
 
-          # Add roof status if known
-          if !has_permanent_roof.nil?
-            breakdown << if has_permanent_roof
+          # Skip wall height requirement message if permanent roof is present
+          if has_permanent_roof
+            breakdown = [
+              ["Height range", "3.0m - 6.0m"],
+              ["Wall requirement", "#{required_height}m (1.25× user height) - skipped due to permanent roof"],
+              ["Alternative requirement", "Permanent roof (can replace heightened walls)"],
               ["Permanent roof", "Fitted ✓"]
-            else
-              ["Permanent roof", "Not fitted ✗"]
+            ]
+            text = "Permanent roof fitted - wall height requirement satisfied"
+          else
+            breakdown = [
+              ["Height range", "3.0m - 6.0m"],
+              ["Calculation", "#{user_height}m × #{enhanced_multiplier} = #{required_height}m"],
+              ["Alternative requirement", "Permanent roof (can replace heightened walls)"]
+            ]
+
+            # Add roof status if known
+            if !has_permanent_roof.nil?
+              breakdown << ["Permanent roof", "Not fitted ✗"]
             end
+
+            text = "Walls must be at least #{required_height}m (1.25× user height)"
           end
 
           {
-            text: "Walls must be at least #{required_height}m (1.25× user height)",
+            text: text,
             breakdown: breakdown
           }
         when (thresholds[:enhanced_walls]..thresholds[:max_safe_height])

data/lib/en14960/validators/play_area_validator.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module EN14960
+  module Validators
+    module PlayAreaValidator
+      extend self
+
+      def validate(unit_length:, unit_height:, 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)"
+        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
+        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})"
+        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})"
+        end
+
+        # Calculate total play area
+        total_play_area = play_area_length * play_area_width
+
+        # Check total play area is more than negative adjustment area
+        if total_play_area <= negative_adjustment_area
+          errors << "Total play area (#{total_play_area}) must be greater than negative adjustment area (#{negative_adjustment_area})"
+        end
+
+        build_response(errors.empty?, errors, {
+          unit_length: unit_length,
+          unit_height: unit_height,
+          play_area_length: play_area_length,
+          play_area_width: play_area_width,
+          total_play_area: total_play_area,
+          negative_adjustment_area: negative_adjustment_area
+        })
+      end
+
+      private
+
+      def build_response(valid, errors, measurements = {})
+        {
+          valid: valid,
+          errors: errors,
+          measurements: measurements
+        }
+      end
+    end
+  end
+end

data/lib/en14960/version.rb

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

data/lib/en14960.rb

@@ -7,6 +7,7 @@ require_relative "en14960/calculators/anchor_calculator"
 require_relative "en14960/calculators/slide_calculator"
 require_relative "en14960/calculators/user_capacity_calculator"
 require_relative "en14960/validators/material_validator"
+require_relative "en14960/validators/play_area_validator"
 require_relative "en14960/source_code"
 
 # EN14960 provides calculators and validators for BS EN 14960:2019
@@ -79,5 +80,22 @@ module EN14960
     def material_standards
       Constants::MATERIAL_STANDARDS
     end
+
+    # Validate play area measurements
+    # @param unit_length [Float] Unit length
+    # @param unit_height [Float] Unit height
+    # @param play_area_length [Float] Play area length
+    # @param play_area_width [Float] Play area width
+    # @param negative_adjustment_area [Float] Negative adjustment area
+    # @return [Hash] Validation result with errors and measurements
+    def validate_play_area(unit_length:, unit_height:, play_area_length:, play_area_width:, negative_adjustment_area:)
+      Validators::PlayAreaValidator.validate(
+        unit_length: unit_length,
+        unit_height: unit_height,
+        play_area_length: play_area_length,
+        play_area_width: play_area_width,
+        negative_adjustment_area: negative_adjustment_area
+      )
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: en14960
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - Chobble.com
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-31 00:00:00.000000000 Z
+date: 2025-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/en14960/models/calculator_response.rb
 - lib/en14960/source_code.rb
 - lib/en14960/validators/material_validator.rb
+- lib/en14960/validators/play_area_validator.rb
 - lib/en14960/version.rb
 homepage: https://github.com/chobbledotcom/en14960
 licenses: