grid_generator 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f26be22e443d706a070b3610b275de01024997c550ed65d106afc6193e8fe0f3
-  data.tar.gz: 41ee0e26215d6d6296907a735c93b0a832b9418fd2d1cdf0121404b3db6e8b7c
+  metadata.gz: 22222fe473957054950f616c6000c02a60064192425785a6b59495733f89e8e7
+  data.tar.gz: 940e4285e164e679d52a7f40afb6fc01d774505450b1a38e285baff76cc0cb02
 SHA512:
-  metadata.gz: 6eedfb3bdc00baa6eec0b8173afb35efdafb2e5583a354d128f9e078ddd26e768785bf0a8a3f095b830d8b9f4fc93c131c4191c7c33c779bceb826078a1bdda1
-  data.tar.gz: f9029ee7f2f8c80e72e72a83f7792f5b941075f3d0e074ee8704b8c84cf3342a5c354e006b07c6e7c0e0b486c3702f8c2d89c526a319c0e9a0ce4b4a116355b6
+  metadata.gz: 222aa50cb0c31e3c80283758011b49dde53b442348d5e833dab5cb0b400f386e11814b91a538f009c6fab9331099cd7ae0f3e631fc3c80ff6b7b33fc811068dc
+  data.tar.gz: cd2c7f75557ef04436dfa83327a3282fd1fcb5ebc65526c01d01a52f6af9f3fa35181699485f110ad5fe2ed289e184a862862d719772abaff4ba109f5f84072f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grid_generator (0.3.1)
+    grid_generator (0.3.3)
       matrix (~> 0.4.2)
 
 GEM

data/lib/grid_generator/base_element.rb

@@ -33,7 +33,7 @@ module GridGenerator
     end
 
     def to_svg
-      "<polygon points=\"#{points_string}}\" style=\"fill:#{colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{opacity}\" />"
+      "<polygon points=\"#{points_string}\" style=\"fill:#{colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{opacity}\" />"
     end
   end
 end

data/lib/grid_generator/{line.rb → base_line.rb}

@@ -1,5 +1,10 @@
 module GridGenerator
-  class Line
+  class BaseLine
+    COLOURS = {
+      fill: "#d0d0d0",
+      stroke: "#404040"
+    }
+
     def initialize(a:, b:)
       @a, @b = a, b
     end
@@ -37,6 +42,10 @@ module GridGenerator
     def y2
       b[1,0]
     end
+
+    def to_svg
+      "<line x1=\"#{x1}\" y1=\"#{y1}\" x2=\"#{x2}\" y2=\"#{y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
+    end
   end
 end
 

data/lib/grid_generator/cubic/bordered_grid.rb

@@ -1,5 +1,7 @@
 require 'matrix'
-require_relative '../line'
+require_relative '../svg/polygon'
+require_relative '../svg/style'
+require_relative '../base_line'
 require_relative '../face_parser'
 require_relative 'facing_square_factory'
 
@@ -90,7 +92,7 @@ module GridGenerator
             unit_y(i+1)
           ])
 
-          GridGenerator::Line.new(a: a, b: b)
+          GridGenerator::BaseLine.new(a: a, b: b)
         end
       end
   
@@ -106,7 +108,7 @@ module GridGenerator
             max_y
           ])
 
-          GridGenerator::Line.new(a: a, b: b)
+          GridGenerator::BaseLine.new(a: a, b: b)
         end
       end
   
@@ -128,34 +130,21 @@ module GridGenerator
           Matrix.column_vector([ x, max_y ])
         ]
       end
-  
-      def points_string
-        points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
       end
 
-      def as_json
-        {
-          "points_string" => points_string,
-          "rows" => rows,
-          "columns" => columns,
-          "element_shapes" => element_shapes.map(&:as_json)
-        }
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
       end
 
       def to_svg
-        output = "<polygon points=\"#{points_string}\" style=\"fill:#{COLOURS[:fill]};stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-
-        for row in rows do
-          output += "<line x1=\"#{row.x1}\" y1=\"#{row.y1}\" x2=\"#{row.x2}\" y2=\"#{row.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
+        output = base_shape.to_svg
 
-        for col in columns do
-          output += "<line x1=\"#{col.x1}\" y1=\"#{col.y1}\" x2=\"#{col.x2}\" y2=\"#{col.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
-
-        for shape in element_shapes do
-          output += "<polygon points=\"#{shape.points_string}\" style=\"fill:#{shape.colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{shape.opacity}\" />"
-        end
+        rows.each { |row| output += row.to_svg }
+        columns.each { |col| output += col.to_svg } 
+        element_shapes.each { |shape| output += shape.to_svg } 
 
         output
       end

data/lib/grid_generator/cubic/facing_grid.rb

@@ -1,6 +1,8 @@
 require 'matrix'
+require_relative '../svg/polygon'
+require_relative '../svg/style'
 require_relative '../face_parser'
-require_relative '../line'
+require_relative '../base_line'
 require_relative 'facing_square_factory'
 
 module GridGenerator
@@ -70,7 +72,7 @@ module GridGenerator
             unit_y(i+1)
           ])
 
-          GridGenerator::Line.new(a: a, b: b) 
+          GridGenerator::BaseLine.new(a: a, b: b) 
         end
       end
   
@@ -86,7 +88,7 @@ module GridGenerator
             max_y
           ])
 
-          GridGenerator::Line.new(a: a, b: b)
+          GridGenerator::BaseLine.new(a: a, b: b)
         end
       end
   
@@ -108,34 +110,21 @@ module GridGenerator
           Matrix.column_vector([ x, max_y ])
         ]
       end
-  
-      def points_string
-        points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
       end
 
-      def as_json
-        {
-          "points_string" => points_string,
-          "rows" => rows,
-          "columns" => columns,
-          "element_shapes" => element_shapes.map(&:as_json)
-        }
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
       end
 
       def to_svg
-        output = "<polygon points=\"#{points_string}\" style=\"fill:#{COLOURS[:fill]};stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
- 
-        for row in rows do
-          output += "<line x1=\"#{row.x1}\" y1=\"#{row.y1}\" x2=\"#{row.x2}\" y2=\"#{row.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
- 
-        for col in columns do
-          output += "<line x1=\"#{col.x1}\" y1=\"#{col.y1}\" x2=\"#{col.x2}\" y2=\"#{col.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
- 
-        for shape in element_shapes do
-          output += "<polygon points=\"#{shape.points_string}\" style=\"fill:#{shape.colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{shape.opacity}\" />"
-        end
+        output = base_shape.to_svg
+
+        rows.each { |row| output += row.to_svg }
+        columns.each { |col| output += col.to_svg } 
+        element_shapes.each { |shape| output += shape.to_svg } 
 
         output
       end

data/lib/grid_generator/cubic/grid.rb

@@ -1,5 +1,5 @@
 require 'matrix'
-require_relative '../line'
+require_relative '../base_line'
 
 module GridGenerator
   module Cubic
@@ -108,7 +108,7 @@ module GridGenerator
             row_line_end(i+1)[1,0]
           ])
 
-          GridGenerator::Line.new(a: a, b: b)
+          GridGenerator::BaseLine.new(a: a, b: b)
         end
       end
   
@@ -124,7 +124,7 @@ module GridGenerator
             column_line_end(i+1)[1,0]
           ])
 
-          GridGenerator::Line.new(a: a, b: b)
+          GridGenerator::BaseLine.new(a: a, b: b)
         end
       end
   
@@ -153,34 +153,21 @@ module GridGenerator
           bottom_left
         ]
       end
-  
-      def points_string
-        points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
       end
 
-      def as_json
-        {
-          "points_string" => points_string,
-          "rows" => rows,
-          "columns" => columns,
-          "element_shapes" => element_shapes.map(&:as_json)
-        }
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
       end
 
       def to_svg
-        output = "<polygon points=\"#{points_string}\" style=\"fill:#{COLOURS[:fill]};stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-
-        for row in rows do
-          output += "<line x1=\"#{row.x1}\" y1=\"#{row.y1}\" x2=\"#{row.x2}\" y2=\"#{row.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
+        output = base_shape.to_svg
 
-        for col in columns do
-          output += "<line x1=\"#{col.x1}\" y1=\"#{col.y1}\" x2=\"#{col.x2}\" y2=\"#{col.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
-
-        for shape in element_shapes do
-          output += "<polygon points=\"#{shape.points_string}\" style=\"fill:#{shape.colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{shape.opacity}\" />"
-        end
+        rows.each { |row| output += row.to_svg }
+        columns.each { |col| output += col.to_svg } 
+        element_shapes.each { |shape| output += shape.to_svg } 
 
         output
       end

data/lib/grid_generator/megaminx/face_projection.rb

@@ -1,7 +1,9 @@
 require 'matrix'
+require_relative '../svg/polygon'
+require_relative '../svg/style'
 require_relative '../rotator'
 require_relative '../helper'
-require_relative '../line'
+require_relative '../base_line'
 require_relative 'face_element_factory'
 
 module GridGenerator
@@ -118,7 +120,7 @@ module GridGenerator
           ab_intervals = GridGenerator::Helper.intervals(a,b,2)
           cd_intervals = GridGenerator::Helper.intervals(c,d,2)
 
-          GridGenerator::Line.new(a: ab_intervals[-1], b: cd_intervals[0])
+          GridGenerator::BaseLine.new(a: ab_intervals[-1], b: cd_intervals[0])
         end
       end
 
@@ -132,7 +134,7 @@ module GridGenerator
           ab_intervals = GridGenerator::Helper.intervals(a,b,2)
           cd_intervals = GridGenerator::Helper.intervals(c,d,2)
 
-          GridGenerator::Line.new(a: ab_intervals[-1], b: cd_intervals[0])
+          GridGenerator::BaseLine.new(a: ab_intervals[-1], b: cd_intervals[0])
         end
       end
 
@@ -149,20 +151,20 @@ module GridGenerator
       end
 
       # for svg
-      def decagon_points_string
-        decagon_points.map { |p| offset_rotator.rotate(p) + offset }.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+      def decagon_points_transformed
+        decagon_points.map { |p| offset_rotator.rotate(p) + offset }
       end
 
       # for svg
-      def pentagon_points_string
-        pentagon_points.map { |p| offset_rotator.rotate(p) + offset }.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+      def pentagon_points_transformed
+        pentagon_points.map { |p| offset_rotator.rotate(p) + offset }
       end
 
       # for svg
       def connecting_lines
         pentagon_points.each_with_index.map do |p, i|
           d = decagon_points[i*2]
-          offset_rotator.rotate(GridGenerator::Line.new(a: p, b: d)) + offset
+          offset_rotator.rotate(GridGenerator::BaseLine.new(a: p, b: d)) + offset
         end
       end
 
@@ -210,32 +212,36 @@ module GridGenerator
         end
       end
 
-      def to_svg
-        output = "<polygon points=\"#{ decagon_points_string }\" style=\"fill:#{ COLOURS[:fill] };stroke:#{ COLOURS[:stroke] };stroke-width:1\" />"
-        output += "<polygon points=\"#{ pentagon_points_string }\" style=\"fill:none;stroke:#{ COLOURS[:stroke] };stroke-width:1\" />"
+      def decagon_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
+      end
 
-        for line in connecting_lines do
-          output += "<line x1=\"#{line.x1}\" y1=\"#{line.y1}\" x2=\"#{line.x2}\" y2=\"#{line.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
+      def decagon_shape
+        GridGenerator::Svg::Polygon.new(points: decagon_points_transformed, style: decagon_shape_style)
+      end
 
-        for line in front_face_lines do
-          output += "<line x1=\"#{line.x1}\" y1=\"#{line.y1}\" x2=\"#{line.x2}\" y2=\"#{line.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
+      def pentagon_shape_style
+        GridGenerator::Svg::Style.new(fill: 'none', stroke: COLOURS[:stroke])
+      end
 
-        for face in outside_face_lines do
-          for line in face do
-            output += "<line x1=\"#{line.x1}\" y1=\"#{line.y1}\" x2=\"#{line.x2}\" y2=\"#{line.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-          end
-        end
+      def pentagon_shape
+        GridGenerator::Svg::Polygon.new(points: pentagon_points_transformed, style: pentagon_shape_style)
+      end
+
+      def to_svg
+        output = decagon_shape.to_svg
+        output += pentagon_shape.to_svg
+
+        connecting_lines.each { |line| output += line.to_svg }
 
-        for shape in front_face_element_shapes do
-          output += "<polygon points=\"#{shape.points_string}\" style=\"fill:#{shape.colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{shape.opacity}\" />"
+        front_face_lines.each { |line| output += line.to_svg }
+        outside_face_lines.each do |face|
+          face.each { |line| output += line.to_svg }
         end
 
-        for face in outside_face_element_shapes do
-          for shape in face do
-            output += "<polygon points=\"#{shape.points_string}\" style=\"fill:#{shape.colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{shape.opacity}\" />"
-          end
+        front_face_element_shapes.each { |shape| output += shape.to_svg }
+        outside_face_element_shapes.each do |face|
+          face.each { |shape| output += shape.to_svg }
         end
 
         output

data/lib/grid_generator/pyraminx/face.rb

@@ -1,7 +1,9 @@
-require_relative 'triangle_factory'
+require_relative '../svg/polygon'
+require_relative '../svg/style'
 require_relative '../rotator'
 require_relative '../scaler'
-require_relative '../line'
+require_relative '../base_line'
+require_relative 'triangle_factory'
 
 module GridGenerator
   module Pyraminx
@@ -84,7 +86,7 @@ module GridGenerator
           transformed_1 = rotator.rotate(scaled_1) + offset
           transformed_2 = rotator.rotate(scaled_2) + offset
 
-          GridGenerator::Line.new(a: transformed_1, b: transformed_2) 
+          GridGenerator::BaseLine.new(a: transformed_1, b: transformed_2) 
         end
       end
 
@@ -113,7 +115,7 @@ module GridGenerator
           transformed_1 = rotator.rotate(scaled_1) + offset
           transformed_2 = rotator.rotate(scaled_2) + offset
 
-          GridGenerator::Line.new(a: transformed_1, b: transformed_2) 
+          GridGenerator::BaseLine.new(a: transformed_1, b: transformed_2) 
         end
       end
 
@@ -142,7 +144,7 @@ module GridGenerator
           transformed_1 = rotator.rotate(scaled_1) + offset
           transformed_2 = rotator.rotate(scaled_2) + offset
 
-          GridGenerator::Line.new(a: transformed_1, b: transformed_2) 
+          GridGenerator::BaseLine.new(a: transformed_1, b: transformed_2) 
         end
       end
 
@@ -174,10 +176,6 @@ module GridGenerator
         end
       end
 
-      def points_string
-        points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
-      end
-
       def element_shapes
         elements.map.each_with_index do |row, row_num|
           row.map.each_with_index do |col, col_num|
@@ -196,24 +194,21 @@ module GridGenerator
         end.flatten.compact
       end
 
-      def to_svg
-        output = "<polygon points=\"#{ points_string }\" style=\"fill:#{ COLOURS[:fill] };stroke:#{ COLOURS[:stroke] };stroke-width:1\" />"
-
-        for line in vertical_lines do
-          output += "<line x1=\"#{line.x1}\" y1=\"#{line.y1}\" x2=\"#{line.x2}\" y2=\"#{line.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
+      end
 
-        for line in diagonal_up_lines do
-          output += "<line x1=\"#{line.x1}\" y1=\"#{line.y1}\" x2=\"#{line.x2}\" y2=\"#{line.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
+      end
 
-        for line in diagonal_down_lines do
-          output += "<line x1=\"#{line.x1}\" y1=\"#{line.y1}\" x2=\"#{line.x2}\" y2=\"#{line.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
+      def to_svg
+        output = base_shape.to_svg
 
-        element_shapes.map do |shape|
-          output += "<polygon points=\"#{ shape.points_string }\" style=\"fill:#{ shape.colour };stroke:#{ COLOURS[:stroke] };stroke-width:1;opacity:#{ shape.opacity }\" />"
-        end
+        vertical_lines.each { |line| output += line.to_svg }
+        diagonal_up_lines.each { |line| output += line.to_svg }
+        diagonal_down_lines.each { |line| output += line.to_svg }
+        element_shapes.each { |shape| output += shape.to_svg }
 
         output
       end

data/lib/grid_generator/rotator.rb

@@ -17,12 +17,12 @@ module GridGenerator
       case obj
       when Matrix
         (matrix * (obj - rotation_point)) + rotation_point
-      when GridGenerator::Line
+      when GridGenerator::BaseLine
         new_a = rotate(obj.a)
         new_b = rotate(obj.b)
-        GridGenerator::Line.new(a: new_a, b: new_b)
+        GridGenerator::BaseLine.new(a: new_a, b: new_b)
       else
-        raise ArgumentError, "Object must be Matrix or Line"
+        raise ArgumentError, "Object must be Matrix or BaseLine"
       end
     end
   end

data/lib/grid_generator/skewb/left_skewb_grid.rb

@@ -1,25 +1,20 @@
-require_relative '../line'
+require_relative '../base_line'
 require_relative 'skewb_grid'
 require_relative 'left_element_factory'
 
 module GridGenerator
   module Skewb
     class LeftSkewbGrid < Skewb::SkewbGrid
-      COLOURS = {
-        fill: "#d0d0d0",
-        stroke: "#404040"
-      }
-
       def factory_class
         GridGenerator::Skewb::LeftElementFactory
       end
   
-      def border_points
+      def points
         [
-          [ x, y ],
-          [ x + side_size*2*units, y + side_size*units ],
-          [ x + side_size*2*units, y + side_size*3*units ],
-          [ x, y + side_size*2*units ]
+          Matrix.column_vector([ x, y ]),
+          Matrix.column_vector([ x + side_size*2*units, y + side_size*units ]),
+          Matrix.column_vector([ x + side_size*2*units, y + side_size*3*units ]),
+          Matrix.column_vector([ x, y + side_size*2*units ])
         ]
       end 
   
@@ -35,7 +30,7 @@ module GridGenerator
             y + (3*i+1)*units
           ])
 
-          GridGenerator::Line.new(a: a, b: b) 
+          GridGenerator::BaseLine.new(a: a, b: b) 
         end
       end
   
@@ -51,28 +46,8 @@ module GridGenerator
             y + (-1*i+5)*units
           ])
 
-          GridGenerator::Line.new(a: a, b: b) 
-        end
-      end
-
-      def to_svg
-        output = "<polygon points=\"#{border_points_string}\" style=\"fill:#{COLOURS[:fill]};stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-
-        rows.each do |row|
-          output += "<line x1=\"#{row.x1}\" y1=\"#{row.y1}\" x2=\"#{row.x2}\" y2=\"#{row.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
+          GridGenerator::BaseLine.new(a: a, b: b) 
         end
-
-        columns.each do |col|
-          output += "<line x1=\"#{col.x1}\" y1=\"#{col.y1}\" x2=\"#{col.x2}\" y2=\"#{col.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
-
-        element_shapes.each do |element|
-          if element
-            output += "<polygon points=\"#{element.points_string}\" style=\"fill:#{element.colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{element.opacity}\" />"
-          end
-        end
-
-        output
       end
     end
   end

data/lib/grid_generator/skewb/right_skewb_grid.rb

@@ -1,4 +1,4 @@
-require_relative '../line'
+require_relative '../base_line'
 require_relative '../base_element'
 require_relative 'skewb_grid.rb'
 require_relative 'right_element_factory.rb'
@@ -6,21 +6,16 @@ require_relative 'right_element_factory.rb'
 module GridGenerator
   module Skewb
     class RightSkewbGrid < Skewb::SkewbGrid
-      COLOURS = {
-        fill: "#d0d0d0",
-        stroke: "#404040"
-      }
-
       def factory_class
         GridGenerator::Skewb::RightElementFactory
       end
   
-      def border_points
+      def points
         [
-          [ x, y + side_size*units ],
-          [ x + side_size*2*units, y ],
-          [ x + side_size*2*units, y + side_size*2*units ],
-          [ x, y + side_size*3*units ]
+          Matrix.column_vector([ x, y + side_size*units ]),
+          Matrix.column_vector([ x + side_size*2*units, y ]),
+          Matrix.column_vector([ x + side_size*2*units, y + side_size*2*units ]),
+          Matrix.column_vector([ x, y + side_size*3*units ])
         ]
       end 
   
@@ -36,7 +31,7 @@ module GridGenerator
             y + (i+1)*units
           ])
 
-          GridGenerator::Line.new(a: a, b: b) 
+          GridGenerator::BaseLine.new(a: a, b: b) 
         end
       end
   
@@ -52,28 +47,8 @@ module GridGenerator
             y + (-3*i+5)*units
           ])
 
-          GridGenerator::Line.new(a: a, b: b) 
-        end
-      end
-
-      def to_svg
-        output = "<polygon points=\"#{border_points_string}\" style=\"fill:#{COLOURS[:fill]};stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-
-        rows.each do |row|
-          output += "<line x1=\"#{row.x1}\" y1=\"#{row.y1}\" x2=\"#{row.x2}\" y2=\"#{row.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
+          GridGenerator::BaseLine.new(a: a, b: b) 
         end
-
-        columns.each do |col|
-          output += "<line x1=\"#{col.x1}\" y1=\"#{col.y1}\" x2=\"#{col.x2}\" y2=\"#{col.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
-
-        element_shapes.each do |element|
-          if element
-            output += "<polygon points=\"#{element.points_string}\" style=\"fill:#{element.colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{element.opacity}\" />"
-          end
-        end
-
-        output
       end
     end
   end

data/lib/grid_generator/skewb/skewb_grid.rb

@@ -3,6 +3,11 @@ require_relative '../face_parser'
 module GridGenerator
   module Skewb
     class SkewbGrid
+      COLOURS = {
+        fill: "#d0d0d0",
+        stroke: "#404040"
+      }
+
       def initialize(x:, y:, units: , elements: )
         @x, @y = x, y
         @units = units
@@ -39,10 +44,6 @@ module GridGenerator
         end
       end
   
-      def border_points_string
-        border_points.map { |x| x.join(',') }.join(' ') 
-      end
-  
       def element_shapes
         elements.each_with_index.map do |row, row_num|
           row.each_with_index.map do |col, col_num|
@@ -51,11 +52,22 @@ module GridGenerator
         end.flatten.compact
       end
 
-      def as_json
-        {
-          "border_points_string" => border_points_string,
-          "element_shapes" => element_shapes.map(&:as_json)
-        }
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
+      end
+
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
+      end
+
+      def to_svg
+        output = base_shape.to_svg
+
+        rows.each { |row| output += row.to_svg }
+        columns.each { |col| output += col.to_svg }
+        element_shapes.each { |element| output += element.to_svg if element } 
+
+        output
       end
     end
   end

data/lib/grid_generator/skewb/top_skewb_grid.rb

@@ -1,4 +1,4 @@
-require_relative '../line'
+require_relative '../base_line'
 require_relative '../base_element'
 require_relative 'skewb_grid'
 require_relative 'top_element_factory'
@@ -6,21 +6,16 @@ require_relative 'top_element_factory'
 module GridGenerator
   module Skewb
     class TopSkewbGrid < Skewb::SkewbGrid
-      COLOURS = {
-        fill: "#d0d0d0",
-        stroke: "#404040"
-      }
-
       def factory_class
         GridGenerator::Skewb::TopElementFactory
       end
   
-      def border_points
+      def points
         [
-          [ x + side_size*2*units, y ],
-          [ x + side_size*4*units, y + side_size*units ],
-          [ x + side_size*2*units, y + side_size*2*units ],
-          [ x, y + side_size*units ]
+          Matrix.column_vector([ x + side_size*2*units, y ]),
+          Matrix.column_vector([ x + side_size*4*units, y + side_size*units ]),
+          Matrix.column_vector([ x + side_size*2*units, y + side_size*2*units ]),
+          Matrix.column_vector([ x, y + side_size*units ])
         ]
       end 
   
@@ -36,7 +31,7 @@ module GridGenerator
             y + (2*i+1)*units
           ])
 
-          GridGenerator::Line.new(a: a, b: b) 
+          GridGenerator::BaseLine.new(a: a, b: b) 
         end
       end
   
@@ -52,28 +47,8 @@ module GridGenerator
             y + 3*units
           ])
 
-          GridGenerator::Line.new(a: a, b: b) 
-        end
-      end
-
-      def to_svg
-        output = "<polygon points=\"#{border_points_string}\" style=\"fill:#{COLOURS[:fill]};stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-
-        rows.each do |row|
-          output += "<line x1=\"#{row.x1}\" y1=\"#{row.y1}\" x2=\"#{row.x2}\" y2=\"#{row.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
+          GridGenerator::BaseLine.new(a: a, b: b) 
         end
-
-        columns.each do |col|
-          output += "<line x1=\"#{col.x1}\" y1=\"#{col.y1}\" x2=\"#{col.x2}\" y2=\"#{col.y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
-        end
-
-        element_shapes.each do |element|
-          if element
-            output += "<polygon points=\"#{element.points_string}\" style=\"fill:#{element.colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{element.opacity}\" />"
-          end
-        end
-
-        output
       end
     end
   end

data/lib/grid_generator/square_one/face.rb

@@ -1,4 +1,4 @@
-require_relative '../line'
+require_relative '../base_line'
 require_relative '../square_one_face_parser'
 require_relative 'element_factory'
 
@@ -57,7 +57,7 @@ module GridGenerator
           y+face_size
         ])
 
-        GridGenerator::Line.new(a: a, b: b) 
+        GridGenerator::BaseLine.new(a: a, b: b) 
       end
   
       def back_axis
@@ -71,7 +71,7 @@ module GridGenerator
           y+face_size
         ])
 
-        GridGenerator::Line.new(a: a, b: b) 
+        GridGenerator::BaseLine.new(a: a, b: b) 
       end
   
       def element_shapes
@@ -98,7 +98,7 @@ module GridGenerator
         output = ""
         element_shapes.each do |element|
           if element.opacity == 0.4
-            output += "<polygon points=\"#{ element.points_string }\" style=\"fill:#{ COLOURS[:fill] };stroke:#{ COLOURS[:stroke] };stroke-width:1;opacity:1;]\" />"
+            output += "<polygon points=\"#{ element.points_string }\" style=\"fill:#{ COLOURS[:fill] };stroke:#{ COLOURS[:stroke] };stroke-width:1;opacity:1;\" />"
           end
           output += "<polygon points=\"#{ element.points_string }\" style=\"fill:#{ element.colour };stroke:#{ COLOURS[:stroke] };stroke-width:1;opacity:#{ element.opacity };\" />"
          end

data/lib/grid_generator/svg/polygon.rb

@@ -0,0 +1,21 @@
+module GridGenerator
+  module Svg 
+    class Polygon
+      def initialize(points: , style:)
+        @points = case points
+                  when Array
+                    points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+                  else
+                    points
+                  end
+        @style = style
+      end
+
+      attr_reader :points, :style
+
+      def to_svg
+        "<polygon points=\"#{points}\" style=\"#{style.to_s}\" />"
+      end
+    end
+  end
+end

data/lib/grid_generator/svg/style.rb

@@ -0,0 +1,18 @@
+module GridGenerator
+  module Svg 
+    class Style
+      def initialize(fill: , stroke: , stroke_width: 1, opacity: 1) 
+        @fill = fill
+        @stroke = stroke
+        @stroke_width = stroke_width
+        @opacity = opacity
+      end
+
+      attr_reader :fill, :stroke, :stroke_width, :opacity
+
+      def to_s
+        "fill:#{fill};stroke:#{stroke};stroke-width:#{stroke_width};opacity:#{opacity};"
+      end
+    end
+  end
+end

data/lib/grid_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GridGenerator
-  VERSION = "0.3.1"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-25 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -41,6 +41,7 @@ files:
 - grid_generator.gemspec
 - lib/grid_generator.rb
 - lib/grid_generator/base_element.rb
+- lib/grid_generator/base_line.rb
 - lib/grid_generator/cubic/bordered_grid.rb
 - lib/grid_generator/cubic/facing_grid.rb
 - lib/grid_generator/cubic/facing_square_factory.rb
@@ -53,7 +54,6 @@ files:
 - lib/grid_generator/cubic/units_factory.rb
 - lib/grid_generator/face_parser.rb
 - lib/grid_generator/helper.rb
-- lib/grid_generator/line.rb
 - lib/grid_generator/megaminx/face_element_factory.rb
 - lib/grid_generator/megaminx/face_projection.rb
 - lib/grid_generator/pyraminx/face.rb
@@ -70,6 +70,8 @@ files:
 - lib/grid_generator/square_one/element_factory.rb
 - lib/grid_generator/square_one/face.rb
 - lib/grid_generator/square_one_face_parser.rb
+- lib/grid_generator/svg/polygon.rb
+- lib/grid_generator/svg/style.rb
 - lib/grid_generator/version.rb
 - sig/grid_generator.rbs
 homepage: https://github.com/mrlhumphreys/grid_generator