/series/add: transform catalog number to valid form.

Fix #134

Author: php-coder

pom.xml

@@ -35,6 +35,7 @@
 
 		<!-- Also don't forget to change version in src/main/java/ru/mystamps/web/config/MvcConfig.java -->
 		<bootstrap.version>2.3.1</bootstrap.version>
+		<jquery.version>1.9.0</jquery.version>
 
 		<testng.version>6.7</testng.version>
 		<spock.version>0.7-groovy-2.0</spock.version>
@@ -54,6 +55,7 @@
 		<surefire.plugin.version>2.16</surefire.plugin.version>
 		<gmaven.plugin.version>1.4</gmaven.plugin.version>
 		<gmaven.runtime.plugin.version>1.5</gmaven.runtime.plugin.version>
+		<jasmine.plugin.version>1.3.1.4</jasmine.plugin.version>
 		<failsafe.plugin.version>2.16</failsafe.plugin.version>
 		<jetty.plugin.version>8.1.14.v20131031</jetty.plugin.version>
 		<liquibase.plugin.version>3.0.8</liquibase.plugin.version>
@@ -238,6 +240,13 @@
 			<scope>runtime</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.webjars</groupId>
+			<artifactId>jquery</artifactId>
+			<version>${jquery.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -390,6 +399,9 @@
 					<exclude>liquibase/sql/test-*.sql</exclude>
 				</excludes>
 			</resource>
+			<resource>
+				<directory>${basedir}/src/main/javascript</directory>
+			</resource>
 		</resources>
 
 		<filters>
@@ -487,6 +499,12 @@
 				</dependencies>
 			</plugin>
 
+			<plugin>
+				<groupId>com.github.searls</groupId>
+				<artifactId>jasmine-maven-plugin</artifactId>
+				<version>${jasmine.plugin.version}</version>
+			</plugin>
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>

src/main/java/ru/mystamps/web/config/MvcConfig.java

@@ -68,10 +68,13 @@ public void addViewControllers(ViewControllerRegistry registry) {
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		registry.addResourceHandler("/static/**").addResourceLocations("/WEB-INF/static/*");
+		registry.addResourceHandler("/public/js/*.js").addResourceLocations("/WEB-INF/classes/*.js");
 
 		// For WebJars:
 		registry.addResourceHandler("/public/bootstrap/**")
 			.addResourceLocations("classpath:/META-INF/resources/webjars/bootstrap/2.3.1/");
+		registry.addResourceHandler("/public/jquery/**")
+			.addResourceLocations("classpath:/META-INF/resources/webjars/jquery/1.9.0/");
 	}
 
 	@Override

src/main/javascript/CatalogUtils.js

@@ -0,0 +1,72 @@
+var CatalogUtils = {
+	
+	/** @public */
+	expandNumbers: function(input) {
+		if (input === '' || input === null || typeof(input) === 'undefined') {
+			return input;
+		}
+		
+		if (input.indexOf('-') < 0) {
+			return input;
+		}
+		
+		if (! /^[0-9]+-[0-9]+(,[0-9]+-[0-9]+)*$/.test(input)) {
+			return input;
+		}
+		
+		var ranges = input.split(','),
+			result = [];
+		// TODO: use jQuery.each() + jQuery.map()
+		for (var i = 0; i < ranges.length; i++) {
+			var range = ranges[i];
+			result.push(this.expandRange(range));
+		}
+		
+		return result.join(',');
+	},
+	
+	/** @private */
+	expandRange: function(range) {
+		var parts = range.split('-');
+		if (parts.length != 2) {
+			return range;
+		}
+		
+		var from = parts[0],
+			to = parts[1],
+			start = parseInt(from, 10);
+		if (isNaN(start)) {
+			return range;
+		}
+		
+		var end = parseInt(to, 10);
+		if (isNaN(end)) {
+			return range;
+		}
+		
+		if (end < start) {
+			var lengthOfSharedPart = from.length - to.length,
+				sharedPart = from.substring(0, lengthOfSharedPart),
+				correctedEnd = sharedPart + to,
+				newEnd = parseInt(correctedEnd, 10);
+			if (isNaN(newEnd)) {
+				return range;
+			}
+			
+			// when first number has leading zero(s)
+			if (newEnd < start) {
+				return range;
+			}
+			
+			end = newEnd;
+		}
+		
+		var result = [];
+		for (var i = start; i <= end; i++) {
+			result.push(i);
+		}
+		
+		return result.join(',');
+	}
+	
+}

src/main/webapp/WEB-INF/tiles/body/series/add.jsp

@@ -51,7 +51,7 @@
 				<span class="field-label"><spring:message code="t_michel" /></span>
 			</form:label>
 			<div class="controls controls-row">
-				<form:input path="michelNumbers" cssClass="span4" />
+				<form:input path="michelNumbers" cssClass="span4 js-catalog-numbers" />
 				<form:input path="michelPrice" cssClass="span2" size="5" />
 				<form:select path="michelCurrency" cssClass="span2">
 					<form:options />
@@ -73,7 +73,7 @@
 				<span class="field-label"><spring:message code="t_scott" /></span>
 			</form:label>
 			<div class="controls controls-row">
-				<form:input path="scottNumbers" cssClass="span4" />
+				<form:input path="scottNumbers" cssClass="span4 js-catalog-numbers" />
 				<form:input path="scottPrice" cssClass="span2" size="5" />
 				<form:select path="scottCurrency" cssClass="span2">
 					<form:options />
@@ -95,7 +95,7 @@
 				<span class="field-label"><spring:message code="t_yvert" /></span>
 			</form:label>
 			<div class="controls controls-row">
-				<form:input path="yvertNumbers" cssClass="span4" />
+				<form:input path="yvertNumbers" cssClass="span4 js-catalog-numbers" />
 				<form:input path="yvertPrice" cssClass="span2" size="5" />
 				<form:select path="yvertCurrency" cssClass="span2">
 					<form:options />
@@ -117,7 +117,7 @@
 				<span class="field-label"><spring:message code="t_sg" /></span>
 			</form:label>
 			<div class="controls controls-row">
-				<form:input path="gibbonsNumbers" cssClass="span4" />
+				<form:input path="gibbonsNumbers" cssClass="span4 js-catalog-numbers" />
 				<form:input path="gibbonsPrice" cssClass="span2" size="5" />
 				<form:select path="gibbonsCurrency" cssClass="span2">
 					<form:options />

src/main/webapp/WEB-INF/tiles/layout/default.jsp

@@ -35,5 +35,7 @@
 
 		<!-- Placed at the end of the document so the pages load faster -->
 		<script src="${bootstrapJsUrl}"></script>
+		
+		<tiles:insertAttribute name="tail" ignore="true" />
 	</body>
 </html>

src/main/webapp/WEB-INF/tiles/tail/series/add.jsp

@@ -0,0 +1,18 @@
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %>
+
+<spring:url var="catalogUtilsJsUrl" value="/public/js/CatalogUtils.js" />
+<spring:url var="jqueryJsUrl" value="/public/jquery/jquery.min.js" />
+
+<script src="${catalogUtilsJsUrl}"></script>
+<script src="${jqueryJsUrl}"></script>
+
+<script>
+	$(function() {
+		$('.js-catalog-numbers').on('blur', function() {
+			$(this).val(function(idx, val) {
+				return CatalogUtils.expandNumbers(val);
+			});
+		});
+	});
+</script>
+

src/main/webapp/WEB-INF/tiles/tiles.xml

@@ -51,6 +51,7 @@
 	<definition name="series/add" extends="defaultTemplate">
 		<put-attribute name="title" value="t_add_series" />
 		<put-attribute name="body" value="/WEB-INF/tiles/body/series/add.jsp" />
+		<put-attribute name="tail" value="/WEB-INF/tiles/tail/series/add.jsp" />
 	</definition>
 
 	<definition name="series/info" extends="defaultTemplate">

src/test/javascript/CatlogUtilsSpec.js

@@ -0,0 +1,67 @@
+describe("CatalogUtils.expandNumbers()", function() {
+	
+	it("should return empty string for empty string", function() {
+		expect(CatalogUtils.expandNumbers("")).toBe("");
+	})
+	
+	it("should return null for null", function() {
+		expect(CatalogUtils.expandNumbers(null)).toBeNull();
+	})
+	
+	it("should return undefined for empty unndefined", function() {
+		expect(CatalogUtils.expandNumbers(undefined)).toBeUndefined();
+	})
+	
+	it("should return string without hyphen as it", function() {
+		expect(CatalogUtils.expandNumbers("test")).toEqual("test");
+	})
+	
+	it("should return 'one-two' for 'one-two'", function() {
+		expect(CatalogUtils.expandNumbers("one-two")).toEqual("one-two");
+	})
+	
+	it("should return '1,2' for '1-2'", function() {
+		expect(CatalogUtils.expandNumbers("1-2")).toEqual("1,2");
+	})
+	
+	it("should return '1,2,3' for '1-3'", function() {
+		expect(CatalogUtils.expandNumbers("1-3")).toEqual("1,2,3");
+	})
+	
+	it("should return '10,11' for '10-11'", function() {
+		expect(CatalogUtils.expandNumbers("10-11")).toEqual("10,11");
+	})
+	
+	it("should return '10,11,12' for '10-12'", function() {
+		expect(CatalogUtils.expandNumbers("10-12")).toEqual("10,11,12");
+	})
+	
+	it("should return '2415,2416,2417' for '2415-7'", function() {
+		expect(CatalogUtils.expandNumbers("2415-7")).toEqual("2415,2416,2417");
+	})
+	
+	it("should return '2415,2416,2417' for '2415-17'", function() {
+		expect(CatalogUtils.expandNumbers("2415-17")).toEqual("2415,2416,2417");
+	})
+	
+	it("should return '2499,2450,2451' for '2499-501'", function() {
+		expect(CatalogUtils.expandNumbers("2499-501")).toEqual("2499,2500,2501");
+	})
+	
+	it("should return '1,2,3,5,6' for '1-3,5-6'", function() {
+		expect(CatalogUtils.expandNumbers("1-3,5-6")).toEqual("1,2,3,5,6");
+	})
+	
+	it("should return '1,2,3,5,6,8,9' for '1-3,5-6,8-9'", function() {
+		expect(CatalogUtils.expandNumbers("1-3,5-6,8-9")).toEqual("1,2,3,5,6,8,9");
+	})
+	
+	it("should return 'test 1-3' for 'test 1-3'", function() {
+		expect(CatalogUtils.expandNumbers("test 1-3")).toEqual("test 1-3");
+	})
+	
+	it("should return '09-5' for '09-5'", function() {
+		expect(CatalogUtils.expandNumbers("09-5")).toEqual("09-5");
+	})
+	
+});