refactor sketch creator and tests

Author: monkstone

CHANGELOG.md

@@ -1,4 +1,4 @@
-**v1.3.0** Not strictly semantic versioning in the sense that the significant internal refactoring of launcher.rb should not be evident to user. Bump to jruby-9.1.8.0 which should be last before jruby-9.2.x.x series (ruby-2.4 here we come).
+**v1.3.0** Not strictly semantic versioning in the sense that the significant internal refactoring of `launcher.rb` (and `sketch_writer.rb`) should not be evident to user. Bump to jruby-9.1.8.0 which should be last before jruby-9.2.x.x series (ruby-2.4 here we come).
 
 **v1.2.9** Grid method now in java (and corrected for step greater than 1). Update to processing-3.3. Update examples to 2.0, which features WOVNS examples that make use of `grid` method and in part caused me to look again a its implementation.
 

lib/jruby_art/creators/sketch_writer.rb

@@ -33,28 +33,34 @@ def initialize(path, args)
   end
 
   def write
-    template = SketchTemplate.template
-    sketch = template.code(param)
+    sketch = SketchFactory.create(param)
     File.open(file, 'w+') { |f| f.write sketch.join("\n") }
   end
 end
 
 # Implements methods and class_methods omits blank line after draw
 # uses private method_lines to format method lines
 class Sketch
+  attr_reader :param, :lines
+
+  def initialize(param)
+    @param = param
+    self
+  end
+
   BLANK ||= ''.freeze
   INDENT ||= '  '.freeze
 
-  def methods(param, indent)
+  def methods(indent)
     lines = []
     lines.concat method_lines('settings', param.sketch_size, indent)
     lines.concat method_lines('setup', param.sketch_title, indent)
     lines.concat method_lines('draw', BLANK, indent)
   end
 
-  def class_methods(param)
+  def class_methods
     lines = [format('class %s < Processing::App', param.class_name)]
-    lines.concat methods(param, INDENT)
+    lines.concat methods(INDENT)
     lines << 'end'
   end
 
@@ -70,37 +76,37 @@ def method_lines(name, content, indent)
 end
 
 # Switch templates on config
-class SketchTemplate
-  def self.template
+class SketchFactory
+  def self.create(param)
     case Processing::RP_CONFIG.fetch('template', 'bare')
     when /bare/
-      return BareSketch.new
+      BareSketch
     when /class/
-      return ClassSketch.new
+      ClassSketch
     when /emacs/
-      return EmacsSketch.new
-    end
+      EmacsSketch
+    end.new(param).code
   end
 end
 
 # The sketch class creates an array of formatted sketch lines
 class BareSketch < Sketch
-  def code(param)
-    methods(param, BLANK)
+  def code
+    methods(BLANK)
   end
 end
 
 # A simple class wrapped sketch
 class ClassSketch < Sketch
-  def code(param)
+  def code
     lines = ['# frozen_string_literal: false', BLANK]
-    lines.concat class_methods(param)
+    lines.concat class_methods
   end
 end
 
 # A sketch that will run with jruby, for emacs etc
 class EmacsSketch < Sketch
-  def code(param)
+  def code
     lines = [
       '# frozen_string_literal: false',
       "require 'jruby_art'",
@@ -109,7 +115,7 @@ def code(param)
       'Processing::App::SKETCH_PATH = __FILE__.freeze',
       BLANK
     ]
-    lines.concat class_methods(param)
+    lines.concat class_methods
     lines << BLANK
     lines << format('%s.new unless defined? $app', param.class_name)
   end

test/create_test.rb

@@ -1,4 +1,4 @@
-gem 'minitest'      # don't use bundled minitest
+gem 'minitest' # don't use bundled minitest
 require 'minitest/autorun'
 require 'minitest/pride'
 
@@ -87,24 +87,24 @@ def test_parameter_new
 
   def test_bare
     result = BARE.split(/\n/, -1)
-    sketch = BareSketch.new.code(@param)
+    sketch = BareSketch.new(@param).code
     sketch.each_with_index do |line, i|
       assert_equal result[i], line
     end
   end
 
   def test_class
     result = CLASS_SKETCH.split(/\n/, -1)
-    class_lines = ClassSketch.new.code(@param)
-    class_lines.each_with_index do |line, i|
+    sketch = ClassSketch.new(@param).code
+    sketch.each_with_index do |line, i|
       assert_equal result[i], line
     end
   end
 
   def test_emacs
     result = EMACS.split(/\n/, -1)
-    class_lines = EmacsSketch.new.code(@param)
-    class_lines.each_with_index do |line, i|
+    sketch = EmacsSketch.new(@param).code
+    sketch.each_with_index do |line, i|
       assert_equal result[i], line
     end
   end