v1.2 CMD/Seajs支持与cache

1. 增加CMD/Seajs支持。 2. 增加cache缓存记录，避免重复运算。
mc-zone · Feb 7, 2015 · ababcbb · ababcbb
1 parent 16b22c9
commit ababcbb
Show file tree

Hide file tree

Showing 10 changed files with 154 additions and 34 deletions.
diff --git a/GB2260.min.js b/GB2260.min.js
diff --git a/IDValidator.min.js b/IDValidator.min.js
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Chinese Personal ID Card Validation
 
 支持15位与18位身份证号
 
-支持 AMD/CommonJS, 或浏览器直接使用
+支持 AMD/CMD/CommonJS, 或浏览器直接使用
 
 
 ##API
@@ -46,17 +46,35 @@ require(["IDValidator","GB2260"], function(IDValidator,GB2260) {
 
     var Validator = new IDValidator();
 
+    //或使用地址库
+    var Validator2 = new IDValidator( GB2260 );
+
 });
 
 ```
 
+###CMD / SeaJS
+```javascript
+define(function(require, exports, module) {
+    var IDValidator = require('path/to/IDValidator');
+    var Validator = new IDValidator();
+
+    //或使用地址库
+    var GB2260 = require('path/to/GB2260');
+    var Validator2 = new IDValidator( GB2260 );
+});
+```
+
 ###CommonJS / Node
 ```javascript
 var IDValidator = require('path/to/IDValidator');
 var GB2260 = require('path/to/GB2260');
 
 var Validator = new IDValidator();
 
+//或使用地址库
+var Validator2 = new IDValidator( GB2260 );
+
 ```
 
 提示：所有API引入IDValidator.js就可以使用。

diff --git a/examples/client-side/lib/app.js → examples/client-side/lib/requireJsApp.js b/examples/client-side/lib/app.js → examples/client-side/lib/requireJsApp.js
diff --git a/examples/client-side/lib/sea.js b/examples/client-side/lib/sea.js
diff --git a/examples/client-side/lib/seaJsApp.js b/examples/client-side/lib/seaJsApp.js
@@ -0,0 +1,54 @@
+define(function(require, exports, module) {
+
+    var IDValidator = require('IDValidator');
+    var GB2260 = require('GB2260');
+
+    function log() {
+        for(var i=0;i<arguments.length;i++){
+            var m = arguments[i];
+            if( typeof m == 'object' ){
+                for( var k in m ){
+                    if( m.hasOwnProperty(k) ){
+                        log(k+':',m[k]);
+                    }
+                }
+            }else{
+                var p = document.createElement('p');
+                p.innerText = m.toString();
+                document.body.appendChild(p);
+            }
+        }
+    }
+
+    var testId = "371001198010082394";
+    var fakeId = "345955198706122245";
+    var fifteenId = "431389760616601";
+
+    var Validator = new IDValidator();
+
+    //检测是否合法
+    log( '\nID:'+testId+'的合法性为:\n', Validator.isValid( testId ) );
+    log( '\n假ID:'+fakeId+'的合法性为:\n', Validator.isValid( fakeId ) );
+    //15位
+    log( '\n15位ID:'+fifteenId+'的合法性为:\n', Validator.isValid( fifteenId ) );
+
+    var Validator2 = new IDValidator( GB2260 );
+
+    //输出分析信息
+    log( '\nID:'+testId+'的信息为(带地址):\n', Validator2.getInfo( testId ) );
+
+    //伪造一个ID
+    var makeID = Validator.makeID();
+    log( '\n制作的ID:'+makeID+'的信息为:\n',Validator2.getInfo( makeID ) );
+
+
+    //伪造一个15位ID
+    var makeID2 = Validator.makeID(true);
+    log( '\n制作的15位ID:'+makeID2+'的信息为:\n',Validator2.getInfo( makeID2 ) );
+
+
+    //随机地址码伪造一个ID
+    var makeID3 = Validator2.makeID();
+    log( '\n随机地址码制作的ID:'+makeID3+'的信息为:\n',Validator2.getInfo( makeID3 ) );
+
+});
diff --git a/examples/client-side/useRequireJS.html b/examples/client-side/useRequireJS.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>IDValidator AMD</title>
-    <script type="text/javascript" data-main="lib/app" src="lib/require.js"></script>
+    <script type="text/javascript" data-main="lib/requireJSApp" src="lib/require.js"></script>
 </head>
 <body>
 

diff --git a/examples/client-side/useSeaJS.html b/examples/client-side/useSeaJS.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+<head>
+	<meta charset="UTF-8">
+	<title>IDValidator AMD</title>
+    <script type="text/javascript" src="lib/sea.js"></script>
+    <script type="text/javascript">
+    seajs.config({
+        alias: {
+            "IDValidator": "../../../src/IDValidator.js",
+            "GB2260": "../../../src/GB2260.js"
+        }
+    });
+
+    seajs.use("seaJsApp");
+    </script>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/src/GB2260.js b/src/GB2260.js