From b73cdf7da611b644fa084ddf46eb43e75f9e2091 Mon Sep 17 00:00:00 2001 From: Mark Tareshawty Date: Sat, 27 Dec 2014 12:48:53 -0500 Subject: [PATCH] catch if opts[:generator] is nil --- lib/geo_pattern/pattern_generator.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/geo_pattern/pattern_generator.rb b/lib/geo_pattern/pattern_generator.rb index 3c40e52..e8fb367 100644 --- a/lib/geo_pattern/pattern_generator.rb +++ b/lib/geo_pattern/pattern_generator.rb @@ -81,21 +81,21 @@ def generate_background end def generate_pattern - if opts[:generator].is_a? String - generator = PATTERNS[opts[:generator]] - puts SVG.as_comment("String pattern references are deprecated as of 1.3.0") - elsif opts[:generator] < BasePattern - if PATTERNS.values.include? opts[:generator] - generator = opts[:generator] - else - abort("Error: the requested generator is invalid") - generator = nil + unless opts[:generator].nil? + if opts[:generator].is_a? String + generator = PATTERNS[opts[:generator]] + puts SVG.as_comment("String pattern references are deprecated as of 1.3.0") + elsif opts[:generator] < BasePattern + if PATTERNS.values.include? opts[:generator] + generator = opts[:generator] + else + abort("Error: the requested generator is invalid") + generator = nil + end end end - if generator.nil? - generator = PATTERNS.values[[PatternHelpers.hex_val(hash, 20, 1), PATTERNS.length - 1].min] - end + generator ||= PATTERNS.values[[PatternHelpers.hex_val(hash, 20, 1), PATTERNS.length - 1].min] # Instantiate the generator with the needed references # and render the pattern to the svg object