From 10fc6c6a3501f275abe2ee6671f2bce11208cf46 Mon Sep 17 00:00:00 2001 From: Michael Miller Date: Wed, 12 Sep 2018 15:54:45 -0600 Subject: [PATCH] Hide special character mapping --- src/spectator/context_definitions.cr | 33 +++++++++++++++++++++++ src/spectator/dsl.cr | 39 +++------------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/spectator/context_definitions.cr b/src/spectator/context_definitions.cr index ef4a2bd..9a3ddac 100644 --- a/src/spectator/context_definitions.cr +++ b/src/spectator/context_definitions.cr @@ -2,5 +2,38 @@ module Spectator module ContextDefinitions ALL = {} of Path => Object MAPPING = {} of String => Context + + SPECIAL_CHARS = { + '~' => "Tilde", + '`' => "Tick", + '!' => "Bang", + '@' => "At", + '#' => "Hash", + '$' => "Dollar", + '%' => "Percent", + '^' => "Carret", + '&' => "And", + '*' => "Star", + '(' => "LParen", + ')' => "RParen", + '+' => "Plus", + '=' => "Eq", + '{' => "LBrace", + '}' => "RBrace", + '[' => "LBracket", + ']' => "RBracket", + ':' => "Colon", + ';' => "SColon", + '<' => "Lt", + '>' => "Gt", + ',' => "Comma", + '.' => "Dot", + '?' => "Question", + '/' => "Slash", + '"' => "DQuote", + '|' => "Or", + '\\' => "BSlash", + '\'' => "SQuote" + } end end diff --git a/src/spectator/dsl.cr b/src/spectator/dsl.cr index ef846c8..65606b5 100644 --- a/src/spectator/dsl.cr +++ b/src/spectator/dsl.cr @@ -3,46 +3,13 @@ require "./example_group" module Spectator module DSL - SPECIAL_CHAR_MAPPING = { - '~' => "Tilde", - '`' => "Tick", - '!' => "Bang", - '@' => "At", - '#' => "Hash", - '$' => "Dollar", - '%' => "Percent", - '^' => "Carret", - '&' => "And", - '*' => "Star", - '(' => "LParen", - ')' => "RParen", - '+' => "Plus", - '=' => "Eq", - '{' => "LBrace", - '}' => "RBrace", - '[' => "LBracket", - ']' => "RBracket", - ':' => "Colon", - ';' => "SColon", - '<' => "Lt", - '>' => "Gt", - ',' => "Comma", - '.' => "Dot", - '?' => "Question", - '/' => "Slash", - '"' => "DQuote", - '|' => "Or", - '\\' => "BSlash", - '\'' => "SQuote" - } - macro describe(what, type = "Describe", &block) context({{what}}, {{type}}) {{block}} end macro context(what, type = "Context", &block) {% parent_module = @type %} - {% safe_name = what.id.stringify.chars.map { |c| SPECIAL_CHAR_MAPPING[c] || c }.join("").gsub(/\W+/, "_") %} + {% safe_name = what.id.stringify.chars.map { |c| ::Spectator::ContextDefinitions::SPECIAL_CHARS[c] || c }.join("").gsub(/\W+/, "_") %} {% module_name = (type.id + safe_name.camelcase).id %} {% absolute_module_name = [parent_module, module_name].join("::").id %} {% what_arg = what.is_a?(StringLiteral) ? what : what.stringify %} @@ -163,7 +130,7 @@ module Spectator macro it(description, &block) {% parent_module = @type %} - {% safe_name = description.id.stringify.chars.map { |c| SPECIAL_CHAR_MAPPING[c] || c }.join("").gsub(/\W+/, "_") %} + {% safe_name = description.id.stringify.chars.map { |c| ::Spectator::ContextDefinitions::SPECIAL_CHARS[c] || c }.join("").gsub(/\W+/, "_") %} {% class_name = (safe_name.camelcase + "Example").id %} {% given_vars = ::Spectator::ContextDefinitions::ALL[parent_module.id][:given] %} {% var_names = given_vars.map { |v| v[:name] } %} @@ -178,7 +145,7 @@ module Spectator class {{class_name.id}} < ::Spectator::Example include Locals - + {% if given_vars.empty? %} def initialize(context) super(context)