From 5d34b51c990639c57fe8a47141a0eef79ea775e5 Mon Sep 17 00:00:00 2001 From: Thom May Date: Mon, 29 Feb 2016 13:36:07 +0000 Subject: use File.basename rather than reimplementing --- lib/chef/chef_fs/data_handler/data_handler_base.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/chef/chef_fs/data_handler/data_handler_base.rb b/lib/chef/chef_fs/data_handler/data_handler_base.rb index 83f56ed16d..62b35d69d4 100644 --- a/lib/chef/chef_fs/data_handler/data_handler_base.rb +++ b/lib/chef/chef_fs/data_handler/data_handler_base.rb @@ -28,10 +28,7 @@ class Chef # Takes a name like blah.json and removes the .json from it. # def remove_dot_json(name) - if name.length < 5 || name[-5, 5] != ".json" - raise "Invalid name #{path}: must end in .json" - end - name[0, name.length - 5] + File.basename(name, ".json") end # -- cgit v1.2.1