grid_generator 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f34702803c741397426d5272bc8e8ed3640d6a7742b17ab4e87507053375828b
-  data.tar.gz: 5bbc7b1d5ad4274a04a15a2a5c526b295dbabe36b13f426316c8b4dc19961104
+  metadata.gz: 4ca39eb693f9a8ef806c69a8ad9293912e5f1a8699962939b1a92a2ae644e2cb
+  data.tar.gz: d59e8615cb32f345f745f99cb282d324f9253966a0e08c14c5c30868c4e6a670
 SHA512:
-  metadata.gz: b60517eee3e40b2ab0321151a049f7912627fadc76201cb97dca08ac7799990f9660b42e1a9255f96306b4474f6591b263c75b906d520afbca0b26c3c829010c
-  data.tar.gz: 36e148ca472c8989db168dc251a9a1145945b5465dced8e3d68ed2d86d9a7024f225a2daba6187035b6392c3ea2ca6dd6e9ceb76b4d3e2c679e8f77bfe937c55
+  metadata.gz: 87926ed9d36e9255069fa6b8c16fcf5e310ad283806da1fbe150c574208b32c52f5ba48159092ab0cf38fbdc39ffb1ecbe215602a89729997378c3a261e6a3a7
+  data.tar.gz: c3d6c72ce540b0fe1c265181a74f549a4d2c9fc87de23bf07c33f12d7d8b06e315329ddc9aaac69393c23e3c0129fd2cd0355638b95879a0736a0dbd5af4f6d4

data/Gemfile.lock

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

data/lib/grid_generator/cubic/bordered_grid.rb

@@ -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

@@ -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/grid.rb

@@ -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
@@ -124,8 +123,7 @@ module GridGenerator
                 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/square_factory.rb

@@ -4,12 +4,14 @@ require_relative 'units_factory'
 module GridGenerator
   module Cubic
     class SquareFactory
-      def initialize(x:, y:, width_unit:, height_unit:, offset_unit:, colour:, opacity:)
+      def initialize(x:, y:, width_unit:, height_unit:, offset_unit:, face:)
         @x, @y = x, y
         @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, :width_unit, :height_unit, :offset_unit, :colour, :opacity
@@ -40,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/face_parser.rb

@@ -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

@@ -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

@@ -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

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

data/lib/grid_generator.rb

@@ -44,8 +44,7 @@ module GridGenerator
       width_unit: width_unit,
       height_unit: height_unit,
       offset_unit: offset_unit,
-      colour: args[:colour],
-      opacity: args[:opacity]
+      face: args[:face]
     ).build
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix