change naming of keys for default settings in label_templates.yml

- the word 'default' is in the parent key now, so no need to prefix each setting with it too
- change code references to them
- add 'default_' prefix back in when generating Settings file, because they're not grouped under a parent section there, and it will keep it consistent with how it was before, avoiding the need for further code changes

config/label_templates.yml

@@ -1,18 +1,18 @@
 ---
 defaults_by_printer_type:
-  default_pmb_templates:
+  pmb_templates:
     :plate_double: plate_6mm_double_code39
     :plate_a: sqsc_96plate_label_template_code39
     :tube_rack: sqsc_96plate_label_template_code39
     :tube: tube_label_template_1d
 
-  default_sprint_templates:
+  sprint_templates:
     :plate_double: plate_384.yml.erb
     :plate_a: plate_96.yml.erb
     :tube_rack: plate_96.yml.erb
     :tube: tube_label_template_1d.yml.erb
 
-  default_printer_type_names:
+  printer_type_names:
     :plate_double: 384 Well Plate Double
     :plate_a: 96 Well Plate
     :tube_rack: 96 Well Plate

lib/purpose_config.rb

@@ -141,9 +141,9 @@ def default_label_template
     printer_type_key = default_options[:default_printer_type]
     {
       label_class: default_options[:label_class],
-      printer_type: @label_template_defaults.fetch('default_printer_type_names').fetch(printer_type_key),
-      pmb_template: @label_template_defaults.fetch('default_pmb_templates').fetch(printer_type_key),
-      sprint_template: @label_template_defaults.fetch('default_sprint_templates').fetch(printer_type_key)
+      printer_type: @label_template_defaults.fetch('printer_type_names').fetch(printer_type_key),
+      pmb_template: @label_template_defaults.fetch('pmb_templates').fetch(printer_type_key),
+      sprint_template: @label_template_defaults.fetch('sprint_templates').fetch(printer_type_key)
     }
   end
 end

lib/tasks/config.rake

@@ -79,8 +79,8 @@ namespace :config do
 
         label_template_defaults = label_template_config['defaults_by_printer_type']
         label_template_defaults.each_key do |key|
-          # converting the key to a symbol to keep it consistent with how it was before
-          configuration[key.to_sym] = label_template_defaults[key.to_s]
+          # adding 'default_' prefix and converting the key to a symbol, to keep it consistent with how it was before
+          configuration[('default_' + key).to_sym] = label_template_defaults[key.to_s]
         end
 
         configuration[:submission_templates] = submission_templates

spec/spec_helper.rb

@@ -170,9 +170,9 @@
       .parse_file(Rails.root.join('config/label_templates.yml'))
       .to_ruby
       .tap do |label_templates|
-        Settings.default_pmb_templates = label_templates['defaults_by_printer_type']['default_pmb_templates']
-        Settings.default_sprint_templates = label_templates['defaults_by_printer_type']['default_sprint_templates']
-        Settings.default_printer_type_names = label_templates['defaults_by_printer_type']['default_printer_type_names']
+        Settings.default_pmb_templates = label_templates['defaults_by_printer_type']['pmb_templates']
+        Settings.default_sprint_templates = label_templates['defaults_by_printer_type']['sprint_templates']
+        Settings.default_printer_type_names = label_templates['defaults_by_printer_type']['printer_type_names']
       end
   end