Merge pull request #6 from DeviateFish/v0.2.0

v0.2.0

Author: DeviateFish

.jshintrc

@@ -1,5 +1,5 @@
 {
-    "node": true,
+    "node": false,
     "camelcase": true,
     "curly": true,
     "immed": true,
@@ -8,7 +8,8 @@
     "noarg": true,
     "undef": true,
     "unused": true,
-    "strict": true,
     "trailing": true,
-    "smarttabs": true
+    "smarttabs": true,
+    "esnext": true,
+    "browser": true
 }

Gruntfile.js

@@ -1,64 +1,117 @@
+'use strict';
+var LIVERELOAD_PORT = 35729;
+var lrSnippet = require('connect-livereload')({port: LIVERELOAD_PORT});
+var mountFolder = function (connect, dir) {
+  return connect.static(require('path').resolve(dir));
+};
+
 module.exports = function(grunt) {
+  require('time-grunt')(grunt);
+  require('load-grunt-tasks')(grunt);
 
   grunt.initConfig({
 
     pkg: grunt.file.readJSON('package.json'),
 
-    concat: {
-      options: {
-        separator: "\n\n"
-      },
-      dist: {
-        src: [
-          'src/_intro.js',
-          'src/main.js',
-          'src/_outro.js'
-        ],
-        dest: 'dist/<%= pkg.name.replace(".js", "") %>.js'
-      }
-    },
-
     uglify: {
       options: {
-        banner: '/*! <%= pkg.name.replace(".js", "") %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+        banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n',
+        sourceMap: true
       },
       dist: {
         files: {
-          'dist/<%= pkg.name.replace(".js", "") %>.min.js': ['<%= concat.dist.dest %>']
+          'dist/<%= pkg.name %>.min.js': ['dist/<%= pkg.name %>.js']
         }
       }
     },
 
-    qunit: {
-      files: ['test/*.html']
-    },
-
     jshint: {
-      files: ['dist/java-deserializer.js'],
+      files: ['src/**/*.js'],
       options: {
         globals: {
-          console: true,
-          module: true,
-          document: true
+          console: true
         },
         jshintrc: '.jshintrc'
       }
     },
 
+    browserify: {
+      dist: {
+        options: {
+          transform: [
+            ["babelify", {
+              sourceMaps: true
+            }]
+          ],
+          browserifyOptions: {
+            standalone: 'JavaDeserializer',
+            debug: true
+          }
+        },
+        files: {
+          // if the source file has an extension of es6 then
+          // we change the name of the source file accordingly.
+          // The result file's extension is always .js
+          "./dist/<%= pkg.name %>.js": ["./src/<%= pkg.name %>.js"]
+        }
+      }
+    },
+
     watch: {
-      files: ['<%= jshint.files %>'],
-      tasks: ['concat', 'jshint', 'qunit']
+      options: {
+        nospawn: true,
+        livereload: { liveCSS: false }
+      },
+      livereload: {
+        options: {
+          livereload: true
+        },
+        files: [
+          './demo/**/*',
+          './dist/<%= pkg.name %>.js',
+          './Gruntfile.js'
+        ]
+      },
+      js: {
+        files: ['./src/**/*.js'],
+        tasks: ['build']
+      }
+    },
+    connect: {
+      options: {
+        port: 9005,
+        // change this to '0.0.0.0' to access the server from outside
+        hostname: '0.0.0.0'
+      },
+      livereload: {
+        options: {
+          middleware: function (connect) {
+            return [
+              lrSnippet,
+              mountFolder(connect, './'),
+            ];
+          }
+        }
+      }
     }
 
   });
 
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-qunit');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.registerTask('serve', function (target) {
+    grunt.task.run([
+      'connect:livereload',
+      'watch'
+    ]);
+  });
 
-  grunt.registerTask('test', ['jshint', 'qunit']);
-  grunt.registerTask('default', ['concat', 'jshint', 'qunit', 'uglify']);
+  grunt.registerTask('build', [
+    'jshint',
+    'browserify',
+    'uglify'
+  ]);
 
+  grunt.registerTask('default', [
+    'build',
+    'serve'
+  ]);
 };

demo/assets/ft_waypoint.obj

@@ -4,17 +4,14 @@
     <title>java-deserializer demo</title>
     <link rel="stylesheet" href="./assets/normalize.css" />
     <link rel="stylesheet" href="./assets/main.css" />
-    <style>
-      /* begin demo embedded styles */
-
-      /* end demo embedded styles */
-    </style>
   </head>
   <body>
     <h1>java-deserializer demo</h1>
 
     <!-- begin demo markup -->
 
+    <pre id="output"></pre>
+
     <!-- end demo markup -->
 
     <p>See the <a href="http://DeviateFish.github.io/java-deserializer">project homepage</a>.
@@ -26,8 +23,26 @@ <h1>java-deserializer demo</h1>
     <script>
       /* begin demo script */
 
-      var n = java-deserializer();
-      console.log(n);
+      function loadResource(url, callback)
+      {
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', url);
+        xhr.responseType = 'arraybuffer';
+        xhr.onload = function() {
+          callback(null, this.response);
+        };
+        xhr.onerror = function(e) {
+          callback(e, null);
+        };
+
+        xhr.send();
+      };
+
+      loadResource('/demo/assets/ft_waypoint.obj', function(err, buf) {
+        var n = new JavaDeserializer(buf);
+        var repr = n.getContents();
+        document.getElementById('output').innerHTML = JSON.stringify(repr, null, 2);
+      })
 
       /* end demo script */
     </script>