twisty_puzzles 0.0.31 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1fabe0cc087fdf90da3e0288758f9573378371b0b3158d6a905e0830da21a1
-  data.tar.gz: 04f15c1397971f33565c89f852571110e13aeff1548d748874a0dc6ca364d64f
+  metadata.gz: 66e7a9b86d8d381b95a5f8f81736ce6df3bf121742c5b802dc1197f587ff064b
+  data.tar.gz: 21d10876ef99087df6e243a9b405c5272e74a13601fd71a3389a11a2c225905c
 SHA512:
-  metadata.gz: b13427c376bc2c583e02860e5834140b9d648ee97f9983906732597ad9a5d57256364231a7c759b775478b7474cf21e1188045a4ecb564e942e0b4e991f7246e
-  data.tar.gz: 48a547963b89c1c6a56688fdab4c094aec6934954b8555c319ddfde7a1518b787cabd62cf4b39fee37c7de19366fabbcb6debfe6b8ef00c2ee578c48fd4aeb63
+  metadata.gz: fa1def58113526fa40421e30650da8fcd5f136947405697fa04e2c62278a618f9efdb7ce7b1a22979e3794aa8e59a9f2b1e2d723627e09567d16adb58fe6c3dd
+  data.tar.gz: 95af3315c8fa3036780b9fe70abd2dd1b7afabe42a04c2373a791f3da401f7be1d7dde5ba3201c68b69b25ba7904955496c07855faee617c67367781b4f4b2db

data/lib/twisty_puzzles/cube.rb

@@ -122,7 +122,7 @@ module TwistyPuzzles
     end
 
     def inspect
-      "#{self.class}(#{@face_symbols.map(&:to_s).join(', ')})"
+      @inspect ||= "#{self.class.name.split('::').last}(#{@face_symbols.map(&:to_s).join(', ')})"
     end
 
     def to_s
@@ -390,7 +390,8 @@ module TwistyPuzzles
     attr_reader :corresponding_part
 
     def inspect
-      "#{self.class}(#{face_symbol}, #{@corresponding_part.inspect})"
+      @inspect ||=
+        "#{self.class.name.split('::').last}(#{face_symbol}, #{@corresponding_part.inspect})"
     end
 
     def rotate_by(_number)

data/lib/twisty_puzzles/part_cycle.rb

@@ -21,6 +21,7 @@ module TwistyPuzzles
       raise ArgumentError if parts.empty?
       raise TypeError unless twist.is_a?(Integer)
       raise ArgumentError if twist.negative?
+      raise ArgumentError if twist >= parts.first.rotations.length
 
       check_types(parts, Part)
       check_type_consistency(parts)
@@ -32,13 +33,18 @@ module TwistyPuzzles
     attr_reader :parts, :twist
 
     def eql?(other)
-      self.class.equal?(other.class) && @parts == other.parts
+      self.class.equal?(other.class) && @parts == other.parts && @twist == other.twist
     end
 
     alias == eql?
 
+    def inspect
+      @inspect ||=
+        "#{self.class.name.split('::').last}(#{@parts.map(&:inspect).join(', ')}#{twist_suffix})"
+    end
+
     def hash
-      @hash ||= ([self.class] + @parts).hash
+      @hash ||= [self.class, @parts, @twist].hash
     end
 
     def part_type
@@ -46,15 +52,16 @@ module TwistyPuzzles
     end
 
     def contains_any_part?(parts)
-      !(@parts & parts).empty?
+      parts.any? { |p| contains?(p) }
     end
 
     def to_s
-      @parts.join(' ')
+      @to_s ||= @parts.join(' ')
     end
 
     def to_raw_data
-      "#{simple_class_name(part_type)}(#{self})"
+      @to_raw_data ||=
+        "#{simple_class_name(part_type)}(#{self}#{twist_suffix})"
     end
 
     def length
@@ -62,15 +69,15 @@ module TwistyPuzzles
     end
 
     def rotate_by(number)
-      self.class.new(@parts.rotate(number))
+      self.class.new(@parts.rotate(number), @twist)
     end
 
     def map_rotate_by(number)
-      self.class.new(@parts.map { |p| p.rotate_by(number) })
+      self.class.new(@parts.map { |p| p.rotate_by(number) }, @twist)
     end
 
     def <=>(other)
-      @parts <=> other.parts
+      [part_type.name, @parts, @twist] <=> [other.part_type.name, other.parts, other.twist]
     end
 
     def canonicalize
@@ -102,14 +109,22 @@ module TwistyPuzzles
     end
 
     def inverse
-      self.class.new([@parts[0]] + @parts[1..].reverse)
+      inverse_twist = @twist.zero? ? @twist : parts.first.rotations.length - @twist
+      self.class.new([@parts[0]] + @parts[1..].reverse, inverse_twist)
     end
 
     def self.from_raw_data(data)
-      raw_part_type, raw_parts = data.match(/(.*)\((.*)\)/).captures
+      raw_part_type, raw_parts, raw_twist = data.match(/^(.*)\((.*?)(?:, (.+))?\)$/).captures
       part_type = PART_TYPES.find { |p| simple_class_name(p) == raw_part_type }
+      twist = raw_twist ? Integer(raw_twist) : 0
       parts = raw_parts.split.map { |r| part_type.parse(r) }
-      new(parts)
+      new(parts, twist)
+    end
+
+    private
+
+    def twist_suffix
+      @twist.positive? ? ", #{@twist}" : ''
     end
 
     def check_type_consistency(parts)

data/lib/twisty_puzzles/sticker_cycle.rb

@@ -7,6 +7,7 @@ require 'twisty_puzzles/reversible_applyable'
 
 module TwistyPuzzles
   # A sticker cycle that can be applied to a cube state.
+  # TODO: Deprecate
   class StickerCycle
     include ReversibleApplyable
 
@@ -55,6 +56,7 @@ module TwistyPuzzles
   end
 
   # A set of disjoint sticker cycles that can be applied to a cube state together
+  # TODO: Deprecate
   class StickerCycles
     include ReversibleApplyable
 
@@ -64,7 +66,10 @@ module TwistyPuzzles
         raise TypeError unless c.is_a?(StickerCycle)
 
         c.native.coordinates.each do |s|
-          raise ArgumentError unless affected_set.add?(s)
+          unless affected_set.add?(s)
+            raise ArgumentError,
+                  'There is an intersection between part cycles'
+          end
         end
       end
       @cube_size = cube_size

data/lib/twisty_puzzles/sticker_cycle_factory.rb

@@ -6,6 +6,7 @@ require 'twisty_puzzles/cube'
 
 module TwistyPuzzles
   # Factory for sticker cycles given part cycles.
+  # TODO: Deprecate
   class StickerCycleFactory
     include Utils::ArrayHelper
 

data/lib/twisty_puzzles/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twisty_puzzles
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.35
 platform: ruby
 authors:
 - Bernhard F. Brodowsky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize