twisty_puzzles 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e7a9b86d8d381b95a5f8f81736ce6df3bf121742c5b802dc1197f587ff064b
-  data.tar.gz: 21d10876ef99087df6e243a9b405c5272e74a13601fd71a3389a11a2c225905c
+  metadata.gz: df8607246caad9c85160d9691c18310413ce77ea95281587b100c209e4e52f49
+  data.tar.gz: d4139596d095f04fc35f1acbd4e6a9c37f7d645ec6592b9326c8404dab016e08
 SHA512:
-  metadata.gz: fa1def58113526fa40421e30650da8fcd5f136947405697fa04e2c62278a618f9efdb7ce7b1a22979e3794aa8e59a9f2b1e2d723627e09567d16adb58fe6c3dd
-  data.tar.gz: 95af3315c8fa3036780b9fe70abd2dd1b7afabe42a04c2373a791f3da401f7be1d7dde5ba3201c68b69b25ba7904955496c07855faee617c67367781b4f4b2db
+  metadata.gz: 175d6f08ae032973a21dbd40846940cad500648c9a36642b7046f6e9732685dc018e756b30359bdbe92210e97a3d576970f6c76a11238a7baccb45757c1b1616
+  data.tar.gz: 87e69dbce166cdca251ae02b66cbeabbe903016cd0582d0a293058023d455578888c8cb658f9350e73972b6aa1584d1c6cc3aa2d2645eaa03e49746e3b838fed

data/README.md

@@ -1,5 +1,6 @@
-![Ruby](https://github.com/Lykos/twisty_puzzles/workflows/Ruby/badge.svg)
-![Rubocop](https://github.com/Lykos/twisty_puzzles/workflows/Rubocop/badge.svg)
+[![Ruby](https://github.com/Lykos/twisty_puzzles/workflows/Ruby/badge.svg)](https://github.com/Lykos/twisty_puzzles/actions/workflows/ruby.yml)
+[![Rubocop](https://github.com/Lykos/twisty_puzzles/workflows/Rubocop/badge.svg)](https://github.com/Lykos/twisty_puzzles/actions/workflows/rubocop.yml)
+[![cpp-linter](https://github.com/Lykos/twisty_puzzles/workflows/c-linter/badge.svg)](https://github.com/Lykos/twisty_puzzles/actions/workflows/clinter.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Gem Version](https://badge.fury.io/rb/twisty_puzzles.svg)](https://badge.fury.io/rb/twisty_puzzles)
 

data/ext/twisty_puzzles/native/sticker_cycle.h

@@ -2,4 +2,5 @@
 
 #include <ruby.h>
 
+// TODO: Deprecate
 void init_sticker_cycle_class_under(VALUE module);

data/lib/twisty_puzzles/abstract_move.rb

@@ -23,7 +23,7 @@ module TwistyPuzzles
     end
 
     def hash
-      @hash ||= ([self.class] + identifying_fields).hash
+      @hash ||= [self.class, identifying_fields].hash
     end
 
     def eql?(other)

data/lib/twisty_puzzles/abstract_move_parser.rb

@@ -21,11 +21,11 @@ module TwistyPuzzles
 
     def parse_named_captures(match)
       present_named_captures = match.named_captures.compact
-      present_named_captures.map do |name, string|
+      present_named_captures.to_h do |name, string|
         key = parse_part_key(name).to_sym
         value = parse_move_part(name, string)
         [key, value]
-      end.to_h
+      end
     end
 
     def parse_move(move_string)

data/lib/twisty_puzzles/algorithm.rb

@@ -38,7 +38,7 @@ module TwistyPuzzles
     alias == eql?
 
     def hash
-      @hash ||= ([self.class] + @moves).hash
+      @hash ||= [self.class, @moves].hash
     end
 
     def length

data/lib/twisty_puzzles/cancellation_helper.rb

@@ -111,9 +111,9 @@ module TwistyPuzzles
           single_rotation_algs = Rotation::NON_ZERO_ROTATIONS.map { |e| Algorithm.move(e) }
           combined_rotation_algs = self.combined_rotation_algs
           rotation_algs = trivial_rotation_algs + single_rotation_algs + combined_rotation_algs
-          rotation_algs.map do |alg|
+          rotation_algs.to_h do |alg|
             [rotated_center_state(alg.moves), alg]
-          end.to_h.freeze
+          end.freeze
         end
     end
 

data/lib/twisty_puzzles/color_scheme.rb

@@ -35,7 +35,7 @@ module TwistyPuzzles
     alias == eql?
 
     def hash
-      @hash ||= ([self.class] + colors).hash
+      @hash ||= [self.class, colors].hash
     end
 
     def color(face_symbol)
@@ -167,9 +167,10 @@ module TwistyPuzzles
 
     def obvious_turned_face_symbols_to_colors(top_color, front_color)
       result = { U: top_color, F: front_color }
-      opposites = result.map do |face_symbol, color|
-        [opposite_face_symbol(face_symbol), opposite_color(color)]
-      end.to_h
+      opposites =
+        result.to_h do |face_symbol, color|
+          [opposite_face_symbol(face_symbol), opposite_color(color)]
+        end
       result.merge!(opposites)
     end
 

data/lib/twisty_puzzles/commutator.rb

@@ -19,7 +19,7 @@ module TwistyPuzzles
   # Algorithm that is used like a commutator but actually isn't one.
   class FakeCommutator < Commutator
     def initialize(algorithm)
-      raise ArgumentError unless algorithm.is_a?(Algorithm)
+      raise TypeError unless algorithm.is_a?(Algorithm)
 
       super()
       @algorithm = algorithm
@@ -46,11 +46,45 @@ module TwistyPuzzles
     end
   end
 
+  # A commutator sequence of the form [A, B] + [C, D].
+  class CommutatorSequence < Commutator
+    def initialize(commutators)
+      raise TypeError unless commutators.is_a?(Array) && commutators.all?(Commutator)
+
+      super()
+      @commutators = commutators
+    end
+
+    attr_reader :commutators
+
+    def eql?(other)
+      self.class.equal?(other.class) && @commutators == other.commutators
+    end
+
+    alias == eql?
+
+    def hash
+      @hash ||= [self.class, @commutators].hash
+    end
+
+    def inverse
+      CommutatorSequence.new(@commutators.map(&:inverse).reverse)
+    end
+
+    def to_s
+      @commutators.join(' + ')
+    end
+
+    def algorithm
+      @commutators.map(&:algorithm).reduce(:+, Algorithm.empty)
+    end
+  end
+
   # Pure commutator of the form A B A' B'.
   class PureCommutator < Commutator
     def initialize(first_part, second_part)
-      raise ArgumentError unless first_part.is_a?(Algorithm)
-      raise ArgumentError unless second_part.is_a?(Algorithm)
+      raise TypeError unless first_part.is_a?(Algorithm)
+      raise TypeError unless second_part.is_a?(Algorithm)
 
       super()
       @first_part = first_part
@@ -101,9 +135,9 @@ module TwistyPuzzles
   # Setup commutator of the form A B A'.
   class SetupCommutator < Commutator
     def initialize(setup, inner_commutator)
-      raise ArgumentError, 'Setup move has to be an algorithm.' unless setup.is_a?(Algorithm)
+      raise TypeError, 'Setup move has to be an algorithm.' unless setup.is_a?(Algorithm)
       unless inner_commutator.is_a?(Commutator)
-        raise ArgumentError, 'Inner commutator has to be a commutator.'
+        raise TypeError, 'Inner commutator has to be a commutator.'
       end
 
       super()

data/lib/twisty_puzzles/cube_state.rb

@@ -35,7 +35,7 @@ module TwistyPuzzles
     end
 
     def self.create_stickers_hash(stickers)
-      FACE_SYMBOLS.zip(stickers).map do |face_symbol, face_stickers|
+      FACE_SYMBOLS.zip(stickers).to_h do |face_symbol, face_stickers|
         face = Face.for_face_symbol(face_symbol)
         face_hash = {
           stickers: face_stickers,
@@ -46,7 +46,7 @@ module TwistyPuzzles
           y_base_face_symbol: face.coordinate_index_base_face(0).face_symbol
         }
         [face_symbol, face_hash]
-      end.to_h
+      end
     end
 
     def initialize(native)

data/lib/twisty_puzzles/parser.rb

@@ -11,13 +11,14 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
   end
 
   # Parser for commutators and algorithms.
-  class Parser
+  class Parser # rubocop:disable Metrics/ClassLength
     OPENING_BRACKET = '['
     OPENING_PAREN = '('
     CLOSING_BRACKET = ']'
     CLOSING_PAREN = ')'
     SLASH = '/'
     COMMA = ','
+    PLUS = '+'
     SETUP_SEPARATORS = %w[; :].freeze
     PURE_SEPARATORS = [SLASH, COMMA].freeze
     SEPARATORS = (SETUP_SEPARATORS + PURE_SEPARATORS).freeze
@@ -141,6 +142,8 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       separator = parse_separator
       comm = parse_commutator_internal_after_separator(setup_or_first_part, separator)
       skip_spaces
+      return parse_commutator_sum_with_prefix(comm) if @scanner.peek(1) == PLUS
+
       complain('end of commutator') unless @scanner.eos?
       comm
     end
@@ -230,10 +233,23 @@ module TwistyPuzzles # rubocop:disable Style/Documentation
       skip_spaces
       parse_close_bracket
       skip_spaces
+      return parse_commutator_sum_with_prefix(comm) if @scanner.peek(1) == PLUS
+
       complain('end of commutator') unless @scanner.eos?
       comm
     end
 
+    def parse_plus
+      complain('operator of commutator sequence') unless @scanner.getch == PLUS
+    end
+
+    def parse_commutator_sum_with_prefix(commutator)
+      skip_spaces
+      parse_plus
+      skip_spaces
+      CommutatorSequence.new([commutator, parse_commutator])
+    end
+
     def parse_move_internal
       move = @scanner.scan(@move_parser.regexp)
       return unless move

data/lib/twisty_puzzles/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twisty_puzzles
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Bernhard F. Brodowsky
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -164,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email: bernhard.brodowsky@gmail.com
 executables: []
 extensions:
@@ -247,7 +247,8 @@ metadata:
   homepage_uri: https://github.com/Lykos/twisty_puzzles
   source_code_uri: https://github.com/Lykos/twisty_puzzles
   changelog_uri: https://github.com/Lykos/twisty_puzzles/blob/master/CHANGELOG.md
-post_install_message:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -263,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Gem for my cube_trainer rails app. Some things are better left in a separate
   gem with no rails, e.g. native extensions. The main purpose is to support my Rails