Added gutters to 'divide' - see #20

package.json

@@ -1,7 +1,7 @@
 {
   "name": "griddify",
   "private": "true",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "A tiny photoshop panel to make guides and grids",
   "main": "index.js",
   "scripts": {

scripts/coffee/commands/divide.coffee

@@ -1,3 +1,4 @@
+parseDivisions = require './divide/parseDivisions'
 _ = require 'photoshopjs-core'
 
 module.exports = divide = (orientation, divisions) ->
@@ -6,24 +7,7 @@ module.exports = divide = (orientation, divisions) ->
 
 		throw Error "orientation '#{orientation}' isn't in ['vertical', 'horizontal', 'both']"
 
-	unless typeof divisions is 'string' or typeof divisions is 'number'
-
-		throw Error "divisions must be a string"
-
-	divisions = String(divisions).replace /^\s+/, ''
-	.replace /\s+$/, ''
-
-	unless divisions.match /^[0-9]+$/
-
-		throw Error "Divisions must be a number. Given: '#{divisions}'"
-
-	d = parseInt divisions
-
-	unless d isnt 0
-
-		throw Error "Wrong value for divisions: '#{divisions}'"
-
-	divisions = d
+	{divisions, gutters} = parseDivisions divisions
 
 	doc = _.docs.active
 
@@ -55,17 +39,17 @@ module.exports = divide = (orientation, divisions) ->
 		to = bounds[2]
 		method = 'addVertical'
 
-		add from, to, method
+		addSeries from, to, method
 
 	horizontal = ->
 
 		from = bounds[1]
 		to = bounds[3]
 		method = 'addHorizontal'
 
-		add from, to, method
+		addSeries from, to, method
 
-	add = (from, to, method) ->
+	addSeries = (from, to, method) ->
 
 		len = to - from
 
@@ -77,7 +61,43 @@ module.exports = divide = (orientation, divisions) ->
 
 			cur += piece
 
-			doc.guides[method] cur
+			addSingle cur, method
+
+		return
+
+	addSingle = (at, method) ->
+
+		for p in positions
+
+			doc.guides[method] p + at
+
+		return
+
+	positions = []
+
+	do ->
+
+		if gutters.length is 0
+
+			positions.push 0
+
+			return
+
+		absolutes = [0]
+
+		cur = 0
+
+		for g in gutters
+
+			cur += g
+
+			absolutes.push cur
+
+		len = cur
+
+		for p in absolutes
+
+			positions.push p - (len / 2)
 
 		return
 

scripts/coffee/commands/divide/parseDivisions.coffee

@@ -0,0 +1,54 @@
+module.exports = (str) ->
+
+	conf =
+
+		divisions: 0
+
+		hasGutters: no
+
+		gutters: []
+
+	unless typeof str is 'string' or typeof str is 'number'
+
+		throw Error "divisions must be a string"
+
+	str = String(str).replace /^\s+/, ''
+	.replace /\s+$/, ''
+
+	nums = str.split /\s+/
+
+	if nums.length is 0
+
+		throw Error "Divisions must contain numbers"
+
+	divisions = nums.shift()
+
+	unless divisions.match /^[0-9]+$/
+
+		throw Error "Divisions must be a number. Given: '#{divisions}'"
+
+	divisions = parseInt divisions
+
+	if divisions is 0
+
+		throw Error "Divisions cannot be zero"
+
+	conf.divisions = divisions
+
+	for gutter, i in nums
+
+		conf.hasGutters = yes
+
+		if isNaN gutter
+
+			throw Error "gutter '#{gutter}' is not a number"
+
+		gutter = parseFloat gutter
+
+		if gutter <= 0
+
+			throw Error "Gutters must be bigger than zero"
+
+		conf.gutters.push gutter
+
+	conf