EncodedData working in the browser

11 years ago · 0a6ddaffa3
11 changed files with 76 additions and 20 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 build/
 browser/bundle.js
+browser/vendor.js
 node_modules/
 *.swp
 *~
--- a/Address.js
+++ b/Address.js
@ -1,3 +1,5 @@
+'use strict';
+
 require('classtool');

 function ClassSpec(b) {
@ -5,7 +7,7 @@ function ClassSpec(b) {

  function Address() {
    Address.super(this, arguments);
-  };
+  }

  Address.superclass = superclass;
  superclass.applyEncodingsTo(Address);
@ -13,10 +15,10 @@ function ClassSpec(b) {
  Address.prototype.validate = function() {
    this.doAsBinary(function() {
      Address.super(this, 'validate', arguments);
-      if(this.data.length != 21) throw new Error('invalid data length');
+      if(this.data.length !== 21) throw new Error('invalid data length');
    });
  };

  return Address;
-};
+}
 module.defineClass(ClassSpec);
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -14,14 +14,22 @@ module.exports = function(grunt) {
        src: ['bitcore.js'],
        dest: 'browser/bundle.js',
        options: {
+          debug: true,
          alias: ['browserify-bignum/bignumber.js:bignum'],
-          standalone: 'bitcore'
+          standalone: 'bitcore',
+        }
+      },
+      vendor: {
+        src: ['browser/vendor_load.js'],
+        dest: 'browser/vendor.js',
+        options: {
+
        }
      }
    },
    watch: {
      scripts: {
-        files: ['**/*.js', '**/*.html', '!**/node_modules/**', '!**/bundle.js'],
+        files: ['**/*.js', '**/*.html', '!**/node_modules/**', '!**/bundle.js', '!**/vendor.js'],
        tasks: ['browserify'/*, 'mochaTest'*/],
      },
    },
--- a/bitcore.js
+++ b/bitcore.js
@ -5,8 +5,8 @@

 module.exports.bignum = require('bignum');
 module.exports.base58 = require('base58-native');
-module.exports.Address = require('./Address');
-
+module.exports.Manu = require('./util/manu').class();
+module.exports.EncodedData = require('./util/EncodedData');


 if (typeof process.versions === 'undefined') {
--- a/browser/vendor_load.js
+++ b/browser/vendor_load.js
@ -0,0 +1,5 @@
+
+// load modules needed for testing in the browser
+
+var fs = require('fs');
+
--- a/test/adapter.js
+++ b/test/adapter.js
@ -15,3 +15,9 @@ if (typeof require === 'undefined') {
  };
  
 }
+
+
+if (typeof module === 'undefined') {
+  var that = this;
+  that.module = bitcore.module;
+}
--- a/test/index.html
+++ b/test/index.html
@ -8,15 +8,16 @@
  </head>
  <body>
    <div id="mocha"></div>
-    <script src="adapter.js"></script>
+    <script src="../browser/vendor.js"></script>
    <script src="../node_modules/mocha/mocha.js"></script>
    <script src="../node_modules/chai/chai.js"></script>
    <script>mocha.setup('bdd')</script>
    <script src="../browser/bundle.js"></script>
+    <script src="adapter.js"></script>

    <script src="test.main.js"></script>
    <script src="test.base58.js"></script>
-    <script src="test.Address.js"></script>
+    <script src="test.EncodedData.js"></script>
    <script>
      mocha.run();
    </script>
--- a/test/test.Address.js
+++ b/test/test.Address.js
@ -3,18 +3,19 @@
 var chai = require('chai');
 var bitcore = require('../bitcore');

-var expect = chai.expect;
 var should = chai.should();

-var Address = bitcore.Address.class();
+var AddressModule = bitcore.Address;
+var Address;

-describe('Address', function() {
+describe.skip('Address', function() {
  it('should initialze the main object', function() {
-    should.exist(Address);
+    should.exist(AddressModule);
  });
-  it('should create a bignum from string', function() {
+  it('should be able to create class', function() {
+    Address = AddressModule.class();
  });
-  it('should perform basic math operations', function() {
+  it('should be able to create Address object', function() {
  });
 });

--- a/test/test.EncodedData.js
+++ b/test/test.EncodedData.js
@ -0,0 +1,28 @@
+'use strict';
+
+var chai = require('chai');
+var bitcore = require('../bitcore');
+
+var should = chai.should();
+
+var EncodedDataModule = bitcore.EncodedData;
+var EncodedData;
+
+describe('EncodedData', function() {
+  it('should initialze the main object', function() {
+    should.exist(EncodedDataModule);
+  });
+  it('should be able to create class', function() {
+    EncodedData = EncodedDataModule.class();
+    should.exist(EncodedData);
+  });
+  it('should be able to create EncodedData object', function() {
+    var ed = new EncodedData();
+    should.exist(ed);
+  });
+});
+
+
+
+
+
--- a/test/test.basic.js
+++ b/test/test.basic.js
@ -1,3 +1,4 @@
+'use strict';
 var assert = require('assert');
 var fs = require('fs');

--- a/util/EncodedData.js
+++ b/util/EncodedData.js
@ -130,17 +130,20 @@ function ClassSpec(b) {
    },
  };

+  var no_conversion = function() {return this.data;};
  for(var k in encodings) {
-    if(!encodings[k].converters[k])
-      encodings[k].converters[k] = function() {return this.data;};
-    encodings[k]._encoding = k;
+    if(encodings.hasOwnProperty(k)){
+      if(!encodings[k].converters[k])
+        encodings[k].converters[k] = no_conversion;
+      encodings[k]._encoding = k;
+    }
  }

  EncodedData.applyEncodingsTo = function(aClass) {
    var tmp = {};
    for(var k in encodings) {
      var enc = encodings[k];
-      var obj = {}; 
+      var obj = {};
      for(var j in enc) {
        obj[j] = enc[j];
      }
@ -152,5 +155,5 @@ function ClassSpec(b) {

  EncodedData.applyEncodingsTo(EncodedData);
  return EncodedData;
-};
+}
 module.defineClass(ClassSpec);