zxcvbn-ruby 0.0.3 → 1.1.0

data/spec/matchers/repeat_spec.rb

@@ -5,14 +5,14 @@ describe Zxcvbn::Matchers::Repeat do
   let(:matches) { matcher.matches('bbbbbtestingaaa') }
 
   it 'sets the pattern name' do
-    matches.all? { |m| m.pattern == 'repeat' }.should eql(true)
+    expect(matches.all? { |m| m.pattern == 'repeat' }).to eql(true)
   end
 
   it 'finds the repeated patterns' do
-    matches.count.should eq 2
-    matches[0].token.should eq 'bbbbb'
-    matches[0].repeated_char.should eq 'b'
-    matches[1].token.should eq 'aaa'
-    matches[1].repeated_char.should eq 'a'
+    expect(matches.count).to eq 2
+    expect(matches[0].token).to eq 'bbbbb'
+    expect(matches[0].repeated_char).to eq 'b'
+    expect(matches[1].token).to eq 'aaa'
+    expect(matches[1].repeated_char).to eq 'a'
   end
 end

data/spec/matchers/sequences_spec.rb

@@ -5,17 +5,17 @@ describe Zxcvbn::Matchers::Sequences do
   let(:matches) { matcher.matches('abcde87654') }
 
   it 'sets the pattern name' do
-    matches.all? { |m| m.pattern == 'sequence' }.should eql(true)
+    expect(matches.all? { |m| m.pattern == 'sequence' }).to eql(true)
   end
 
   it 'finds the correct matches' do
-    matches.count.should == 2
-    matches[0].token.should eq 'abcde'
-    matches[1].token.should eq '87654'
+    expect(matches.count).to eq(2)
+    expect(matches[0].token).to eq 'abcde'
+    expect(matches[1].token).to eq '87654'
   end
 
   it 'finds overlapping matches' do
     matches = matcher.matches('abcba')
-    matches.map(&:token).should eq ['abc', 'cba']
+    expect(matches.map(&:token)).to eq ['abc', 'cba']
   end
 end

data/spec/matchers/spatial_spec.rb

@@ -2,19 +2,19 @@ require 'spec_helper'
 
 describe Zxcvbn::Matchers::Spatial do
   let(:matcher) { Zxcvbn::Matchers::Spatial.new(graphs) }
-  let(:graphs)  { Zxcvbn::ADJACENCY_GRAPHS }
+  let(:graphs)  { Zxcvbn::Data.new.adjacency_graphs }
 
   describe '#matches' do
     let(:matches) { matcher.matches('rtyikm') }
 
     it 'finds the correct of matches' do
-      matches.count.should eq 3
-      matches[0].token.should eq 'rty'
-      matches[0].graph.should eq 'qwerty'
-      matches[1].token.should eq 'ikm'
-      matches[1].graph.should eq 'qwerty'
-      matches[2].token.should eq 'yik'
-      matches[2].graph.should eq 'dvorak'
+      expect(matches.count).to eq 3
+      expect(matches[0].token).to eq 'rty'
+      expect(matches[0].graph).to eq 'qwerty'
+      expect(matches[1].token).to eq 'ikm'
+      expect(matches[1].graph).to eq 'qwerty'
+      expect(matches[2].token).to eq 'yik'
+      expect(matches[2].graph).to eq 'dvorak'
     end
   end
 end

data/spec/matchers/year_spec.rb

@@ -5,11 +5,11 @@ describe Zxcvbn::Matchers::Year do
   let(:matches) { matcher.matches('testing1998') }
 
   it 'sets the pattern name' do
-    matches.all? { |m| m.pattern == 'year' }.should eql(true)
+    expect(matches.all? { |m| m.pattern == 'year' }).to eql(true)
   end
 
   it 'finds the correct matches' do
-    matches.count.should == 1
-    matches[0].token.should eq '1998'
+    expect(matches.count).to eq(1)
+    expect(matches[0].token).to eq '1998'
   end
 end

data/spec/omnimatch_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Zxcvbn::Omnimatch do
   before(:all) do
-    @omnimatch = described_class.new
+    @omnimatch = described_class.new(Zxcvbn::Data.new)
   end
 
   def omnimatch(password)
@@ -18,7 +18,7 @@ describe Zxcvbn::Omnimatch do
       js_results = js_omnimatch(password)
       ruby_results = omnimatch(password)
 
-      ruby_results.should match_js_results js_results
+      expect(ruby_results).to match_js_results js_results
     end
   end
 end

data/spec/scoring/crack_time_spec.rb

@@ -5,38 +5,38 @@ describe Zxcvbn::CrackTime do
 
   describe '#entropy_to_crack_time' do
     specify do
-      entropy_to_crack_time(15.433976574415976).should eq 2.2134000000000014
+      expect(entropy_to_crack_time(15.433976574415976)).to eq 2.2134000000000014
     end
   end
 
   describe '#crack_time_to_score' do
     context 'crack time less than 10 to the power 2' do
       it 'returns 0' do
-        crack_time_to_score(90).should eq 0
+        expect(crack_time_to_score(90)).to eq 0
       end
     end
 
     context 'crack time in between 10**2 and 10**4' do
       it 'returns 1' do
-        crack_time_to_score(5000).should eq 1
+        expect(crack_time_to_score(5000)).to eq 1
       end
     end
 
     context 'crack time in between 10**4 and 10**6' do
       it 'returns 2' do
-        crack_time_to_score(500_000).should eq 2
+        expect(crack_time_to_score(500_000)).to eq 2
       end
     end
 
     context 'crack time in between 10**6 and 10**8' do
       it 'returns 3' do
-        crack_time_to_score(50_000_000).should eq 3
+        expect(crack_time_to_score(50_000_000)).to eq 3
       end
     end
 
     context 'crack time above 10**8' do
       it 'returns 4' do
-        crack_time_to_score(110_000_000).should eq 4
+        expect(crack_time_to_score(110_000_000)).to eq 4
       end
     end
   end
@@ -52,7 +52,7 @@ describe Zxcvbn::CrackTime do
     context 'when less than a minute' do
       it 'should return instant' do
         [0, minute_to_seconds - 1].each do |seconds|
-          display_time(seconds).should eql 'instant'
+          expect(display_time(seconds)).to eql 'instant'
         end
       end
     end
@@ -60,7 +60,7 @@ describe Zxcvbn::CrackTime do
     context 'when less than an hour' do
       it 'should return a readable time in minutes' do
         [60, (hour_to_seconds - 1)].each do |seconds|
-          display_time(seconds).should =~ /[0-9]+ minutes$/
+          expect(display_time(seconds)).to match(/[0-9]+ minutes$/)
         end
       end
     end
@@ -68,7 +68,7 @@ describe Zxcvbn::CrackTime do
     context 'when less than a day' do
       it 'should return a readable time in hours' do
         [hour_to_seconds, (day_to_seconds - 1)].each do |seconds|
-          display_time(seconds).should =~ /[0-9]+ hours$/
+          expect(display_time(seconds)).to match(/[0-9]+ hours$/)
         end
       end
     end
@@ -76,7 +76,7 @@ describe Zxcvbn::CrackTime do
     context 'when less than 31 days' do
       it 'should return a readable time in days' do
         [day_to_seconds, month_to_seconds - 1].each do |seconds|
-          display_time(seconds).should =~ /[0-9]+ days$/
+          expect(display_time(seconds)).to match(/[0-9]+ days$/)
         end
       end
     end
@@ -84,7 +84,7 @@ describe Zxcvbn::CrackTime do
     context 'when less than 1 year' do
       it 'should return a readable time in days' do
         [month_to_seconds, (year_to_seconds - 1)].each do |seconds|
-          display_time(seconds).should =~ /[0-9]+ months$/
+          expect(display_time(seconds)).to match(/[0-9]+ months$/)
         end
       end
     end
@@ -92,14 +92,14 @@ describe Zxcvbn::CrackTime do
     context 'when less than a century' do
       it 'should return a readable time in days' do
         [year_to_seconds, (century_to_seconds - 1)].each do |seconds|
-          display_time(seconds).should =~ /[0-9]+ years$/
+          expect(display_time(seconds)).to match(/[0-9]+ years$/)
         end
       end
     end
 
     context 'when a century or more' do
       it 'should return centuries' do
-        display_time(century_to_seconds).should eql 'centuries'
+        expect(display_time(century_to_seconds)).to eql 'centuries'
       end
     end
   end

data/spec/scoring/entropy_spec.rb

@@ -6,13 +6,16 @@ describe Zxcvbn::Entropy do
   let(:entropy) {
     Class.new do
       include Zxcvbn::Entropy
+      def data
+        Zxcvbn::Data.new
+      end
     end.new
   }
 
   describe '#repeat_entropy' do
     it 'returns the correct value' do
       match = Zxcvbn::Match.new(:token => '2222')
-      entropy.repeat_entropy(match).should eq 5.321928094887363
+      expect(entropy.repeat_entropy(match)).to eq 5.321928094887363
     end
   end
 
@@ -24,7 +27,7 @@ describe Zxcvbn::Entropy do
         let(:token) { token }
 
         it 'returns the correct value' do
-          entropy.sequence_entropy(match).should eq 3.807354922057604
+          expect(entropy.sequence_entropy(match)).to eq 3.807354922057604
         end
       end
     end
@@ -33,7 +36,7 @@ describe Zxcvbn::Entropy do
       let(:token) { '23456' }
 
       it 'returns the correct value' do
-        entropy.sequence_entropy(match).should eq 5.643856189774725
+        expect(entropy.sequence_entropy(match)).to eq 5.643856189774725
       end
     end
 
@@ -41,7 +44,7 @@ describe Zxcvbn::Entropy do
       let(:token) { 'bcdef' }
 
       it 'returns the correct value' do
-        entropy.sequence_entropy(match).should eq 7.022367813028454
+        expect(entropy.sequence_entropy(match)).to eq 7.022367813028454
       end
     end
 
@@ -49,7 +52,7 @@ describe Zxcvbn::Entropy do
       let(:token) { 'BCDEF' }
 
       it 'returns the correct value' do
-        entropy.sequence_entropy(match).should eq 8.022367813028454
+        expect(entropy.sequence_entropy(match)).to eq 8.022367813028454
       end
     end
 
@@ -58,7 +61,7 @@ describe Zxcvbn::Entropy do
       let(:token) { 'bcdef' }
 
       it 'returns the correct value' do
-        entropy.sequence_entropy(match).should eq 8.022367813028454
+        expect(entropy.sequence_entropy(match)).to eq 8.022367813028454
       end
     end
   end
@@ -66,13 +69,13 @@ describe Zxcvbn::Entropy do
   describe '#digits_entropy' do
     it 'returns the correct value' do
       match = Zxcvbn::Match.new(:token => '12345678')
-      entropy.digits_entropy(match).should eq 26.5754247590989
+      expect(entropy.digits_entropy(match)).to eq 26.5754247590989
     end
   end
 
   describe '#year_entropy' do
     it 'returns the correct value' do
-      entropy.year_entropy(nil).should eq 6.894817763307944
+      expect(entropy.year_entropy(nil)).to eq 6.894817763307944
     end
   end
 
@@ -80,21 +83,21 @@ describe Zxcvbn::Entropy do
     context 'with a two digit year' do
       it 'returns the correct value' do
         match = Zxcvbn::Match.new(:year => 98)
-        entropy.date_entropy(match).should eq 15.183015000882756
+        expect(entropy.date_entropy(match)).to eq 15.183015000882756
       end
     end
 
     context 'with a four digit year' do
       it 'returns the correct value' do
         match = Zxcvbn::Match.new(:year => 2012)
-        entropy.date_entropy(match).should eq 15.433976574415976
+        expect(entropy.date_entropy(match)).to eq 15.433976574415976
       end
     end
 
     context 'with a separator' do
       it 'returns the correct value' do
         match = Zxcvbn::Match.new(:year => 2012, :separator => '/')
-        entropy.date_entropy(match).should eq 17.433976574415976
+        expect(entropy.date_entropy(match)).to eq 17.433976574415976
       end
     end
   end
@@ -109,42 +112,42 @@ describe Zxcvbn::Entropy do
       let(:token) { 'you' }
       let(:rank)  { 1 }
 
-      specify { calculated_entropy.should eq 0 }
+      specify { expect(calculated_entropy).to eq 0 }
     end
 
     context 'with all upper case characters' do
       let(:token) { 'YOU' }
       let(:rank)  { 1 }
 
-      specify { calculated_entropy.should eq 1 }
+      specify { expect(calculated_entropy).to eq 1 }
     end
 
     context 'starting with uppercase' do
       let(:token) { 'You' }
       let(:rank)  { 1 }
 
-      specify { calculated_entropy.should eq 1 }
+      specify { expect(calculated_entropy).to eq 1 }
     end
 
     context 'starting with uppercase' do
       let(:token) { 'yoU' }
       let(:rank)  { 1 }
 
-      specify { calculated_entropy.should eq 1 }
+      specify { expect(calculated_entropy).to eq 1 }
     end
 
     context 'mixed upper and lower' do
       let(:token) { 'tEsTiNg' }
       let(:rank)  { 1 }
 
-      specify { calculated_entropy.should eq 6 }
+      specify { expect(calculated_entropy).to eq 6 }
     end
 
     context 'starting with digits' do
       let(:token) { '12345' }
       let(:rank)  { 1 }
 
-      specify { calculated_entropy.should eq 0 }
+      specify { expect(calculated_entropy).to eq 0 }
     end
 
     context 'extra l33t entropy' do
@@ -153,7 +156,7 @@ describe Zxcvbn::Entropy do
       let(:l33t)  { true }
       let(:sub)   { {'3' => 'e', '0' => 'o'} }
 
-      specify { calculated_entropy.should eq 1 }
+      specify { expect(calculated_entropy).to eq 1 }
     end
   end
 
@@ -163,8 +166,8 @@ describe Zxcvbn::Entropy do
     context 'when keyboard is qwerty' do
       it 'should return the correct entropy' do
         match.graph = 'qwerty'
-        
-        entropy.spatial_entropy(match).should eql 11.562242424221074
+
+        expect(entropy.spatial_entropy(match)).to eql 11.562242424221074
       end
     end
 
@@ -172,7 +175,7 @@ describe Zxcvbn::Entropy do
       it 'should return the correct entropy' do
         match.graph = 'dvorak'
 
-        entropy.spatial_entropy(match).should eql 11.562242424221074
+        expect(entropy.spatial_entropy(match)).to eql 11.562242424221074
       end
     end
 
@@ -180,7 +183,7 @@ describe Zxcvbn::Entropy do
       it 'should return the correct entropy' do
         match.graph = 'keypad'
 
-        entropy.spatial_entropy(match).should eql 9.05528243550119
+        expect(entropy.spatial_entropy(match)).to eql 9.05528243550119
       end
     end
 
@@ -188,7 +191,7 @@ describe Zxcvbn::Entropy do
       it 'should return the correct entropy' do
         match.turns = 5
 
-        entropy.spatial_entropy(match).should eql 21.761397858718993
+        expect(entropy.spatial_entropy(match)).to eql 21.761397858718993
       end
     end
 
@@ -196,7 +199,7 @@ describe Zxcvbn::Entropy do
       it 'should return the correct entropy' do
         match.shiffted_count = 5
 
-        entropy.spatial_entropy(match).should eql 9.05528243550119
+        expect(entropy.spatial_entropy(match)).to eql 9.05528243550119
       end
     end
 
@@ -205,7 +208,7 @@ describe Zxcvbn::Entropy do
         match.shiffted_count = 5
         match.turns          = 5
 
-        entropy.spatial_entropy(match).should eql 21.761397858718993
+        expect(entropy.spatial_entropy(match)).to eql 21.761397858718993
       end
     end
   end

data/spec/scoring/math_spec.rb

@@ -3,10 +3,14 @@ require 'spec_helper'
 describe Zxcvbn::Math do
   include Zxcvbn::Math
 
+  def data
+    Zxcvbn::Data.new
+  end
+
   describe '#bruteforce_cardinality' do
     context 'when empty password' do
       it 'should return 0 if empty password' do
-        bruteforce_cardinality('').should eql 0
+        expect(bruteforce_cardinality('')).to eql 0
       end
     end
 
@@ -14,7 +18,7 @@ describe Zxcvbn::Math do
       context 'and a digit' do
         it 'should return 10' do
           (0..9).each do |digit|
-            bruteforce_cardinality(digit.to_s).should eql 10
+            expect(bruteforce_cardinality(digit.to_s)).to eql 10
           end
         end
       end
@@ -22,7 +26,7 @@ describe Zxcvbn::Math do
       context 'and an upper case character' do
         it 'should return 26' do
           ('A'..'Z').each do |character|
-            bruteforce_cardinality(character).should eql 26
+            expect(bruteforce_cardinality(character)).to eql 26
           end
         end
       end
@@ -30,7 +34,7 @@ describe Zxcvbn::Math do
       context 'and a lower case character' do
         it 'should return 26' do
           ('a'..'z').each do |character|
-            bruteforce_cardinality(character).should eql 26
+            expect(bruteforce_cardinality(character)).to eql 26
           end
         end
       end
@@ -38,7 +42,7 @@ describe Zxcvbn::Math do
       context 'and a symbol' do
         it 'should return 33' do
           %w|/ [ ` {|.each do |symbol|
-            bruteforce_cardinality(symbol).should eql 33
+            expect(bruteforce_cardinality(symbol)).to eql 33
           end
         end
       end
@@ -47,31 +51,31 @@ describe Zxcvbn::Math do
     context 'when password is more than one character long' do
       context 'and only digits' do
         it 'should return 10' do
-          bruteforce_cardinality('123456789').should eql 10
+          expect(bruteforce_cardinality('123456789')).to eql 10
         end
       end
 
       context 'and only lowercase characters' do
         it 'should return 26' do
-          bruteforce_cardinality('password').should eql 26
+          expect(bruteforce_cardinality('password')).to eql 26
         end
       end
 
       context 'and only uppercase characters' do
         it 'should return 26' do
-          bruteforce_cardinality('PASSWORD').should eql 26
+          expect(bruteforce_cardinality('PASSWORD')).to eql 26
         end
       end
 
       context 'and only symbols' do
         it 'should return 33' do
-          bruteforce_cardinality('/ [ ` {').should eql 33
+          expect(bruteforce_cardinality('/ [ ` {')).to eql 33
         end
       end
 
       context 'and a mixed of character types' do
         it 'should add up every character type cardinality' do
-          bruteforce_cardinality('p1SsWorD!').should eql 95
+          expect(bruteforce_cardinality('p1SsWorD!')).to eql 95
         end
       end
     end
@@ -80,25 +84,25 @@ describe Zxcvbn::Math do
   describe '#average_degree_for_graph' do
     context 'when keyboard is qwerty' do
       it 'returns the correct average degree over all keys' do
-        average_degree_for_graph('qwerty').should eql 4.595744680851064
+        expect(average_degree_for_graph('qwerty')).to eql 4.595744680851064
       end
     end
 
     context 'when keyboard is dvorak' do
       it 'returns the correct average degree over all keys' do
-        average_degree_for_graph('dvorak').should eql 4.595744680851064
+        expect(average_degree_for_graph('dvorak')).to eql 4.595744680851064
       end
     end
 
     context 'when keyboard is keypad' do
       it 'returns the correct average degree over all keys' do
-        average_degree_for_graph('keypad').should eql 5.066666666666666
+        expect(average_degree_for_graph('keypad')).to eql 5.066666666666666
       end
     end
 
     context 'when keyboard is mac keypad' do
       it 'returns the correct average degree over all keys' do
-        average_degree_for_graph('mac_keypad').should eql 5.25
+        expect(average_degree_for_graph('mac_keypad')).to eql 5.25
       end
     end
   end
@@ -106,25 +110,25 @@ describe Zxcvbn::Math do
   describe '#starting_positions_for_graph' do
     context 'when keyboard is qwerty' do
       it 'returns the correct average degree over all keys' do
-        starting_positions_for_graph('qwerty').should eql 94
+        expect(starting_positions_for_graph('qwerty')).to eql 94
       end
     end
 
     context 'when keyboard is dvorak' do
       it 'returns the correct average degree over all keys' do
-        starting_positions_for_graph('dvorak').should eql 94
+        expect(starting_positions_for_graph('dvorak')).to eql 94
       end
     end
 
     context 'when keyboard is keypad' do
       it 'returns the correct average degree over all keys' do
-        starting_positions_for_graph('keypad').should eql 15
+        expect(starting_positions_for_graph('keypad')).to eql 15
       end
     end
 
     context 'when keyboard is mac keypad' do
       it 'returns the correct average degree over all keys' do
-        starting_positions_for_graph('mac_keypad').should eql 16
+        expect(starting_positions_for_graph('mac_keypad')).to eql 16
       end
     end
   end