tbd 3.4.0 → 3.4.2

data/lib/tbd/geo.rb

@@ -251,7 +251,7 @@ module TBD
   #
   # @return [Topolys::Vector3D] true normal vector of s
   # @return [nil] if invalid input (see logs)
-  def trueNormal(s = nil, r = 0)
+  def truNormal(s = nil, r = 0)
     mth = "TBD::#{__callee__}"
     cl  = OpenStudio::Model::PlanarSurface
     return mismatch("surface", s, cl, mth)   unless s.is_a?(cl)
@@ -285,18 +285,18 @@ module TBD
     surf   = {}
     subs   = {}
     fd     = false
-    return invalid("#{nom}",     mth, 1, FTL) if poly(surface).empty?
+    return invalid("#{nom}",     mth, 1, ERR) if poly(surface).empty?
     return empty("#{nom} space", mth,    ERR) if surface.space.empty?
 
     space  = surface.space.get
     stype  = space.spaceType
     story  = space.buildingStory
     tr     = transforms(space)
-    return   invalid("#{nom} transform", mth, 0, FTL) unless tr[:t] && tr[:r]
+    return   invalid("#{nom} transform", mth, 0, ERR) unless tr[:t] && tr[:r]
 
     t      = tr[:t]
-    n      = trueNormal(surface, tr[:r])
-    return   invalid("#{nom} normal", mth, 0, FTL) unless n
+    n      = truNormal(surface, tr[:r])
+    return   invalid("#{nom} normal", mth, 0, ERR) unless n
 
     type   = surface.surfaceType.downcase
     facing = surface.outsideBoundaryCondition

data/lib/tbd/psi.rb

@@ -1598,14 +1598,14 @@ module TBD
       tr      = transforms(group)
       t       = tr[:t] if tr[:t] && tr[:r]
 
-      log(FTL, "Can't process '#{id}' transformation (#{mth})") unless t
-      return tbd                                                unless t
+      log(ERR, "Can't process '#{id}' transformation (#{mth})") unless t
+      next                                                      unless t
 
       space   = group.space
       tr[:r] += space.get.directionofRelativeNorth unless space.empty?
-      n       = trueNormal(s, tr[:r])
-      log(FTL, "Can't process '#{id}' true normal (#{mth})") unless n
-      return tbd                                             unless n
+      n       = truNormal(s, tr[:r])
+      log(ERR, "Can't process '#{id}' true normal (#{mth})") unless n
+      next                                                   unless n
 
       points = (t * s.vertices).map { |v| Topolys::Point3D.new(v.x, v.y, v.z) }
 
@@ -1695,14 +1695,10 @@ module TBD
       dx         = (origin.x - terminal.x).abs
       dy         = (origin.y - terminal.y).abs
       dz         = (origin.z - terminal.z).abs
-      horizontal = dz.abs < TOL
+      horizontal = dz < TOL
       vertical   = dx < TOL && dy < TOL
       edge_V     = terminal - origin
-
-      if edge_V.magnitude < TOL
-        invalid("1x edge length < TOL", mth, 0, ERROR)
-        next
-      end
+      next if edge_V.magnitude < TOL
 
       edge_plane = Topolys::Plane3D.new(origin, edge_V)
 
@@ -1766,10 +1762,8 @@ module TBD
             farthest_V = origin_point_V if farther
           end
 
-          angle = reference_V.angle(farthest_V)
-          invalid("#{id} polar angle", mth, 0, ERROR, 0) if angle.nil?
-          angle = 0                                      if angle.nil?
-
+          angle  = reference_V.angle(farthest_V)
+          angle  = 0 if angle.nil?
           adjust = false # adjust angle [180°, 360°] if necessary
 
           if vertical
@@ -3314,9 +3308,9 @@ module TBD
     match2 = /files/.match(file_paths[1].to_s.strip)
     match  = match1 || match2
 
-    if file_paths.size >= 2 && File.exists?(file_paths[1].to_s.strip) && match
+    if file_paths.size >= 2 && File.exist?(file_paths[1].to_s.strip) && match
       out_dir = file_paths[1].to_s.strip
-    elsif !file_paths.empty? && File.exists?(file_paths.first.to_s.strip)
+    elsif !file_paths.empty? && File.exist?(file_paths.first.to_s.strip)
       out_dir = file_paths.first.to_s.strip
     end
 

data/lib/tbd/ua.rb

@@ -1000,7 +1000,7 @@ module TBD
       model  = "* modèle : #{ua[:file]}"    if ua.key?(:file)  && lang == :fr
       model += " (v#{ua[:version]})"        if ua.key?(:version)
       report << model                   unless model.empty?
-      report << "* TBD : v3.4.0"
+      report << "* TBD : v3.4.2"
       report << "* date : #{ua[:date]}"
 
       if lang == :en

data/lib/tbd/version.rb

@@ -21,5 +21,5 @@
 # SOFTWARE.
 
 module TBD
-  VERSION = "3.4.0".freeze # TBD release version
+  VERSION = "3.4.2".freeze # TBD release version
 end

data/tbd.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
   s.bindir                   = "exe"
   s.require_paths            = ["lib"]
   s.executables              = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  s.required_ruby_version    = [">= 2.5.0", "< 3"]
+  s.required_ruby_version    = [">= 2.5.0", "< 4"]
   s.metadata                 = {}
 
   s.add_dependency             "topolys",     "~> 0"
   s.add_dependency             "osut",        "~> 0"
-  s.add_dependency             "json-schema", "~> 2.7.0"
+  s.add_dependency             "json-schema", "~> 4"
 
   s.add_development_dependency "bundler",     "~> 2.1"
   s.add_development_dependency "rake",        "~> 13.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbd
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.2
 platform: ruby
 authors:
 - Denis Bourgeois & Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-01 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: topolys
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rd2/tbd
-  source_code_uri: https://github.com/rd2/tbd/tree/v3.4.0
+  source_code_uri: https://github.com/rd2/tbd/tree/v3.4.2
   bug_tracker_uri: https://github.com/rd2/tbd/issues
 post_install_message:
 rdoc_options: []
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3'
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="