RubyGems - grid_generator - Versions diffs - 0.1.3 → 0.1.5 - Mend

grid_generator 0.1.3 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

checksums.yaml +4 -4
data/Gemfile.lock +1 -1
data/lib/grid_generator/arrows/diagonal_down_arrow.rb +14 -56
data/lib/grid_generator/arrows/diagonal_up_arrow.rb +14 -56
data/lib/grid_generator/arrows/horizontal_arrow.rb +14 -56
data/lib/grid_generator/arrows/vertical_arrow.rb +14 -56
data/lib/grid_generator/cubic/bordered_grid.rb +1 -1
data/lib/grid_generator/cubic/facing_grid.rb +1 -1
data/lib/grid_generator/cubic/front_grid.rb +3 -10
data/lib/grid_generator/cubic/grid.rb +15 -5
data/lib/grid_generator/cubic/right_grid.rb +3 -11
data/lib/grid_generator/cubic/square_factory.rb +9 -6
data/lib/grid_generator/cubic/top_grid.rb +3 -10
data/lib/grid_generator/cubic/units_factory.rb +60 -0
data/lib/grid_generator/face_parser.rb +29 -10
data/lib/grid_generator/megaminx/face.rb +1 -1
data/lib/grid_generator/skewb/skewb_grid.rb +1 -1
data/lib/grid_generator/version.rb +1 -1
data/lib/grid_generator.rb +13 -25
metadata +3 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a0cceb87ba5689dc7511b62911469388ed135b71098c56347fd46a9c43931f6
-  data.tar.gz: 7706d2ec322f0f4c7c25fe06ffc6d160576a10cd2abfd6c6610c1ec05c680d58
+  metadata.gz: 4ca39eb693f9a8ef806c69a8ad9293912e5f1a8699962939b1a92a2ae644e2cb
+  data.tar.gz: d59e8615cb32f345f745f99cb282d324f9253966a0e08c14c5c30868c4e6a670
 SHA512:
-  metadata.gz: 99ed0ce52242914257a430b8b7852c4c4030c3042140833de6d5035031f83ad5c907db7a5af3878d2b0cc2b281cdcf1b36e6899110e0545a38720de70134d101
-  data.tar.gz: 5a332f1ae83315d391604985b2fb9caf3b948886f5fe9b8353f53dbfc40eaeeae80036659b509f18611e189b72a4ecb105385c7063407bdf28c8f25867f1f732
+  metadata.gz: 87926ed9d36e9255069fa6b8c16fcf5e310ad283806da1fbe150c574208b32c52f5ba48159092ab0cf38fbdc39ffb1ecbe215602a89729997378c3a261e6a3a7
+  data.tar.gz: c3d6c72ce540b0fe1c265181a74f549a4d2c9fc87de23bf07c33f12d7d8b06e315329ddc9aaac69393c23e3c0129fd2cd0355638b95879a0736a0dbd5af4f6d4

data/Gemfile.lock CHANGED Viewed

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

data/lib/grid_generator/arrows/diagonal_down_arrow.rb CHANGED Viewed

@@ -8,87 +8,45 @@ module GridGenerator
       def arrow_start_point
         [
-          [
-            x,
-            y+ARROW_SIDE
-          ],
-          [
-            x,
-            y
-          ],
-          [
-            x+ARROW_SIDE,
-            y
-          ]
+          [ x, y+ARROW_SIDE ],
+          [ x, y ],
+          [ x+ARROW_SIDE, y ]
         ]
       end
       def arrow_start_flat
         [
-          [
-            x,
-            y+ARROW_SIDE-(2*ARROW_OVERHANG)
-          ],
-          [
-            x+ARROW_SIDE-(2*ARROW_OVERHANG),
-            y
-          ]
+          [ x, y+ARROW_SIDE-(2*ARROW_OVERHANG) ],
+          [ x+ARROW_SIDE-(2*ARROW_OVERHANG), y ]
         ]
       end
       def arrow_start_side
         [
-          [
-            x+ARROW_SIDE-ARROW_OVERHANG,
-            y+ARROW_OVERHANG
-          ],
-          [
-            x+(ARROW_SIDE-ARROW_OVERHANG)+length,
-            y+length+ARROW_OVERHANG
-          ]
+          [ x+ARROW_SIDE-ARROW_OVERHANG, y+ARROW_OVERHANG ],
+          [ x+(ARROW_SIDE-ARROW_OVERHANG)+length, y+length+ARROW_OVERHANG ]
         ]
       end
       def arrow_end_point
         [
-          [
-            x+ARROW_SIDE+length,
-            y+length
-          ],
-          [
-            x+ARROW_SIDE+length,
-            y+ARROW_SIDE+length
-          ],
-          [
-            x+length,
-            y+ARROW_SIDE+length
-          ]
+          [ x+ARROW_SIDE+length, y+length ],
+          [ x+ARROW_SIDE+length, y+ARROW_SIDE+length ],
+          [ x+length, y+ARROW_SIDE+length ]
         ]
       end
       def arrow_end_flat
         [
-          [
-            x+ARROW_SIDE+length,
-            y+length+(2*ARROW_OVERHANG)
-          ],
-          [
-            x+length+(2*ARROW_OVERHANG),
-            y+ARROW_SIDE+length
-          ]
+          [ x+ARROW_SIDE+length, y+length+(2*ARROW_OVERHANG) ],
+          [ x+length+(2*ARROW_OVERHANG), y+ARROW_SIDE+length ]
         ]
       end
       def arrow_end_side
         [
-          [
-            x+length+ARROW_OVERHANG,
-            y+ARROW_SIDE+length-ARROW_OVERHANG
-          ],
-          [
-            x+ARROW_OVERHANG,
-            y+ARROW_SIDE-ARROW_OVERHANG
-          ]
+          [ x+length+ARROW_OVERHANG, y+ARROW_SIDE+length-ARROW_OVERHANG ],
+          [ x+ARROW_OVERHANG, y+ARROW_SIDE-ARROW_OVERHANG ]
         ]
       end

data/lib/grid_generator/arrows/diagonal_up_arrow.rb CHANGED Viewed

@@ -8,87 +8,45 @@ module GridGenerator
       def arrow_start_point
         [
-          [
-            x+ARROW_SIDE,
-            y+length+ARROW_SIDE
-          ],
-          [
-            x,
-            y+length+ARROW_SIDE
-          ],
-          [
-            x,
-            y+length
-          ]
+          [ x+ARROW_SIDE, y+length+ARROW_SIDE ],
+          [ x, y+length+ARROW_SIDE ],
+          [ x, y+length ]
         ]
       end
       def arrow_start_flat
         [
-          [
-            x+ARROW_SIDE-(2*ARROW_OVERHANG),
-            y+length+ARROW_SIDE
-          ],
-          [
-            x,
-            y+length+(2*ARROW_OVERHANG)
-          ]
+          [ x+ARROW_SIDE-(2*ARROW_OVERHANG), y+length+ARROW_SIDE ],
+          [ x, y+length+(2*ARROW_OVERHANG) ]
         ]
       end
       def arrow_start_side
         [
-          [
-            x+ARROW_OVERHANG,
-            y+length+ARROW_OVERHANG
-          ],
-          [
-            x+length+ARROW_OVERHANG,
-            y+ARROW_OVERHANG
-          ]
+          [ x+ARROW_OVERHANG, y+length+ARROW_OVERHANG ],
+          [ x+length+ARROW_OVERHANG, y+ARROW_OVERHANG ]
         ]
       end
       def arrow_end_point
         [
-          [
-            x+length,
-            y
-          ],
-          [
-            x+length+ARROW_SIDE,
-            y
-          ],
-          [
-            x+length+ARROW_SIDE,
-            y+ARROW_SIDE
-          ]
+          [ x+length, y ],
+          [ x+length+ARROW_SIDE, y ],
+          [ x+length+ARROW_SIDE, y+ARROW_SIDE ]
         ]
       end
       def arrow_end_flat
         [
-          [
-            x+length+(2*ARROW_OVERHANG),
-            y
-          ],
-          [
-            x+length+ARROW_SIDE,
-            y+ARROW_SIDE-(2*ARROW_OVERHANG)
-          ]
+          [ x+length+(2*ARROW_OVERHANG), y ],
+          [ x+length+ARROW_SIDE, y+ARROW_SIDE-(2*ARROW_OVERHANG) ]
         ]
       end
       def arrow_end_side
         [
-          [
-            x+length+ARROW_SIDE-ARROW_OVERHANG,
-            y+ARROW_SIDE-ARROW_OVERHANG
-          ],
-          [
-            x+ARROW_SIDE-ARROW_OVERHANG,
-            y+length+ARROW_SIDE-ARROW_OVERHANG
-          ]
+          [ x+length+ARROW_SIDE-ARROW_OVERHANG, y+ARROW_SIDE-ARROW_OVERHANG ],
+          [ x+ARROW_SIDE-ARROW_OVERHANG, y+length+ARROW_SIDE-ARROW_OVERHANG ]
         ]
       end

data/lib/grid_generator/arrows/horizontal_arrow.rb CHANGED Viewed

@@ -9,87 +9,45 @@ module GridGenerator
       def arrow_start_point
         [
-          [
-            x+ARROW_LENGTH,
-            y+ARROW_WIDTH
-          ],
-          [
-            x,
-            y+(ARROW_WIDTH/2)
-          ],
-          [
-            x+ARROW_LENGTH,
-            y
-          ]
+          [ x+ARROW_LENGTH, y+ARROW_WIDTH ],
+          [ x, y+(ARROW_WIDTH/2) ],
+          [ x+ARROW_LENGTH, y ]
         ]
       end
       def arrow_start_flat
         [
-          [
-            x,
-            y+(ARROW_WIDTH/2)+(LINE_WIDTH/2)
-          ],
-          [
-            x,
-            y+(ARROW_WIDTH/2)-(LINE_WIDTH/2)
-          ]
+          [ x, y+(ARROW_WIDTH/2)+(LINE_WIDTH/2) ],
+          [ x, y+(ARROW_WIDTH/2)-(LINE_WIDTH/2) ]
         ]
       end
       def arrow_start_side
         [
-          [
-            x+ARROW_LENGTH,
-            y+(ARROW_WIDTH/2)-(LINE_WIDTH/2)
-          ],
-          [
-            x+ARROW_LENGTH+length,
-            y+(ARROW_WIDTH/2)-(LINE_WIDTH/2)
-          ]
+          [ x+ARROW_LENGTH, y+(ARROW_WIDTH/2)-(LINE_WIDTH/2) ],
+          [ x+ARROW_LENGTH+length, y+(ARROW_WIDTH/2)-(LINE_WIDTH/2) ]
         ]
       end
       def arrow_end_point
         [
-          [
-            x+ARROW_LENGTH+length,
-            y
-          ],
-          [
-            x+(2*ARROW_LENGTH)+length,
-            y+(ARROW_WIDTH/2)
-          ],
-          [
-            x+ARROW_LENGTH+length,
-            y+ARROW_WIDTH
-          ]
+          [ x+ARROW_LENGTH+length, y ],
+          [ x+(2*ARROW_LENGTH)+length, y+(ARROW_WIDTH/2) ],
+          [ x+ARROW_LENGTH+length, y+ARROW_WIDTH ]
         ]
       end
       def arrow_end_flat
         [
-          [
-            x+(2*ARROW_LENGTH)+length,
-            y+(ARROW_WIDTH/2)-(LINE_WIDTH/2)
-          ],
-          [
-            x+(2*ARROW_LENGTH)+length,
-            y+(ARROW_WIDTH/2)+(LINE_WIDTH/2)
-          ]
+          [ x+(2*ARROW_LENGTH)+length, y+(ARROW_WIDTH/2)-(LINE_WIDTH/2) ],
+          [ x+(2*ARROW_LENGTH)+length, y+(ARROW_WIDTH/2)+(LINE_WIDTH/2) ]
         ]
       end
       def arrow_end_side
         [
-          [
-            x+ARROW_LENGTH+length,
-            y+(ARROW_WIDTH/2)+(LINE_WIDTH/2)
-          ],
-          [
-            x+ARROW_LENGTH,
-            y+(ARROW_WIDTH/2)+(LINE_WIDTH/2)
-          ]
+          [ x+ARROW_LENGTH+length, y+(ARROW_WIDTH/2)+(LINE_WIDTH/2) ],
+          [ x+ARROW_LENGTH, y+(ARROW_WIDTH/2)+(LINE_WIDTH/2) ]
         ]
       end

data/lib/grid_generator/arrows/vertical_arrow.rb CHANGED Viewed

@@ -9,87 +9,45 @@ module GridGenerator
       def arrow_start_point
         [
-          [
-            x,
-            y+ARROW_LENGTH
-          ],
-          [
-            x+(ARROW_WIDTH/2),
-            y
-          ],
-          [
-            x+ARROW_WIDTH,
-            y+ARROW_LENGTH
-          ]
+          [ x, y+ARROW_LENGTH ],
+          [ x+(ARROW_WIDTH/2), y ],
+          [ x+ARROW_WIDTH, y+ARROW_LENGTH ]
         ]
       end
       def arrow_start_flat
         [
-          [
-            x+(ARROW_WIDTH/2)-(LINE_WIDTH/2),
-            y
-          ],
-          [
-            x+(ARROW_WIDTH/2)+(LINE_WIDTH/2),
-            y
-          ]
+          [ x+(ARROW_WIDTH/2)-(LINE_WIDTH/2), y ],
+          [ x+(ARROW_WIDTH/2)+(LINE_WIDTH/2), y ]
         ]
       end
       def arrow_start_side
         [
-          [
-            x+(ARROW_WIDTH/2)+(LINE_WIDTH/2),
-            y+ARROW_LENGTH
-          ],
-          [
-            x+(ARROW_WIDTH/2)+(LINE_WIDTH/2),
-            y+ARROW_LENGTH+length
-          ]
+          [ x+(ARROW_WIDTH/2)+(LINE_WIDTH/2), y+ARROW_LENGTH ],
+          [ x+(ARROW_WIDTH/2)+(LINE_WIDTH/2), y+ARROW_LENGTH+length ]
         ]
       end
       def arrow_end_point
         [
-          [
-            x+ARROW_WIDTH,
-            y+ARROW_LENGTH+length
-          ],
-          [
-            x+(ARROW_WIDTH/2),
-            y+(ARROW_LENGTH*2)+length
-          ],
-          [
-            x,
-            y+ARROW_LENGTH+length
-          ]
+          [ x+ARROW_WIDTH, y+ARROW_LENGTH+length ],
+          [ x+(ARROW_WIDTH/2), y+(ARROW_LENGTH*2)+length ],
+          [ x, y+ARROW_LENGTH+length ]
         ]
       end
       def arrow_end_flat
         [
-          [
-            x+(ARROW_WIDTH/2)+(LINE_WIDTH/2),
-            y+(2*ARROW_LENGTH)+length
-          ],
-          [
-            x+(ARROW_WIDTH/2)-(LINE_WIDTH/2),
-            y+(2*ARROW_LENGTH)+length
-          ]
+          [ x+(ARROW_WIDTH/2)+(LINE_WIDTH/2), y+(2*ARROW_LENGTH)+length ],
+          [ x+(ARROW_WIDTH/2)-(LINE_WIDTH/2), y+(2*ARROW_LENGTH)+length ]
         ]
       end
       def arrow_end_side
         [
-          [
-            x+(ARROW_WIDTH/2)-(LINE_WIDTH/2),
-            y+ARROW_LENGTH+length
-          ],
-          [
-            x+(ARROW_WIDTH/2)-(LINE_WIDTH/2),
-            y+ARROW_LENGTH
-          ]
+          [ x+(ARROW_WIDTH/2)-(LINE_WIDTH/2), y+ARROW_LENGTH+length ],
+          [ x+(ARROW_WIDTH/2)-(LINE_WIDTH/2), y+ARROW_LENGTH ]
         ]
       end

data/lib/grid_generator/cubic/bordered_grid.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module GridGenerator
         @units = units
         @squares = case squares
         when String
-          FaceParser.new(squares).to_a
+          FaceParser.new(squares).parse
         when Array
           squares
         else

data/lib/grid_generator/cubic/facing_grid.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module GridGenerator
         @units = units
         @squares = case squares
         when String
-          FaceParser.new(squares).to_a
+          FaceParser.new(squares).parse
         when Array
           squares
         else

data/lib/grid_generator/cubic/front_grid.rb CHANGED Viewed

@@ -1,18 +1,11 @@
 require_relative 'grid'
+require_relative 'units_factory'
 module GridGenerator
   module Cubic
     class FrontGrid < GridGenerator::Cubic::Grid
-      def width_unit
-        @width_unit ||= Matrix.column_vector([units, units/2])
-      end
-      def height_unit
-        @height_unit ||= Matrix.column_vector([0, units])
-      end
-      def offset_unit
-        @offset_unit ||= Matrix.column_vector([0,0])
+      def side
+        :front
       end
       def line_offset_amount

data/lib/grid_generator/cubic/grid.rb CHANGED Viewed

@@ -1,5 +1,4 @@
 require 'matrix'
-require_relative '../face_parser'
 require_relative '../base_line'
 module GridGenerator
@@ -10,7 +9,7 @@ module GridGenerator
         @units = units
         @squares = case squares
         when String
-          FaceParser.new(squares).to_a
+          squares.split('\n').map { |r| r.split(',') }
         when Array
           squares
         else
@@ -34,6 +33,19 @@ module GridGenerator
       def height
         @height ||= squares.size
       end
+      # units
+      def width_unit
+        @width_unit ||= GridGenerator::Cubic::UnitsFactory.new(side: side, type: :width, units: units).build
+      end
+      def height_unit
+        @height_unit ||= GridGenerator::Cubic::UnitsFactory.new(side: side, type: :height, units: units).build
+      end
+      def offset_unit
+        @offset_unit ||= GridGenerator::Cubic::UnitsFactory.new(side: side, type: :offset, units: units).build
+      end
       # positioning squares
@@ -108,12 +120,10 @@ module GridGenerator
               GridGenerator::Cubic::SquareFactory.new(
                 x: square_position(row_num, col_num)[0,0],
                 y: square_position(row_num, col_num)[1,0],
-                units: units,
                 width_unit: width_unit,
                 height_unit: height_unit,
                 offset_unit: offset_unit,
-                colour: col[:colour],
-                opacity: col[:opacity]
+                face: col
               ).build
             end
           end

data/lib/grid_generator/cubic/right_grid.rb CHANGED Viewed

@@ -3,18 +3,10 @@ require_relative 'grid'
 module GridGenerator
   module Cubic
     class RightGrid < Cubic::Grid
-      def width_unit
-        @width_unit ||= Matrix.column_vector([units, (units*-0.5).to_i])
+      def side
+        :right
       end
-      def height_unit
-        @height_unit ||= Matrix.column_vector([0, units])
-      end
-      def offset_unit
-        @offset_unit ||= Matrix.column_vector([0,(units*0.5).to_i])
-      end
       def line_offset_amount
         width
       end

data/lib/grid_generator/cubic/square_factory.rb CHANGED Viewed

@@ -1,17 +1,20 @@
 require_relative '../base_element'
+require_relative 'units_factory'
 module GridGenerator
   module Cubic
     class SquareFactory
-      def initialize(x:, y:, units:, width_unit:, height_unit:, offset_unit:, colour:, opacity:)
+      def initialize(x:, y:, width_unit:, height_unit:, offset_unit:, face:)
         @x, @y = x, y
-        @units = units
-        @width_unit, @height_unit = width_unit, height_unit
+        @width_unit = width_unit
+        @height_unit = height_unit
         @offset_unit = offset_unit
-        @colour, @opacity = colour, opacity
+        face_attr = FaceParser.new(face).parse
+        @colour = face_attr && face_attr[:colour]
+        @opacity = face_attr && face_attr[:opacity]
       end
-      attr_reader :x, :y, :units, :width_unit, :height_unit, :offset_unit, :colour, :opacity
+      attr_reader :x, :y, :width_unit, :height_unit, :offset_unit, :colour, :opacity
       def top_left
         Matrix.column_vector([x, y]) + offset_unit
@@ -39,7 +42,7 @@ module GridGenerator
       end
       def build
-        GridGenerator::BaseElement.new(points: points, colour: colour, opacity: opacity)
+        GridGenerator::BaseElement.new(points: points, colour: colour, opacity: opacity) unless colour.nil?
       end
     end
   end

data/lib/grid_generator/cubic/top_grid.rb CHANGED Viewed

@@ -1,18 +1,11 @@
 require_relative 'grid'
+require_relative 'units_factory'
 module GridGenerator
   module Cubic
     class TopGrid < Cubic::Grid
-      def width_unit
-        @width_unit ||= Matrix.column_vector([units, units/2])
-      end
-      def height_unit
-        @height_unit ||= Matrix.column_vector([-units, units/2])
-      end
-      def offset_unit
-        @offset_unit ||= Matrix.column_vector([units,0])
+      def side
+        :top
       end
       def line_offset_amount

data/lib/grid_generator/cubic/units_factory.rb ADDED Viewed

@@ -0,0 +1,60 @@
+module GridGenerator
+  module Cubic
+    class UnitsFactory
+      def initialize(side:, type:, units:)
+        raise ArgumentError "Unknown Side" unless [:top, :front, :right].include?(side)
+        raise ArgumentError "Unknown Type" unless [:width, :height, :offset].include?(type)
+        @side = side
+        @type = type
+        @units = units
+      end
+      attr_reader :side, :type, :units
+      def top_unit
+        case type
+        when :width
+          Matrix.column_vector([units, units/2])
+        when :height
+          Matrix.column_vector([-units, units/2])
+        when :offset
+          Matrix.column_vector([units,0])
+        end
+      end
+      def front_unit
+        case type
+        when :width
+          Matrix.column_vector([units, units/2])
+        when :height
+          Matrix.column_vector([0, units])
+        when :offset
+          Matrix.column_vector([0,0])
+        end
+      end
+      def right_unit
+        case type
+        when :width
+          Matrix.column_vector([units, (units*-0.5).to_i])
+        when :height
+          Matrix.column_vector([0, units])
+        when :offset
+          Matrix.column_vector([0,(units*0.5).to_i])
+        end
+      end
+      def build
+        case side
+        when :top
+          top_unit
+        when :front
+          front_unit
+        when :right
+          right_unit
+        end
+      end
+    end
+  end
+end

data/lib/grid_generator/face_parser.rb CHANGED Viewed

@@ -12,7 +12,10 @@ module GridGenerator
       's' => '#8080ff',
       'l' => '#80ff80',
       'p' => '#800080',
-      'pi' => '#ff8080'
+      'pi' => '#ff8080',
+      'fu' => "#f0f0f0", # face up
+      'ff' => "#d0d0d0", # face front
+      'fr' => "#b0b0b0"  # face right
     }
     OPACITY = {
@@ -23,19 +26,35 @@ module GridGenerator
     def initialize(string)
       @string = string
     end
+    def single?
+      @string.length == 1
+    end
     attr_reader :string
+    def parse
+      if single?
+        parse_char(string)
+      else
+        parse_array(string)
+      end
+    end
-    def to_a
-      string.split(/\\n/).map do |line|
+    def parse_char(char)
+      if char == '-'
+        nil
+      else
+        colour = COLOURS[char.downcase]
+        opacity = OPACITY[(/[[:upper:]]/.match(char) ? :full : :faded)]
+        { colour: colour, opacity: opacity }
+      end
+    end
+    def parse_array(str)
+      str.split(/\\n/).map do |line|
         line.split(',').map(&:strip).map do |col|
-          if col == '-'
-            nil
-          else
-            colour = COLOURS[col.downcase]
-            opacity = OPACITY[(/[[:upper:]]/.match(col) ? :full : :faded)]
-            { colour: colour, opacity: opacity }
-          end
+          parse_char(col)
         end
       end
     end

data/lib/grid_generator/megaminx/face.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module GridGenerator
       def initialize(x:, y: , units: , elements: , rotation_offset: 0, label: nil)
         @x, @y = x, y
         @units = units
-        @elements = FaceParser.new(elements).to_a
+        @elements = FaceParser.new(elements).parse
         @rotation_offset = rotation_offset
         @label = label
       end

data/lib/grid_generator/skewb/skewb_grid.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module GridGenerator
         @units = units
         @elements = case elements
         when String
-          FaceParser.new(elements).to_a
+          FaceParser.new(elements).parse
         when Array
           elements
         else

data/lib/grid_generator/version.rb CHANGED Viewed

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

data/lib/grid_generator.rb CHANGED Viewed

@@ -25,18 +25,6 @@ module GridGenerator
     Cubic::IsoView.new(**args)
   end
-  def self.top_grid(args)
-    Cubic::TopGrid.new(**args)
-  end
-  def self.front_grid(args)
-    Cubic::FrontGrid.new(**args)
-  end
-  def self.right_grid(args)
-    Cubic::RightGrid.new(**args)
-  end
   def self.facing_grid(args)
     Cubic::FacingGrid.new(**args)
   end
@@ -45,19 +33,19 @@ module GridGenerator
     Cubic::BorderedGrid.new(**args)
   end
-  def self.top_square(args)
-    #??
-    Cubic::TopSquareFactory.new(**args).build
-  end
-  def self.front_square(args)
-    #??
-    Cubic::FrontSquareFactory.new(**args).build
-  end
-  def self.right_square(args)
-    #??
-    Cubic::RightSquareFactory.new(**args).build
+  def self.square(args)
+    width_unit = GridGenerator::Cubic::UnitsFactory.new(side: args[:side], type: :width, units: args[:units]).build
+    height_unit = GridGenerator::Cubic::UnitsFactory.new(side: args[:side], type: :height, units: args[:units]).build
+    offset_unit = GridGenerator::Cubic::UnitsFactory.new(side: args[:side], type: :offset, units: args[:units]).build
+    GridGenerator::Cubic::SquareFactory.new(
+      x: args[:x],
+      y: args[:y],
+      width_unit: width_unit,
+      height_unit: height_unit,
+      offset_unit: offset_unit,
+      face: args[:face]
+    ).build
   end
   def self.top_skewb_grid(args)

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -56,6 +56,7 @@ files:
 - lib/grid_generator/cubic/right_grid.rb
 - lib/grid_generator/cubic/square_factory.rb
 - lib/grid_generator/cubic/top_grid.rb
+- lib/grid_generator/cubic/units_factory.rb
 - lib/grid_generator/face_parser.rb
 - lib/grid_generator/megaminx/common.rb
 - lib/grid_generator/megaminx/element_factory.rb