From 5071b596d2a74942e70cc5ee5aca2b738a4875d0 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Sat, 19 Mar 2016 09:40:42 +0100
Subject: [PATCH] Refactor: call it option_name

- also, add a IRREGULAR_OPTIONS hash
---
 lib/github_changelog_generator/parser_file.rb | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/lib/github_changelog_generator/parser_file.rb b/lib/github_changelog_generator/parser_file.rb
index 81272cf..40c2498 100644
--- a/lib/github_changelog_generator/parser_file.rb
+++ b/lib/github_changelog_generator/parser_file.rb
@@ -22,13 +22,13 @@ module GitHubChangelogGenerator
     end
 
     def parse_line!(line)
-      key_sym, value = extract_pair(line)
-      @options[translate_option_name(key_sym)] = convert_value(value, key_sym)
+      option_name, value = extract_pair(line)
+      @options[option_key_for(option_name)] = convert_value(value, option_name)
     rescue
       raise ParserError, "Config file #{file} is incorrect in line \"#{line.gsub(/[\n\r]+/, '')}\""
     end
 
-    # Returns a the setting as a symbol and its string value sans newlines.
+    # Returns a the option name as a symbol and its string value sans newlines.
     #
     # @param line [String] unparsed line from config file
     # @return [Array<Symbol, String>]
@@ -41,10 +41,10 @@ module GitHubChangelogGenerator
                         :enhancement_labels, :between_tags, :exclude_tags]
     KNOWN_INTEGER_KEYS = [:max_issues]
 
-    def convert_value(value, key_sym)
-      if KNOWN_ARRAY_KEYS.include?(key_sym)
+    def convert_value(value, option_name)
+      if KNOWN_ARRAY_KEYS.include?(option_name)
         value.split(",")
-      elsif KNOWN_INTEGER_KEYS.include?(key_sym)
+      elsif KNOWN_INTEGER_KEYS.include?(option_name)
         value.to_i
       elsif value =~ /^(true|t|yes|y|1)$/i
         true
@@ -55,20 +55,22 @@ module GitHubChangelogGenerator
       end
     end
 
-    def translate_option_name(key_sym)
-      {
-        bugs_label: :bug_prefix,
-        enhancement_label: :enhancement_prefix,
-        issues_label: :issue_prefix,
-        header_label: :header,
-        front_matter: :frontmatter,
-        pr_label: :merge_prefix,
-        issues_wo_labels: :add_issues_wo_labels,
-        pr_wo_labels: :add_pr_wo_labels,
-        pull_requests: :pulls,
-        filter_by_milestone: :filter_issues_by_milestone,
-        github_api: :github_endpoint
-      }.fetch(key_sym) { key_sym }
+    IRREGULAR_OPTIONS = {
+      bugs_label: :bug_prefix,
+      enhancement_label: :enhancement_prefix,
+      issues_label: :issue_prefix,
+      header_label: :header,
+      front_matter: :frontmatter,
+      pr_label: :merge_prefix,
+      issues_wo_labels: :add_issues_wo_labels,
+      pr_wo_labels: :add_pr_wo_labels,
+      pull_requests: :pulls,
+      filter_by_milestone: :filter_issues_by_milestone,
+      github_api: :github_endpoint
+    }
+
+    def option_key_for(option_name)
+      IRREGULAR_OPTIONS.fetch(option_name) { option_name }
     end
   end
 end