diff --git a/.gitignore b/.gitignore
index 8632252b..fde5af4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
!demo/jquery.js
!demo/require.js
!demo/mustache.js
+!demo/demo.js
node_modules
lib
*~
diff --git a/demo/demo.coffee b/demo/demo.coffee
index 6e8fcedf..78b95879 100644
--- a/demo/demo.coffee
+++ b/demo/demo.coffee
@@ -92,6 +92,15 @@ results_tmpl = '''
| guesses_log10: |
{{guesses_log10}} |
+
+ | guesses_log2: |
+ {{guesses_log2}} |
+
+
+ | entropy: |
+ {{entropy}} |
+
+
| score: |
{{score}} / 4 |
@@ -164,10 +173,22 @@ props_tmpl = '''
pattern: |
{{pattern}} |
+
+ | sequence name: |
+ {{sequence_name}} |
+
| guesses_log10: |
{{guesses_log10}} |
+
+ | guesses_log2: |
+ {{guesses_log2}} |
+
+
+ | entropy: |
+ {{entropy}} |
+
{{#cardinality}}
| cardinality: |
@@ -288,10 +309,15 @@ props_tmpl = '''
round_to_x_digits = (n, x) ->
Math.round(n * Math.pow(10, x)) / Math.pow(10, x)
+# add two entropy computations
round_logs = (r) ->
r.guesses_log10 = round_to_x_digits(r.guesses_log10, 5)
+ r.guesses_log2 = round_to_x_digits(r.guesses_log2, 3)
+ r.entropy = round_to_x_digits(r.entropy,3)
for m in r.sequence
m.guesses_log10 = round_to_x_digits(m.guesses_log10, 5)
+ m.guesses_log2 = round_to_x_digits(m.guesses_log2, 3)
+ m.entropy = round_to_x_digits(m.entropy, 3)
requirejs ['../dist/zxcvbn'], (zxcvbn) ->
$ ->
diff --git a/demo/demo.js b/demo/demo.js
new file mode 100644
index 00000000..a5c4b46d
--- /dev/null
+++ b/demo/demo.js
@@ -0,0 +1,85 @@
+// Generated by CoffeeScript 1.10.0
+(function() {
+ var feedback_tmpl, guess_times_tmpl, props_tmpl, results_tmpl, round_logs, round_to_x_digits, test_passwords;
+
+ test_passwords = 'zxcvbn\nqwER43@!\nTr0ub4dour&3\ncorrecthorsebatterystaple\ncoRrecth0rseba++ery9.23.2007staple$\n\np@ssword\np@$$word\n123456\n123456789\n11111111\nzxcvbnm,./\nlove88\nangel08\nmonkey13\niloveyou\nwoaini\nwang\ntianya\nzhang198822\nli4478\na6a4Aa8a\nb6b4Bb8b\nz6z4Zz8z\naiIiAaIA\nzxXxZzXZ\npässwörd\nalpha bravo charlie delta\na b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 8 9\na b c 1 2 3\ncorrect-horse-battery-staple\ncorrect.horse.battery.staple\ncorrect,horse,battery,staple\ncorrect~horse~battery~staple\nWhyfaultthebardifhesingstheArgives’harshfate?\nEupithes’sonAntinousbroketheirsilence\nAthena lavished a marvelous splendor\nbuckmulliganstenderchant\nseethenthatyewalkcircumspectly\nLihiandthepeopleofMorianton\nestablishedinthecityofZarahemla\n!"£$%^&*()\n\nD0g..................\nabcdefghijk987654321\nneverforget13/3/1997\n1qaz2wsx3edc\n\ntemppass22\nbriansmith\nbriansmith4mayor\npassword1\nviking\nthx1138\nScoRpi0ns\ndo you know\n\nryanhunter2000\nrianhunter2000\n\nasdfghju7654rewq\nAOEUIDHG&*()LS_\n\n12345678\ndefghi6789\n\nrosebud\nRosebud\nROSEBUD\nrosebuD\nros3bud99\nr0s3bud99\nR0$38uD99\n\nverlineVANDERMARK\n\neheuczkqyq\nrWibMFACxAUGZmxhVncy\nBa9ZyWABu99[BK#6MBgbH88Tofv)vs$w';
+
+ results_tmpl = '{{#results}}\n\n \n | password: | \n {{password}} | \n
\n \n | guesses_log10: | \n {{guesses_log10}} | \n
\n \n | guesses_log2: | \n {{guesses_log2}} | \n
\n \n | entropy: | \n {{entropy}} | \n
\n \n
\n | score: | \n {{score}} / 4 | \n
\n | function runtime (ms): | \n {{calc_time}} | \n
\n \n | guess times: | \n
\n {{& guess_times_display}}\n {{& feedback_display }}\n \n | match sequence: | \n
\n
\n{{& sequence_display}}\n{{/results}}';
+
+ guess_times_tmpl = '
\n | 100 / hour: | \n {{online_throttling_100_per_hour}} | \n (throttled online attack) | \n
\n\n | 10 / second: | \n {{online_no_throttling_10_per_second}} | \n (unthrottled online attack) | \n
\n\n | 10k / second: | \n {{offline_slow_hashing_1e4_per_second}} | \n (offline attack, slow hash, many cores) | \n
\n | 10B / second: | \n {{offline_fast_hashing_1e10_per_second}} | \n (offline attack, fast hash, many cores) | \n
';
+
+ feedback_tmpl = '{{#warning}}\n\n | warning: | \n {{warning}} | \n
\n{{/warning}}\n{{#has_suggestions}}\n\n | suggestions: | \n \n {{#suggestions}}\n - {{.}}
\n {{/suggestions}}\n | \n
\n{{/has_suggestions}}';
+
+ props_tmpl = '\n{{#sequence}}\n
\n \n | \'{{token}}\' | \n
\n \n | pattern: | \n {{pattern}} | \n
\n \n | sequence name: | \n {{sequence_name}} | \n
\n \n | guesses_log10: | \n {{guesses_log10}} | \n
\n \n | guesses_log2: | \n {{guesses_log2}} | \n
\n \n | entropy: | \n {{entropy}} | \n
\n {{#cardinality}}\n \n | cardinality: | \n {{cardinality}} | \n
\n \n | length: | \n {{length}} | \n
\n {{/cardinality}}\n {{#rank}}\n \n | dictionary_name: | \n {{dictionary_name}} | \n
\n \n | rank: | \n {{rank}} | \n
\n \n | reversed: | \n {{reversed}} | \n
\n {{#l33t}}\n \n | l33t subs: | \n {{sub_display}} | \n
\n \n | un-l33ted: | \n {{matched_word}} | \n
\n {{/l33t}}\n \n | base-guesses: | \n {{base_guesses}} | \n
\n \n | uppercase-variations: | \n {{uppercase_variations}} | \n
\n \n | l33t-variations: | \n {{l33t_variations}} | \n
\n {{/rank}}\n {{#graph}}\n \n | graph: | \n {{graph}} | \n
\n \n | turns: | \n {{turns}} | \n
\n \n | shifted count: | \n {{shifted_count}} | \n
\n {{/graph}}\n {{#base_token}}\n \n | base_token: | \n \'{{base_token}}\' | \n
\n \n | base_guesses: | \n {{base_guesses}} | \n
\n \n | num_repeats: | \n {{repeat_count}} | \n
\n {{/base_token}}\n {{#sequence_name}}\n \n | sequence-name: | \n {{sequence_name}} | \n
\n \n | sequence-size | \n {{sequence_space}} | \n
\n \n | ascending: | \n {{ascending}} | \n
\n {{/sequence_name}}\n {{#regex_name}}\n \n | regex_name: | \n {{regex_name}} | \n
\n {{/regex_name}}\n {{#day}}\n \n | day: | \n {{day}} | \n
\n \n | month: | \n {{month}} | \n
\n \n | year: | \n {{year}} | \n
\n \n | separator: | \n \'{{separator}}\' | \n
\n {{/day}}\n
\n{{/sequence}}\n