rubiks_cube 1.0.3 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ba95ab7306e2711c27d79e0048fcf8d2e85b5431
+  data.tar.gz: e8ea3a5407c148f56c66f1ba5461dd1bbfe8720d
+SHA512:
+  metadata.gz: 224109e67b1da66903e9a2aed557a82f583732995674e23b1ddd5a75ea35d44c65fcdc7e74fee9dd26fb295c60fbeb97f519b19ad6f721f1d2218450a5c87c17
+  data.tar.gz: 3552b5164b043e02ac70715c6a0ba98f459d51ef401c65ebe4182e8d0a750c41ef5c4759312c6dd2f4d9a2602b47f86135555a11ef263d9dd7f694cf632d1226

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubiks_cube (1.0.3)
+    rubiks_cube (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/rubiks_cube.rb

@@ -2,4 +2,5 @@ require 'rubiks_cube/version'
 require 'rubiks_cube/cube'
 require 'rubiks_cube/cubie'
 require 'rubiks_cube/algorithms'
+require 'rubiks_cube/solution'
 require 'rubiks_cube/two_cycle_solution'

data/lib/rubiks_cube/solution.rb

@@ -0,0 +1,38 @@
+module RubiksCube
+  # Abstract interface for a RubiksCube solution
+  #
+  # Must implement:
+  #   solution: array or string of moves necessary to solve the cube
+  #   pretty:   human readable string of solution
+  class Solution
+    attr_reader :cube
+
+    # Array or String of moves necessary to solve the cube
+    def solution
+      raise "#solution unimplemented in #{self.class.name}"
+    end
+
+    # Human readable string of solution
+    def pretty
+      raise "#pretty unimplemented in #{self.class.name}"
+    end
+
+    def initialize(cube)
+      @cube = Cube.new(cube.state)
+    end
+
+    def state
+      cube.state
+    end
+
+    def solved?
+      cube.solved?
+    end
+
+    def length
+      (solution.respond_to?(:flatten) ? solution.flatten.join(' ') : solution)
+        .split.count
+    end
+  end
+end
+

data/lib/rubiks_cube/two_cycle_solution.rb

@@ -1,21 +1,8 @@
 module RubiksCube
-  # Very inefficient two-cycle solving algorithm, useful for blindfold
-  class TwoCycleSolution
-    attr_reader :cube
-
-    def initialize(cube)
-      @cube = Cube.new(cube.state)
-    end
-
-    def state
-      cube.state
-    end
-
-    def solved?
-      cube.solved?
-    end
-
-    def solve!
+  # Very inefficient two-cycle solving algorithm (aka bicycle solution)
+  # Useful for learning and blindfold
+  class TwoCycleSolution < Solution
+    def solution
       @solution ||= begin
         solution = []
         solution << solution_for(:permutation)
@@ -24,15 +11,6 @@ module RubiksCube
       end
     end
 
-    def solution
-      solve!
-      @solution
-    end
-
-    def length
-      solution.flatten.join(' ').split.count
-    end
-
     def pretty
       solution.each_slice(3).map do |setup, correction, undo|
         step = []
@@ -66,9 +44,9 @@ module RubiksCube
     end
 
     def next_orientation_location_for(cubie)
-      incorrect_locations_for(cubie, :orientation).tap do |locations|
-        locations.delete(0)
-      end.first
+      locations = incorrect_locations_for(cubie, :orientation)
+      locations.delete 0
+      locations.first
     end
 
     def next_permutation_location_for(cubie)

data/lib/rubiks_cube/version.rb

@@ -1,3 +1,3 @@
 module RubiksCube
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/spec/rubiks_cube/solution_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe RubiksCube::Solution do
+  class TestSolution < RubiksCube::Solution
+    def initialize(cube, solution)
+      @solution = solution
+      super cube
+    end
+
+    def solution; @solution; end
+  end
+
+  subject { TestSolution.new(double('Cube', state: 'nope'), solution) }
+
+  describe '#length' do
+    context 'when the solution is a single array' do
+      let(:solution) { %w(a b c) }
+
+      it 'returns the length of the solution' do
+        expect(subject.length).to eq 3
+      end
+    end
+
+    context 'when the solution contains multiple arrays' do
+      let(:solution) { [%w(a b), %w(c d), [%w(e f)]] }
+
+      it 'returns the length of the solution' do
+        expect(subject.length).to eq 6
+      end
+    end
+
+    context 'when the solution is a string' do
+      let(:solution) { "a b c d" }
+
+      it 'returns the length of the solution' do
+        expect(subject.length).to eq 4
+      end
+    end
+  end
+end

data/spec/rubiks_cube/two_cycle_solution_spec.rb

@@ -6,10 +6,10 @@ describe RubiksCube::TwoCycleSolution do
   let(:cube)  { RubiksCube::Cube.new state }
   let(:state) { nil }
 
-  describe '#solve!' do
+  describe '#solution' do
     shared_examples_for 'a cube that can be solved' do
       it 'solves the cube' do
-        subject.solve!
+        subject.solution
         expect(subject).to be_solved
       end
     end
@@ -17,7 +17,7 @@ describe RubiksCube::TwoCycleSolution do
     it 'does not modify the original cube state' do
       original_cube_state = cube.l.state
 
-      subject.solve!
+      subject.solution
 
       expect(cube.state).to eq original_cube_state
     end
@@ -64,47 +64,21 @@ describe RubiksCube::TwoCycleSolution do
       end
     end
 
-    describe '#solution' do
-      before do
-        cube.perform!([
-          RubiksCube::Algorithms::Permutation::Edge,
-          RubiksCube::Algorithms::Permutation::Corner,
-          RubiksCube::Algorithms::Orientation::Edge,
-        ].join ' ')
-      end
-
-      context 'when the cube has not been solved' do
-        it 'first solves the cube' do
-          subject.should_receive(:solve!)
-          subject.solution
-        end
-      end
-
-      context 'when the cube has been solved' do
-        before { subject.solve! }
-
-        it 'returns the setup, algorithm, and undo moves' do
-          expect(subject.solution).to eq([
-            "", RubiksCube::Algorithms::Permutation::Edge, "",
-            "M2 D L2", RubiksCube::Algorithms::Permutation::Edge, "L2 D' M2",
-            "R2 D' R2", RubiksCube::Algorithms::Permutation::Corner, "R2 D R2",
-            "", RubiksCube::Algorithms::Permutation::Corner, "",
-            "R B", RubiksCube::Algorithms::Orientation::Edge, "B' R'",
-            "", RubiksCube::Algorithms::Orientation::Edge, ""
-          ])
-        end
-      end
-    end
-
-    describe '#length' do
-      it 'returns the length of the solution' do
-        cube.l.r
-        expect(subject.length).to eq 634
-      end
-
-      it 'returns zero when cube already solved' do
-        expect(subject.length).to be_zero
-      end
+    it 'returns the setup, algorithm, and undo moves' do
+      cube.perform!([
+        RubiksCube::Algorithms::Permutation::Edge,
+        RubiksCube::Algorithms::Permutation::Corner,
+        RubiksCube::Algorithms::Orientation::Edge,
+      ].join(' '))
+
+      expect(subject.solution).to eq([
+        "", RubiksCube::Algorithms::Permutation::Edge, "",
+        "M2 D L2", RubiksCube::Algorithms::Permutation::Edge, "L2 D' M2",
+        "R2 D' R2", RubiksCube::Algorithms::Permutation::Corner, "R2 D R2",
+        "", RubiksCube::Algorithms::Permutation::Corner, "",
+        "R B", RubiksCube::Algorithms::Orientation::Edge, "B' R'",
+        "", RubiksCube::Algorithms::Orientation::Edge, ""
+      ])
     end
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rubiks_cube
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,65 +27,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane-hashcheck
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Solve your Rubik's Cube with a two-cycle solution
@@ -120,48 +109,44 @@ files:
 - lib/rubiks_cube/algorithms.rb
 - lib/rubiks_cube/cube.rb
 - lib/rubiks_cube/cubie.rb
+- lib/rubiks_cube/solution.rb
 - lib/rubiks_cube/two_cycle_solution.rb
 - lib/rubiks_cube/version.rb
 - rubiks_cube.gemspec
 - spec/rubiks_cube/algorithms_spec.rb
 - spec/rubiks_cube/cube_spec.rb
 - spec/rubiks_cube/cubie_spec.rb
+- spec/rubiks_cube/solution_spec.rb
 - spec/rubiks_cube/two_cycle_solution_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/chrishunt/rubiks-cube
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1608407243264809376
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1608407243264809376
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Solve your Rubik's Cube with a two-cycle solution
 test_files:
 - spec/rubiks_cube/algorithms_spec.rb
 - spec/rubiks_cube/cube_spec.rb
 - spec/rubiks_cube/cubie_spec.rb
+- spec/rubiks_cube/solution_spec.rb
 - spec/rubiks_cube/two_cycle_solution_spec.rb
 - spec/spec_helper.rb