Refactoring sweep.

Also renamed some stuff to more strictly conform to convention.

Author: SyntaxColoring

Markov.coffee

@@ -4,15 +4,18 @@ github.com/SyntaxColoring/Markov-Word-Generator
 
 Released under the MIT license.
 
-Copyright (c) 2013 SyntaxColoring
+Copyright (c) 2013 Max Marrone
+
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to
 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 the Software, and to permit persons to whom the Software is furnished to do so,
 subject to the following conditions:
+
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@@ -26,16 +29,16 @@ class Markov
 	# (to collectively use as a corpus) and value for n (to use as the Markov order).
 	# sequences may be empty. n must be an integer no lower than 0.
 	# Feel free to directly access and modify an object's .sequences and .n.
-	constructor: (@sequences = [], @n = 2) ->
+	constructor: (@sequences = [], @n = 2, @maxLength = 20) ->
 
 	# Generates a new pseudorandom sequence generated by the Markov chain and
-	# returns it as an array.  Its length will be truncated to maxLength if necessary.
-	generate: (maxLength = 20) ->
+	# returns it as an array.  Its length will be truncated to @maxLength if necessary.
+	generate: ->
 		result = []
 		currentState = => # Returns at most the last @ elements of result.
 			result[Math.max(0, result.length-@n)...result.length]
 		continuation = => @continue(currentState())
-		while result.length < maxLength and (nextElement = continuation())?
+		while result.length < @maxLength and (nextElement = continuation())?
 			result.push nextElement
 		return result
 
@@ -101,4 +104,5 @@ class Markov
 				if sum >= target then return continuationName
 		return null # Either the node was null or it had no continuations.
 
-(exports ? window).Markov = Markov
+if module? then module.exports = Markov
+else this.Markov = Markov

ReadMe.md

@@ -26,7 +26,7 @@ Please contribute.  I'm so lonely.
 Report issues [here](https://github.com/SyntaxColoring/Markov-Word-Generator/issues)
 and I'll gladly look into them.
 
-[Markov.coffee](Markov.coffee)
+[Markov.coffee](markov.coffee)
 ==============================
 The back-end logic for managing the Markov chain is available as a standalone
 CoffeeScript module.  It's flexible enough for you to use in your own project,
@@ -53,21 +53,23 @@ Setup
 -----
 After including the script, `Markov` objects can be constructed like this:
 
-    markov = new window.Markov ["sassafras", "mississippi"], 1
+    markov = new Markov ["sassafras", "mississippi"], 1
 
 	# Or, on CommonJS:
-	# markov = new Markov.Markov ["sassafras", "mississippi"], 1
+	# Markov = require "./markov"
+	# markov = new Markov ["sassafras", "mississippi"], 1
 
 The first parameter to the constructor is an array of sequences.  The sequences
 are combined together to form the corpus.  The generator takes care not to link
 elements across sequence boundaries.  In the example above, the last S in *sassafras*
-is not associated with the M in *mississippi.*  If you really *do* want that to happen,
-here's how to do it:
+is not associated with the M in *mississippi.*  If you really *do* want those letters
+to be associated, here's how to do it:
 
-	markov = new window.Markov["sassafrasmississippi"], 1
+	markov = new Markov ["sassafrasmississippi"], 1
 
 The second parameter to the constructor is *n,* the *Markov order* - basically, how
-many previous elements the next element depends on.  Low values make the Markov chain more random, while high values make it stick closer to the corpus.
+many previous elements the next element depends on.  Low values make the Markov
+chain more random, while high values make it stick closer to the corpus.
 
 If left unspecified, the array of sequences defaults to `[]` and the Markov order defaults to `2`.
 
@@ -81,17 +83,17 @@ Generation
 Make the Markov chain do something useful with `.generate()`.  Note that it returns
 an array, so if you want a string you'll have to use `.join("")`.
 
-	markov = new window.Markov ["sassafras", "mississippi"]
-	alert markov.generate().join("") # Alerted "rassippi".
-	alert markov.generate().join("") # Alerted "frassissafrassippi".
+	markov = new Markov ["sassafras", "mississippi"]
+	alert markov.generate().join "" # Alerted "rassippi".
+	alert markov.generate().join "" # Alerted "frassissafrassippi".
 
 `.generate()` takes an optional maximum length parameter, e.g. `markov.generate(10)` to
 limit generated words to 10 characters long.  If unspecified, it defaults to 20 elements.
 There always needs to be a maximum length, because otherwise, things like this
 could result in infinite loops:
 
-	markov = new window.Markov ["abba"], 1
-	alert markov.generate().join("") # "bbababbabbbbababababbbabababababbabbbbabbbabababab..."
+	markov = new Markov ["abba"], 1
+	alert markov.generate().join "" # "bbababbabbbbababababbbabababababbabbbbabbbabababab..."
 
 Other Stuff
 -----------

index.html

@@ -20,8 +20,8 @@
 
 	<!-- CoffeeScript. -->
 	<script src = "coffee-script.js"></script>
-	<script type = "text/coffeescript" src = "Markov.coffee"></script>
-	<script type = "text/coffeescript" src = "WordGenerator.coffee"></script>
+	<script type = "text/coffeescript" src = "markov.coffee"></script>
+	<script type = "text/coffeescript" src = "word-generator.coffee"></script>
 </head>
 
 <body>

WordGenerator.coffee renamed to word-generator.coffee

@@ -27,8 +27,7 @@ corpora = [
 corpora = ({ name: x, content: corpora[i+1] } for x, i in corpora by 2)
 
 
-### UI and Initialization: ###
-
+### UI And Initialization: ###
 $ ->
 	$word = $("#word")
 	$button = $("#button")
@@ -38,35 +37,29 @@ $ ->
 	$order = $("#order")
 	$maxLength = $("#maxLength")
 
-	markovChain = new window.Markov
-	maxLength = 0
-	
-	words = (rawInput) ->
+	parseWords = (rawInput) ->
 		rawInput.toLowerCase().replace(/[^a-z\s]/g, "").split(/\s/g)
 
 	capitalize = (string) ->
-		if string.length > 0
-			string[0].toUpperCase() + string.slice(1)
+		if string.length > 0 then string[0].toUpperCase() + string.slice(1)
 		else ""
 
-	generateAndShow = ->
-		$word.text capitalize markovChain.generate(maxLength).join("")
-	
 	selectCorpus = (index) ->
 		$corpusName.text(corpora[index].name)
 		$corpusInput.val(corpora[index].content)
-		markovChain.sequences = words corpora[index].content
-		$button.unbind("click").click (generateAndShow)
-	selectCorpus 0
+		markovChain.sequences = parseWords corpora[index].content
+	
+	populatePresetDropdown = ->
+		for corpus, index in corpora
+			do (corpus, index) ->
+				if index is corpora.length - 1
+					$corpora.append('<li class = "divider">')
+				newLink = $("<a href = \"#\">#{corpus.name}</a>")
+				newLink.click((event) -> event.preventDefault(); selectCorpus index)
+				$("<li>").append(newLink).appendTo($corpora)
 
-	# Populate the dropdown list of presets.
-	for corpus, index in corpora
-		do (corpus, index) ->
-			if index is corpora.length - 1
-				$corpora.append('<li class = "divider">')
-			newLink = $("<a href = \"#\">#{corpus.name}</a>")
-			newLink.click((event) -> event.preventDefault(); selectCorpus index)
-			$("<li>").append(newLink).appendTo($corpora)
+	generateAndShow = ->
+		$word.text capitalize markovChain.generate().join("")
 
 	# If the user types in the <textarea>, copy the updates into the custom
 	# corpus and select that as the active corpus.
@@ -76,13 +69,18 @@ $ ->
 		selectCorpus corpora.length-1;
 
 	$order.change ->
-		markovChain.n = +(@value)
+		markovChain.n = +@value
 		@value = markovChain.n
-	$order.change()
 
 	$maxLength.change ->
-		maxLength = Math.max +(@value), 1
-		@value = maxLength
-	$maxLength.change()
+		markovChain.maxLength = Math.max +@value , 1
+		@value = markovChain.maxLength
+	
+	$button.click generateAndShow
 
+	markovChain = new Markov
+	populatePresetDropdown();
+	selectCorpus 0
+	$order.change()
+	$maxLength.change()
 	generateAndShow()