grid_generator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c37d1d10aae708a8406359d0082de82ab9426d760bc34ddfd34f916e55b86776
-  data.tar.gz: 227df89f4324e8418afef7eb1705d3a19205095d3be359bf6ee9d7f7981a8f37
+  metadata.gz: e6f97c8ba195b68150195c0f9c90ca93dccc6c56bb5b466336b2065b7473c9ac
+  data.tar.gz: df39197455ecf27cd3d0076ea823c896bc3b0921e0df7465a0ea9cabe35e3d06
 SHA512:
-  metadata.gz: 1280447a17b87c59ec84b81105f20607167f535b0660c43b39ec2d7db719fc92a8027a2f52efd04e6d5afae1660f4755c6cc1e3cc7a5543ea5eb6a9700534cc7
-  data.tar.gz: efcfe14dcfce8a2ef7927a00f032a7c4bd64d631ec5981da629a344093282a2a2e8bec2aac402b298abdb94926142433c1846ff5b4eed66b2640f8133bc8e122
+  metadata.gz: fea3c95d57111ef8b85ada074e70b564bbddf8242c7983b596df9dd640f3d43670fe45ceeca6c20fef5e57cfdc76be8805f9c4acd4402f2a89eae1ea3107e23b
+  data.tar.gz: 7fc49ccb79bea5b62b40a42c36a1698cbd7b0437bf852fc90ae48d0b0c1377e2152d28edc099a93bf80b4811931baab49226bf6635905f43f8adb5b5d393c0c9

data/Gemfile.lock

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

data/lib/grid_generator/base_line.rb

@@ -0,0 +1,26 @@
+module GridGenerator
+  class BaseLine
+    def initialize(x1:, y1:, x2:, y2:)
+      @x1, @y1 = x1, y1
+      @x2, @y2 = x2, y2
+    end
+
+    attr_reader :x1, :y1, :x2, :y2
+
+    def ==(other)
+      self.x1 == other.x1 &&
+        self.y1 == other.y1 &&
+        self.x2 == other.x2 &&
+        self.y2 == other.y2
+    end
+
+    def as_json
+      {
+        "x1" => x1,
+        "y1" => y1,
+        "x2" => x2,
+        "y2" => y2
+      }
+    end
+  end
+end

data/lib/grid_generator/cubic/bordered_grid.rb

@@ -1,4 +1,5 @@
 require_relative '../face_parser'
+require_relative '../base_element'
 require_relative 'facing_square_factory'
 
 module GridGenerator
@@ -73,23 +74,23 @@ module GridGenerator
   
       def rows
         Array.new(height) do |i|
-          {
-            "x1" => x,
-            "y1" => unit_y(i+1),
-            "x2" => max_x,
-            "y2" => unit_y(i+1)
-          }
+          GridGenerator::BaseLine.new(
+            x1: x,
+            y1: unit_y(i+1),
+            x2: max_x,
+            y2: unit_y(i+1)
+          ) 
         end
       end
   
       def columns 
         Array.new(width) do |i|
-          {
-            "x1" => unit_x(i+1),
-            "y1" => y,
-            "x2" => unit_x(i+1),
-            "y2" => max_y
-          }
+          GridGenerator::BaseLine.new(
+            x1: unit_x(i+1),
+            y1: y,
+            x2: unit_x(i+1),
+            y2: max_y
+          ) 
         end
       end
   

data/lib/grid_generator/cubic/facing_grid.rb

@@ -1,4 +1,5 @@
 require_relative '../face_parser'
+require_relative '../base_line'
 require_relative 'facing_square_factory'
 
 module GridGenerator
@@ -53,23 +54,23 @@ module GridGenerator
   
       def rows
         Array.new(height) do |i|
-          {
-            "x1" => x,
-            "y1" => unit_y(i+1),
-            "x2" => max_x,
-            "y2" => unit_y(i+1)
-          }
+          GridGenerator::BaseLine.new( 
+            x1: x,
+            y1: unit_y(i+1),
+            x2: max_x,
+            y2: unit_y(i+1)
+          ) 
         end
       end
   
       def columns 
         Array.new(width) do |i|
-          {
-            "x1" => unit_x(i+1),
-            "y1" => y,
-            "x2" => unit_x(i+1),
-            "y2" => max_y
-          }
+          GridGenerator::BaseLine.new(
+            x1: unit_x(i+1),
+            y1: y,
+            x2: unit_x(i+1),
+            y2: max_y
+          ) 
         end
       end
   

data/lib/grid_generator/cubic/grid.rb

@@ -1,5 +1,6 @@
 require 'matrix'
 require_relative '../face_parser'
+require_relative '../base_line'
 
 module GridGenerator
   module Cubic
@@ -80,23 +81,23 @@ module GridGenerator
   
       def rows
         Array.new(height) do |i|
-          {
-            "x1" => row_line_start(i+1)[0,0],
-            "y1" => row_line_start(i+1)[1,0],
-            "x2" => row_line_end(i+1)[0,0],
-            "y2" => row_line_end(i+1)[1,0]
-          }
+          GridGenerator::BaseLine.new(
+            x1: row_line_start(i+1)[0,0],
+            y1: row_line_start(i+1)[1,0],
+            x2: row_line_end(i+1)[0,0],
+            y2: row_line_end(i+1)[1,0]
+          )
         end
       end
   
       def columns 
         Array.new(width) do |i|
-          {
-            "x1" => column_line_start(i+1)[0,0],
-            "y1" => column_line_start(i+1)[1,0],
-            "x2" => column_line_end(i+1)[0,0],
-            "y2" => column_line_end(i+1)[1,0]
-          }
+          GridGenerator::BaseLine.new(
+            x1: column_line_start(i+1)[0,0],
+            y1: column_line_start(i+1)[1,0],
+            x2: column_line_end(i+1)[0,0],
+            y2: column_line_end(i+1)[1,0]
+          )
         end
       end
   

data/lib/grid_generator/pyraminx/grid.rb

@@ -1,3 +1,4 @@
+require_relative '../base_line'
 require_relative 'triangle_factory'
 
 module GridGenerator
@@ -27,34 +28,34 @@ module GridGenerator
     
       def vertical_line_points
         Array.new((2*size)-1) do |i|
-          { 
-            "x1" => x+((i+1)-size).abs*units, 
-            "y1" => y+(i+1)*units,  
-            "x2" => x+((((i+1)-size).abs*-1)+2*size)*units,
-            "y2" => y+(i+1)*units 
-          }
+          GridGenerator::BaseLine.new( 
+            x1: x+((i+1)-size).abs*units, 
+            y1: y+(i+1)*units,  
+            x2: x+((((i+1)-size).abs*-1)+2*size)*units,
+            y2: y+(i+1)*units 
+          ) 
         end
       end
     
       def diagonal_down_line_points
         Array.new(size-1) do |i|
-          {
-            "x1" => x+((i-1).abs + 1)*units,
-            "y1" => y+(i+1)*units,
-            "x2" => x+((i-1).abs + 1 + size)*units,
-            "y2" => y+(i+1+size)*units
-          }
+          GridGenerator::BaseLine.new( 
+            x1: x+((i-1).abs + 1)*units,
+            y1: y+(i+1)*units,
+            x2: x+((i-1).abs + 1 + size)*units,
+            y2: y+(i+1+size)*units
+          ) 
         end
       end
     
       def diagonal_up_line_points
         Array.new(size-1) do |i|
-          {
-            "x1" => x+(i+1)*units,
-            "y1" => y+(i+1+size)*units,
-            "x2" => x+(i+1+size)*units,
-            "y2" => y+(i+1)*units
-          }
+          GridGenerator::BaseLine.new( 
+            x1: x+(i+1)*units,
+            y1: y+(i+1+size)*units,
+            x2: x+(i+1+size)*units,
+            y2: y+(i+1)*units
+          ) 
         end
       end
     

data/lib/grid_generator/skewb/left_skewb_grid.rb

@@ -1,3 +1,4 @@
+require_relative '../base_line'
 require_relative 'skewb_grid'
 require_relative 'left_element_factory'
 
@@ -19,23 +20,23 @@ module GridGenerator
   
       def rows
         Array.new(side_size) do |i|
-          { 
+          GridGenerator::BaseLine.new( 
             x1: x + (2*i)*units,
             y1: y + (3*i+2)*units,
             x2: x + (2*i+2)*units,
             y2: y + (3*i+1)*units
-          }
+          ) 
         end
       end
   
       def columns
         Array.new(side_size) do |i|
-          { 
+          GridGenerator::BaseLine.new( 
             x1: x + (2*i)*units,
             y1: y + (-1*i+2)*units,
             x2: x + (i+1)*2*units,
             y2: y + (-1*i+5)*units
-          }
+          ) 
         end
       end
     end

data/lib/grid_generator/skewb/right_skewb_grid.rb

@@ -1,3 +1,4 @@
+require_relative '../base_element'
 require_relative 'skewb_grid.rb'
 require_relative 'right_element_factory.rb'
 
@@ -19,23 +20,23 @@ module GridGenerator
   
       def rows
         Array.new(side_size) do |i|
-          { 
+          GridGenerator::BaseLine.new( 
             x1: x + (2*i)*units,
             y1: y + (i+4)*units,
             x2: x + (2*i+2)*units,
             y2: y + (i+1)*units
-          }
+          ) 
         end
       end
   
       def columns
         Array.new(side_size) do |i|
-          { 
+          GridGenerator::BaseLine.new( 
             x1: x + (2*i)*units,
             y1: y + (-3*i+4)*units,
             x2: x + (i+1)*2*units,
             y2: y + (-3*i+5)*units
-          }
+          ) 
         end
       end
     end

data/lib/grid_generator/skewb/top_skewb_grid.rb

@@ -1,3 +1,4 @@
+require_relative '../base_element'
 require_relative 'skewb_grid'
 require_relative 'top_element_factory'
 
@@ -19,23 +20,23 @@ module GridGenerator
   
       def rows
         Array.new(side_size) do |i|
-          { 
+          GridGenerator::BaseLine.new( 
             x1: x + 2*units,
             y1: y + (2*i+1)*units,
             x2: x + 6*units,
             y2: y + (2*i+1)*units
-          }
+          ) 
         end
       end
   
       def columns
         Array.new(side_size) do |i|
-          { 
+          GridGenerator::BaseLine.new( 
             x1: x + (4*i+2)*units,
             y1: y + units,
             x2: x + (4*i+2)*units,
             y2: y + 3*units
-          }
+          ) 
         end
       end
     end

data/lib/grid_generator/square_one/face.rb

@@ -1,3 +1,4 @@
+require_relative '../base_line'
 require_relative '../square_one_face_parser'
 require_relative 'element_factory'
 
@@ -41,21 +42,21 @@ module GridGenerator
       end
   
       def forward_axis
-        {
+        GridGenerator::BaseLine.new( 
           x1: x+half_face_size+half_edge_width,
           y1: y,
           x2: x+half_face_size-half_edge_width,
           y2: y+face_size
-        }
+        ) 
       end
   
       def back_axis
-        {
+        GridGenerator::BaseLine.new( 
           x1: x+half_face_size-half_edge_width,
           y1: y,
           x2: x+half_face_size+half_edge_width,
           y2: y+face_size
-        }
+        ) 
       end
   
       def element_shapes

data/lib/grid_generator/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mark Humphreys
@@ -46,6 +46,7 @@ files:
 - lib/grid_generator/arrows/horizontal_arrow.rb
 - lib/grid_generator/arrows/vertical_arrow.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