twisty_puzzles 0.0.10 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7616a5e5bd64a5beb6ea98bed6a6f6bc2dc5ae145491db533e4693cd10d0ff6d
-  data.tar.gz: 8bc2cd597844fb86f9168c8e368c6bbb01cc34a82598ebef7f5dcb77c1e3713c
+  metadata.gz: f95cf6c568aab20bad9dd5d48222afd5261215984a5da7c2c18b9d3bdf315763
+  data.tar.gz: 713e3825d332a49805f4938b8bc2be924f3813d49e25e9997278966409bb73fe
 SHA512:
-  metadata.gz: 42c3be051514680426bed25b66ca09b8c420f1423a778db10512c37663c42128136acf6f4e72847bed68d4111e8563ef5eb1cd427883bf2802e072853f1900b0
-  data.tar.gz: d26d1c98f90f7bbd15474ac45f200a483983daadfae40016e5f9d2f0ca44b20a652e480f8bbfc13d939f904140358a1acc741fcbbb09306f35b51a298f3a9cf1
+  metadata.gz: 2e0ba5a01642a11c57a1d83aeb6b22aa4de037fcbbd6a062a2aff29028f37260cd06a38e009fe5683949a65509a899acd925bbe3b58fdf1552760d5664631ade
+  data.tar.gz: 3b2d41b1b10065029813152e693f0c61c6b28557e1794d16dcb4d6c7b300fd7d0d6fa94b2b23de3e01041526ef03463a05a8854b1eec1be7cfaec7ef1943debb

data/lib/twisty_puzzles/color_scheme.rb

@@ -143,7 +143,7 @@ module TwistyPuzzles
                 "Color #{c} cannot be part of the color scheme because it is a reserved color."
         end
       end
-      raise ArgumentError unless face_symbols_to_colors.values.all? { |c| c.is_a?(Symbol) }
+      raise ArgumentError unless face_symbols_to_colors.values.all?(Symbol)
     end
 
     def add_missing_mappings(turned_face_symbols_to_colors, chirality_corner_source, unknown_index)

data/lib/twisty_puzzles/coordinate.rb

@@ -6,6 +6,7 @@ require 'twisty_puzzles/native'
 
 module TwistyPuzzles
   # Coordinate of a sticker on the cube.
+  # rubocop:disable  Metrics/ClassLength
   class Coordinate
     def self.highest_coordinate(cube_size)
       cube_size - 1
@@ -27,7 +28,7 @@ module TwistyPuzzles
 
     # Middle coordinate for uneven numbers, the one before for even numbers
     def self.middle_or_before(cube_size)
-      cube_size - cube_size / 2 - 1
+      cube_size - (cube_size / 2) - 1
     end
 
     # Middle coordinate for uneven numbers, the one after for even numbers
@@ -37,7 +38,7 @@ module TwistyPuzzles
 
     # The last coordinate that is strictly before the middle
     def self.last_before_middle(cube_size)
-      cube_size / 2 - 1
+      (cube_size / 2) - 1
     end
 
     def self.canonicalize(index, cube_size)
@@ -121,6 +122,23 @@ module TwistyPuzzles
       from_indices(face, cube_size, m, m)
     end
 
+    def self.face(face, cube_size)
+      neighbor_a, neighbor_b = face.neighbors[0..1]
+      coordinate_range(cube_size).collect_concat do |x|
+        coordinate_range(cube_size).map do |y|
+          from_face_distances(face, cube_size, neighbor_a => x, neighbor_b => y)
+        end
+      end
+    end
+
+    def self.layer(face, cube_size)
+      face.neighbors.zip(face.neighbors.rotate(1)).collect_concat do |neighbor, next_neighbor|
+        coordinate_range(cube_size).map do |i|
+          from_face_distances(neighbor, cube_size, face => 0, next_neighbor => i)
+        end
+      end + self.face(face, cube_size)
+    end
+
     def self.edges_outside(face, cube_size)
       face.neighbors.zip(face.neighbors.rotate(1)).collect_concat do |neighbor, next_neighbor|
         1.upto(cube_size - 2).map do |i|
@@ -261,6 +279,7 @@ module TwistyPuzzles
       rots
     end
   end
+  # rubocop:enable Metrics/ClassLength
 
   # Coordinate of a sticker on the Skewb.
   class SkewbCoordinate
@@ -291,7 +310,7 @@ module TwistyPuzzles
 
     def self.for_corner(corner)
       native = Native::SkewbCoordinate.for_corner(corner.face_symbols)
-      new(Face.for_face_symbol(corner.face_symbols.first), 1 + corner.piece_index % 4, native)
+      new(Face.for_face_symbol(corner.face_symbols.first), 1 + (corner.piece_index % 4), native)
     end
 
     def hash

data/lib/twisty_puzzles/cube.rb

@@ -34,6 +34,14 @@ module TwistyPuzzles
 
     attr_reader :piece_index, :face_symbols
 
+    def self.min_parseable_face_symbols
+      self::FACES
+    end
+
+    def self.max_parseable_face_symbols
+      self::FACES
+    end
+
     def self.generate_parts
       valid_face_symbol_combinations =
         FACE_SYMBOLS.permutation(self::FACES).select do |p|
@@ -147,7 +155,7 @@ module TwistyPuzzles
 
     def self.parse(piece_description)
       face_symbols =
-        piece_description.upcase.strip.split('').map do |e|
+        piece_description.upcase.strip.chars.map do |e|
           FACE_SYMBOLS[FACE_NAMES.index(e)]
         end
       for_face_symbols(face_symbols)
@@ -327,6 +335,14 @@ module TwistyPuzzles
   class MoveableCenter < Part
     FACES = 1
 
+    def self.min_parseable_face_symbols
+      self::CORRESPONDING_PART_CLASS::FACES
+    end
+
+    def self.max_parseable_face_symbols
+      self::CORRESPONDING_PART_CLASS::FACES
+    end
+
     def self.min_cube_size
       4
     end
@@ -467,11 +483,15 @@ module TwistyPuzzles
       false
     end
 
+    def self.max_parseable_face_symbols
+      FACES + 1
+    end
+
     def self.for_face_symbols(face_symbols)
       # One additional face symbol is usually mentioned for wings.
       raise unless face_symbols.length == FACES || face_symbols.length == FACES + 1
 
-      if face_symbols.length == 3
+      if face_symbols.length == FACES + 1
         for_corner_face_symbols(face_symbols)
       else
         for_face_symbols_internal(face_symbols)
@@ -518,7 +538,7 @@ module TwistyPuzzles
     end
 
     def num_incarnations(cube_size)
-      cube_size > 3 ? cube_size / 2 - 1 : 0
+      cube_size > 3 ? (cube_size / 2) - 1 : 0
     end
 
     # One index of such a piece on a on a NxN face.
@@ -617,7 +637,7 @@ module TwistyPuzzles
     ELEMENTS = generate_parts
 
     def num_incarnations(cube_size)
-      cube_size > 3 ? cube_size / 2 - 1 : 0
+      cube_size > 3 ? (cube_size / 2) - 1 : 0
     end
 
     # One index of such a piece on a on a NxN face.
@@ -643,7 +663,7 @@ module TwistyPuzzles
       if cube_size.even? || cube_size <= 3
         0
       else
-        cube_size / 2 - 1
+        (cube_size / 2) - 1
       end
     end
 

data/lib/twisty_puzzles/cube_move.rb

@@ -68,8 +68,8 @@ module TwistyPuzzles
 
     def equivalent_slice_move?(other, cube_size)
       cube_size == 3 && other.slice_index == 1 &&
-        (@axis_face == other.axis_face && @direction == other.direction ||
-         @axis_face == other.axis_face.opposite && @direction == other.direction.inverse)
+        ((@axis_face == other.axis_face && @direction == other.direction) ||
+         (@axis_face == other.axis_face.opposite && @direction == other.direction.inverse))
     end
   end
 

data/lib/twisty_puzzles/cube_print_helper.rb

@@ -72,9 +72,9 @@ module TwistyPuzzles
     def skewb_ascii_art_line(first_color, middle_color, last_color, num_first_color)
       raise if num_first_color > SKEWB_FACE_SIZE / 2
 
-      first_color * num_first_color +
-        middle_color * (SKEWB_FACE_SIZE - 2 * num_first_color) +
-        last_color * num_first_color
+      (first_color * num_first_color) +
+        (middle_color * (SKEWB_FACE_SIZE - (2 * num_first_color))) +
+        (last_color * num_first_color)
     end
 
     def skewb_ascii_art(center_color, corner_colors)
@@ -116,7 +116,7 @@ module TwistyPuzzles
       front_face = face_lines(cube_state, :F, 1, 3) { |c| color_character(c, color_mode) }
       right_face = face_lines(cube_state, :R, 1, 3) { |c| color_character(c, color_mode) }
       pll_line = front_face.first + right_face.first
-      (top_face + [pll_line] * 3).join("\n")
+      (top_face + ([pll_line] * 3)).join("\n")
     end
 
     def cube_string(cube_state, color_mode)
@@ -150,7 +150,7 @@ module TwistyPuzzles
     end
 
     def pad_lines(lines, padding)
-      lines.map { |line| empty_name * padding + line }
+      lines.map { |line| (empty_name * padding) + line }
     end
 
     def zip_concat_lines(*args)

data/lib/twisty_puzzles/move_type_creator.rb

@@ -6,7 +6,7 @@ module TwistyPuzzles
   class MoveTypeCreator
     def initialize(capture_keys, move_class)
       raise TypeError unless move_class.is_a?(Class)
-      raise TypeError unless capture_keys.all? { |k| k.is_a?(Symbol) }
+      raise TypeError unless capture_keys.all?(Symbol)
 
       @capture_keys = capture_keys.freeze
       @move_class = move_class

data/lib/twisty_puzzles/parser.rb

@@ -77,8 +77,8 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
     end
 
     # Parses at least one move.
-    def parse_nonempty_moves
-      moves = parse_moves
+    def parse_nonempty_moves_with_triggers
+      moves = parse_moves_with_triggers
       complain('move') if moves.empty?
       moves
     end
@@ -117,8 +117,24 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       if @scanner.peek(1) == OPENING_BRACKET
         parse_commutator_internal
       else
-        FakeCommutator.new(parse_moves_with_triggers)
+        parse_commutator_no_brackets
+      end
+    end
+
+    def parse_commutator_no_brackets
+      setup_or_first_part_or_algorithm = parse_moves_with_triggers
+      skip_spaces
+      if @scanner.eos? || !SEPARATORS.include?(@scanner.peek(1))
+        return FakeCommutator.new(setup_or_first_part_or_algorithm)
       end
+
+      setup_or_first_part = setup_or_first_part_or_algorithm
+      complain('move') if setup_or_first_part.empty?
+      separator = parse_separator
+      comm = parse_commutator_internal_after_separator(setup_or_first_part, separator)
+      skip_spaces
+      complain('end of commutator') unless @scanner.eos?
+      comm
     end
 
     def parse_algorithm
@@ -131,40 +147,69 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       if @scanner.peek(1) == OPENING_BRACKET
         parse_pure_commutator
       else
-        FakeCommutator.new(parse_moves_with_triggers)
+        parse_pure_commutator_no_brackets
       end
     end
 
     def parse_pure_commutator
       skip_spaces
       parse_open_bracket
-      first_part = parse_nonempty_moves
+      first_part = parse_nonempty_moves_with_triggers
       skip_spaces
-      complain('middle of pure commutator') unless @scanner.getch == ','
-      second_part = parse_nonempty_moves
+      parse_pure_separator
+      second_part = parse_nonempty_moves_with_triggers
       skip_spaces
       parse_close_bracket
       PureCommutator.new(first_part, second_part)
     end
 
+    def parse_pure_commutator_no_brackets
+      first_part_or_algorithm = parse_moves_with_triggers
+      skip_spaces
+      if @scanner.eos? || !PURE_SEPARATORS.include?(@scanner.peek(1))
+        return FakeCommutator.new(first_part_or_algorithm)
+      end
+
+      first_part = first_part_or_algorithm
+      complain('move') if first_part.empty?
+      parse_pure_separator
+      second_part = parse_nonempty_moves_with_triggers
+      skip_spaces
+      PureCommutator.new(first_part, second_part)
+    end
+
+    def parse_pure_separator
+      complain('middle of pure commutator') unless PURE_SEPARATORS.include?(@scanner.getch)
+    end
+
     def parse_commutator_internal_after_separator(setup_or_first_part, separator)
-      if [':', ';'].include?(separator)
+      if SETUP_SEPARATORS.include?(separator)
         inner_commutator = parse_setup_commutator_inner
         SetupCommutator.new(setup_or_first_part, inner_commutator)
-      elsif separator == ','
-        second_part = parse_nonempty_moves
+      elsif PURE_SEPARATORS.include?(separator)
+        second_part = parse_nonempty_moves_with_triggers
         PureCommutator.new(setup_or_first_part, second_part)
       else
         complain('end of setup or middle of pure commutator') unless @scanner.eos?
       end
     end
 
+    SETUP_SEPARATORS = %w[; :].freeze
+    PURE_SEPARATORS = %w[/ ,].freeze
+    SEPARATORS = (SETUP_SEPARATORS + PURE_SEPARATORS).freeze
+
+    def parse_separator
+      separator = @scanner.getch
+      complain('separator between commutator parts') unless SEPARATORS.include?(separator)
+      separator
+    end
+
     def parse_commutator_internal
       skip_spaces
       parse_open_bracket
-      setup_or_first_part = parse_nonempty_moves
+      setup_or_first_part = parse_nonempty_moves_with_triggers
       skip_spaces
-      separator = @scanner.getch
+      separator = parse_separator
       comm = parse_commutator_internal_after_separator(setup_or_first_part, separator)
       skip_spaces
       parse_close_bracket

data/lib/twisty_puzzles/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TwistyPuzzles
-  VERSION = '0.0.10'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twisty_puzzles
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.14
 platform: ruby
 authors:
 - Bernhard F. Brodowsky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize