Merge pull request #5 from yupmin/fix-for-umd

yupmin · yupmin · commit 4cb678bd1057 · 2015-12-18T00:20:00.000+09:00
Fix for umd
diff --git a/dist/js-package-sample.js b/dist/js-package-sample.js
@@ -1,9 +1,9 @@
 /**
  * Copyright (c) 2015
  * js-package-sample - Javascript Package Sample
- * Built on 2015-12-16
+ * Built on 2015-12-17
  * 
- * @version 0.0.4
+ * @version 0.0.5
  * @link https://github.com/yupmin/js-package-sample.git
  * @license MIT
  */
@@ -22,7 +22,8 @@
 }(this, function (jQuery) {
     'use strict';
 
-    var userAgent;
+    var userAgent,
+        repeaterId;
 
     return {
         getUserAgent: function() {
@@ -31,6 +32,30 @@
 
         setUserAgent: function(ua) {
             userAgent = ua;
-        }
+        },
+
+        timerGetUserAgent: function(cb) {
+            setTimeout(function(self) {
+                try {
+                    cb(null, self.getUserAgent());
+                } catch (err) {
+                    cb(err);
+                }
+            }, 1000, this);
+        },
+
+        getRepeaterId: function() {
+            return repeaterId;
+        },
+
+        repeaterGetUserAgent: function(cb) {
+            repeaterId = setInterval(function(self) {
+                try {
+                    cb(null, self.getUserAgent());
+                } catch (err) {
+                    cb(err);
+                }
+            }, 1000, this);
+        },
     };
 }));
diff --git a/dist/js-package-sample.min.js b/dist/js-package-sample.min.js
@@ -1,11 +1,11 @@
 /**
  * Copyright (c) 2015
  * js-package-sample - Javascript Package Sample
- * Built on 2015-12-16
+ * Built on 2015-12-17
  * 
- * @version 0.0.4
+ * @version 0.0.5
  * @link https://github.com/yupmin/js-package-sample.git
  * @license MIT
  */
 
-!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],b):"object"==typeof exports?module.exports=b(require("jquery")):a.JsPackageSample=b(a.jQuery)}(this,function(a){"use strict";var b;return{getUserAgent:function(){return b},setUserAgent:function(a){b=a}}});
+!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],b):"object"==typeof exports?module.exports=b(require("jquery")):a.JsPackageSample=b(a.jQuery)}(this,function(a){"use strict";var b,c;return{getUserAgent:function(){return b},setUserAgent:function(a){b=a},timerGetUserAgent:function(a){setTimeout(function(b){try{a(null,b.getUserAgent())}catch(c){a(c)}},1e3,this)},getRepeaterId:function(){return c},repeaterGetUserAgent:function(a){c=setInterval(function(b){try{a(null,b.getUserAgent())}catch(c){a(c)}},1e3,this)}}});
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-package-sample",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Javascript Package Sample",
   "main": "dist/js-package-sample.js",
   "scripts": {
diff --git a/src/index.js b/src/index.js
@@ -12,7 +12,8 @@
 }(this, function (jQuery) {
     'use strict';
 
-    var userAgent;
+    var userAgent,
+        repeaterId;
 
     return {
         getUserAgent: function() {
@@ -21,6 +22,30 @@
 
         setUserAgent: function(ua) {
             userAgent = ua;
-        }
+        },
+
+        timerGetUserAgent: function(cb) {
+            setTimeout(function(self) {
+                try {
+                    cb(null, self.getUserAgent());
+                } catch (err) {
+                    cb(err);
+                }
+            }, 1000, this);
+        },
+
+        getRepeaterId: function() {
+            return repeaterId;
+        },
+
+        repeaterGetUserAgent: function(cb) {
+            repeaterId = setInterval(function(self) {
+                try {
+                    cb(null, self.getUserAgent());
+                } catch (err) {
+                    cb(err);
+                }
+            }, 1000, this);
+        },
     };
 }));
diff --git a/test/index.js b/test/index.js
@@ -1,18 +1,20 @@
+var expect;
+
 if (typeof module !== 'undefined' && module.exports) { // Node.js
-    var expect = require('chai').expect;
-    var sinon = require('sinon');
-    var jsdom = require('jsdom');
-    // var window = jsdom.jsdom(
-    //     '<html><head></head><body>hello world</body></html>'
-    // ).defaultView;
-    // var navigator = window.navigator;
+    var sinon = require('sinon'),
+        jsdom = require('jsdom');
+
+    expect = require('chai').expect;
+
+    GLOBAL.window = jsdom.jsdom(
+         '<html><head></head><body>hello world</body></html>'
+     ).defaultView;
 
     var JsPackageSample = require('../src/index');
 } else {
-    var expect = chai.expect;
+    expect = chai.expect;
 }
 
-
 describe('JS Package Sample', function() {
     it('setUserAgent function', function() {
         expect(JsPackageSample.setUserAgent('test')).to.equal(undefined);
@@ -22,4 +24,21 @@ describe('JS Package Sample', function() {
         JsPackageSample.setUserAgent('test');
         expect(JsPackageSample.getUserAgent()).to.equal('test');
     });
+
+    it('timerGetUserAgent function', function(done) {
+        JsPackageSample.setUserAgent('test');
+        JsPackageSample.timerGetUserAgent(function(err, res) {
+            expect(res).to.equal('test');
+            done();
+        });
+    });
+
+    it('repeaterGetUserAgent function', function(done) {
+        JsPackageSample.setUserAgent('test');
+        JsPackageSample.repeaterGetUserAgent(function(err, res) {
+            expect(res).to.equal('test');
+            clearInterval(JsPackageSample.getRepeaterId());
+            done();
+        });
+    });
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "js-package-sample",`
`3`		`- "version": "0.0.4",`
	`3`	`+ "version": "0.0.5",`
`4`	`4`	`"description": "Javascript Package Sample",`
`5`	`5`	`"main": "dist/js-package-sample.js",`
`6`	`6`	`"scripts": {`