scrambler 0.0.3 → 0.0.4

data/lib/scrambler.rb

@@ -1,4 +1,4 @@
 require "scrambler/version"
 
-require "scrambler/three_by_three"
+require "scrambler/cube"
 require "scrambler/pyraminx"

data/lib/scrambler/cube.rb

@@ -0,0 +1,54 @@
+module Scrambler
+  class Cube
+    def scramble(turns, length)
+      variants = ['', "'", '2']
+      axis = rand turns.size
+      (1..length).map do
+        axis = (axis + rand(turns.size - 1) + 1) % turns.size
+        turns[axis].sample + variants.sample
+      end.join(' ')
+    end
+  end
+
+  class TwoByTwo < Cube
+    def scramble(length = 20)
+      turns = [%w{R L}, %w{F B}, %w{D U}]
+      super turns, length
+    end
+  end
+
+  class ThreeByThree < Cube
+    def scramble(length = 25)
+      turns = [%w{R L}, %w{F B}, %w{D U}]
+      super turns, length
+    end
+  end
+
+  class FourByFour < Cube
+    def scramble(length = 40)
+      turns = [%w{R L Rw Lw}, %w{F B Fw Bw}, %w{D U Dw Uw}]
+      super turns, length
+    end
+  end
+
+  class FiveByFive < Cube
+    def scramble(length = 60)
+      turns = [%w{R L Rw Lw}, %w{F B Fw Bw}, %w{D U Dw Uw}]
+      super turns, length
+    end
+  end
+
+  class SixBySix < Cube
+    def scramble(length = 80)
+      turns = [%w(R L 2R 2L 3R 3L), %w(F B 2F 2B 3F 3B), %w(D U 2D 2U 3D 3U)]
+      super turns, length
+    end
+  end
+
+  class SevenBySeven < Cube
+    def scramble(length = 100)
+      turns = [%w(R L 2R 2L 3R 3L), %w(F B 2F 2B 3F 3B), %w(D U 2D 2U 3D 3U)]
+      super turns, length
+    end
+  end
+end

data/lib/scrambler/version.rb

@@ -1,3 +1,3 @@
 module Scrambler
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/scrambler/five_by_five_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe Scrambler::FiveByFive do
+  let(:valid_turns) { %w(L L' L2 R R' R2 U U' U2 D D' D2 B B' B2 F F' F2
+                         Lw Lw' Lw2 Rw Rw' Rw2 Uw Uw' Uw2 Dw Dw' Dw2 Bw Bw' Bw2 Fw Fw' Fw2) }
+
+  it "should default to a 60 move scramble" do
+    subject.scramble.split(" ").should have(60).elements
+  end
+
+  it "should return a 10 move scramble" do
+     subject.scramble(10).split(" ").should have(10).elements
+  end
+
+  it "should contain only valid turns" do
+    subject.scramble.split(" ").each do |turn|
+      valid_turns.should include(turn)
+    end
+  end
+end

data/spec/scrambler/four_by_four_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe Scrambler::FourByFour do
+  let(:valid_turns) { %w(L L' L2 R R' R2 U U' U2 D D' D2 B B' B2 F F' F2
+                         Lw Lw' Lw2 Rw Rw' Rw2 Uw Uw' Uw2 Dw Dw' Dw2 Bw Bw' Bw2 Fw Fw' Fw2) }
+
+  it "should default to a 40 move scramble" do
+    subject.scramble.split(" ").should have(40).elements
+  end
+
+  it "should return a 10 move scramble" do
+     subject.scramble(10).split(" ").should have(10).elements
+  end
+
+  it "should contain only valid turns" do
+    subject.scramble.split(" ").each do |turn|
+      valid_turns.should include(turn)
+    end
+  end
+end

data/spec/scrambler/seven_by_seven_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe Scrambler::SevenBySeven do
+  let(:valid_turns) { ["", "2", "3"].product(%w(R L U D F B)).map { |l, t| l + t }.product(["", "'", "2"]).map{ |t, m| t + m } }
+
+  it "should default to a 100 move scramble" do
+    subject.scramble.split(" ").should have(100).elements
+  end
+
+  it "should return a 10 move scramble" do
+     subject.scramble(10).split(" ").should have(10).elements
+  end
+
+  it "should contain only valid turns" do
+    subject.scramble.split(" ").each do |turn|
+      valid_turns.should include(turn)
+    end
+  end
+end

data/spec/scrambler/six_by_six_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe Scrambler::SixBySix do
+  let(:valid_turns) { ["", "2", "3"].product(%w(R L U D F B)).map { |l, t| l + t }.product(["", "'", "2"]).map{ |t, m| t + m } }
+
+  it "should default to a 80 move scramble" do
+    subject.scramble.split(" ").should have(80).elements
+  end
+
+  it "should return a 10 move scramble" do
+     subject.scramble(10).split(" ").should have(10).elements
+  end
+
+  it "should contain only valid turns" do
+    subject.scramble.split(" ").each do |turn|
+      valid_turns.should include(turn)
+    end
+  end
+end

data/spec/scrambler/three_by_three_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Scrambler::ThreeByThree, "scrambling length" do
+describe Scrambler::ThreeByThree do
   let(:valid_turns) { %w(L L' L2 R R' R2 U U' U2 B B' B2 F F' F2 D D' D2) }
 
   it "should default to a 25 move scramble" do

data/spec/scrambler/two_by_two_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe Scrambler::TwoByTwo do
+  let(:valid_turns) { %w(L L' L2 R R' R2 U U' U2 B B' B2 F F' F2 D D' D2) }
+
+  it "should default to a 20 move scramble" do
+    subject.scramble.split(" ").should have(20).elements
+  end
+
+  it "should return a 10 move scramble" do
+    subject.scramble(10).split(" ").should have(10).elements
+  end
+
+  it "should contain only valid turns" do
+    subject.scramble.split(" ").each do |turn|
+      valid_turns.should include(turn)
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: scrambler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tim Habermaas
@@ -23,7 +23,7 @@ dependencies:
         version: 2.6.0
   type: :development
   version_requirements: *id001
-description: ""
+description: Scrambler provides scrambles for all WCA puzzles
 email: t.habermaas@gmail.com
 executables: []
 
@@ -32,12 +32,17 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/scrambler/cube.rb
 - lib/scrambler/pyraminx.rb
-- lib/scrambler/three_by_three.rb
 - lib/scrambler/version.rb
 - lib/scrambler.rb
+- spec/scrambler/five_by_five_spec.rb
+- spec/scrambler/four_by_four_spec.rb
 - spec/scrambler/pyraminx_spec.rb
+- spec/scrambler/seven_by_seven_spec.rb
+- spec/scrambler/six_by_six_spec.rb
 - spec/scrambler/three_by_three_spec.rb
+- spec/scrambler/two_by_two_spec.rb
 - spec/spec_helper.rb
 - Gemfile
 homepage: https://github.com/timhabermaas/scrambler

data/lib/scrambler/three_by_three.rb

@@ -1,13 +0,0 @@
-module Scrambler
-  class ThreeByThree
-    def scramble(length = 25)
-      turns = [%w{R L}, %w{F B}, %w{D U}]
-      variants = ['', "'", '2']
-      axis = rand turns.size
-      (1..length).map do
-        axis = (axis + rand(turns.size - 1) + 1) % turns.size
-        turns[axis].sample + variants.sample
-      end.join(' ')
-    end
-  end
-end