From 0f7640411f31c6b12ae222ed8964c330ff922b88 Mon Sep 17 00:00:00 2001 From: Michael Miller Date: Wed, 19 Sep 2018 21:06:10 -0600 Subject: [PATCH] Use symbols instead of strings for hash lookups --- src/spectator/definitions.cr | 2 +- src/spectator/dsl/structure_dsl.cr | 20 ++++++++++---------- src/spectator/examples.cr | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/spectator/definitions.cr b/src/spectator/definitions.cr index b2d7753..608c72a 100644 --- a/src/spectator/definitions.cr +++ b/src/spectator/definitions.cr @@ -1,7 +1,7 @@ module Spectator module Definitions ALL = {} of Path => Object - GROUPS = {} of String => ExampleGroup + GROUPS = {} of Symbol => ExampleGroup SPECIAL_CHARS = { '~' => "Tilde", diff --git a/src/spectator/dsl/structure_dsl.cr b/src/spectator/dsl/structure_dsl.cr index ac1f473..cfaaa68 100644 --- a/src/spectator/dsl/structure_dsl.cr +++ b/src/spectator/dsl/structure_dsl.cr @@ -12,10 +12,10 @@ module Spectator module {{type.id}}%context include {{@type.id}} - ::Spectator::Definitions::GROUPS[\{{@type.stringify}}] = + ::Spectator::Definitions::GROUPS[\{{@type.symbolize}}] = ExampleGroup.new( {{what.is_a?(StringLiteral) ? what : what.stringify}}, - ::Spectator::Definitions::GROUPS[{{@type.stringify}}] + ::Spectator::Definitions::GROUPS[{{@type.symbolize}}] ) {% if what.is_a?(Path) || what.is_a?(Generic) %} @@ -39,11 +39,11 @@ module Spectator end %collection = Collection%collection.new.%to_a - ::Spectator::Definitions::GROUPS[\{{@type.stringify}}] = + ::Spectator::Definitions::GROUPS[\{{@type.symbolize}}] = GivenExampleGroup(typeof(%collection.first)).new( {{collection.stringify}}, %collection, - ::Spectator::Definitions::GROUPS[{{@type.stringify}}] + ::Spectator::Definitions::GROUPS[{{@type.symbolize}}] ) {{block.body}} @@ -99,23 +99,23 @@ module Spectator end macro before_all(&block) - ::Spectator::Definitions::GROUPS[{{@type.stringify}}].before_all_hooks << -> {{block}} + ::Spectator::Definitions::GROUPS[{{@type.symbolize}}].before_all_hooks << -> {{block}} end macro before_each(&block) - ::Spectator::Definitions::GROUPS[{{@type.stringify}}].before_each_hooks << -> {{block}} + ::Spectator::Definitions::GROUPS[{{@type.symbolize}}].before_each_hooks << -> {{block}} end macro after_all(&block) - ::Spectator::Definitions::GROUPS[{{@type.stringify}}].after_all_hooks << -> {{block}} + ::Spectator::Definitions::GROUPS[{{@type.symbolize}}].after_all_hooks << -> {{block}} end macro after_each(&block) - ::Spectator::Definitions::GROUPS[{{@type.stringify}}].after_each_hooks << -> {{block}} + ::Spectator::Definitions::GROUPS[{{@type.symbolize}}].after_each_hooks << -> {{block}} end macro around_each(&block) - ::Spectator::Definitions::GROUPS[{{@type.stringify}}].around_each_hooks << Proc(Proc(Nil), Nil).new {{block}} + ::Spectator::Definitions::GROUPS[{{@type.symbolize}}].around_each_hooks << Proc(Proc(Nil), Nil).new {{block}} end def include_examples @@ -142,7 +142,7 @@ module Spectator end end - %group = ::Spectator::Definitions::GROUPS[{{@type.stringify}}] + %group = ::Spectator::Definitions::GROUPS[\{{@type.symbolize}}] %group.children << Example%example.new(%group) end diff --git a/src/spectator/examples.cr b/src/spectator/examples.cr index 7acfbfd..196bb9a 100644 --- a/src/spectator/examples.cr +++ b/src/spectator/examples.cr @@ -11,6 +11,6 @@ module Spectator given: [] of Object, children: [] of Object } %} - ::Spectator::Definitions::GROUPS[{{@type.stringify}}] = ::Spectator::ExampleGroup::ROOT + ::Spectator::Definitions::GROUPS[{{@type.symbolize}}] = ::Spectator::ExampleGroup::ROOT end end