refactor Renderable#load_user_file

Author: DannyBen

lib/bashly/concerns/renderable.rb

@@ -18,9 +18,7 @@ def view_marker(id = nil)
     # Reads a file from the userspace (Settings.source_dir) and returns
     # its contents. If the file is not found, returns a string with a hint.
     def load_user_file(file, placeholder: true)
-      path = "#{Settings.source_dir}/#{file}"
-      ext = ".#{Settings.partials_extension}"
-      path += ext unless path.end_with? ext
+      path = user_file_path file
 
       content = if File.exist? path
         File.read(path).remove_front_matter
@@ -33,6 +31,14 @@ def load_user_file(file, placeholder: true)
       Settings.production? ? content : "#{view_marker path}\n#{content}"
     end
 
+    def user_file_path(file)
+      path = "#{Settings.source_dir}/#{file}"
+      ext = ".#{Settings.partials_extension}"
+      return path if path.end_with? ext
+
+      "#{path}#{ext}"
+    end
+
   private
 
     def view_path(view)

spec/bashly/script/command_spec.rb

@@ -330,10 +330,25 @@
           .to eq "# spec/tmp/src/notfound.sh\necho \"error: cannot load file\""
       end
     end
+  end
+
+  describe '#user_file_path' do
+    it 'returns the path to the user file' do
+      expect(subject.user_file_path 'test.sh').to eq 'spec/tmp/src/test.sh'
+    end
+
+    context 'when the file argument does not end with .sh extension' do
+      it 'returns the path with .sh appended' do
+        expect(subject.user_file_path 'test').to eq 'spec/tmp/src/test.sh'
+      end
+    end
+
+    context 'when partials_extension is set and the argument does not end with the selected extension' do
+      before { Settings.partials_extension = 'bash' }
+      after  { Settings.partials_extension = 'sh' }
 
-    context 'when the provided file does not include an extension' do
-      it 'adds the partials_extension to it' do
-        expect(subject.load_user_file('test')).to eq "# spec/tmp/src/test.sh\nhello Command#load_user_file"
+      it 'returns the path with the selected extension appended' do
+        expect(subject.user_file_path 'test').to eq 'spec/tmp/src/test.bash'
       end
     end
   end